Merge pull request #67 from KKL369/master

修改bookshelf显示效果、去除tabs点击黑色背景、修复部分手机订阅界面tv_title显示不全的问题
pull/68/head
kunfei 5 years ago committed by GitHub
commit 78a9aace2f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      app/src/main/java/io/legado/app/ui/chapterlist/ChapterListActivity.kt
  2. 2
      app/src/main/res/layout/item_bookshelf_list.xml
  3. 1
      app/src/main/res/layout/item_rss_article.xml
  4. 3
      app/src/main/res/layout/view_tab_layout.xml
  5. 2
      app/src/main/res/layout/view_tab_layout_min.xml

@ -25,6 +25,7 @@ class ChapterListActivity : VMBaseActivity<ChapterListViewModel>(R.layout.activi
private var searchView: SearchView? = null private var searchView: SearchView? = null
override fun onActivityCreated(savedInstanceState: Bundle?) { override fun onActivityCreated(savedInstanceState: Bundle?) {
tab_layout.isTabIndicatorFullWidth = false
tab_layout.setSelectedTabIndicatorColor(accentColor) tab_layout.setSelectedTabIndicatorColor(accentColor)
viewModel.bookUrl = intent.getStringExtra("bookUrl") viewModel.bookUrl = intent.getStringExtra("bookUrl")
viewModel.loadBook { viewModel.loadBook {

@ -180,6 +180,8 @@
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0.5dp" android:layout_height="0.5dp"
android:layout_marginLeft="18dp"
android:layout_marginRight="18dp"
android:background="@color/btn_bg_press" android:background="@color/btn_bg_press"
app:layout_constraintBottom_toBottomOf="parent" /> app:layout_constraintBottom_toBottomOf="parent" />

@ -10,7 +10,6 @@
android:id="@+id/tv_title" android:id="@+id/tv_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="10dp"
android:text="@string/app_name" android:text="@string/app_name"
android:textColor="@color/tv_text_default" android:textColor="@color/tv_text_default"
android:textSize="16sp" android:textSize="16sp"

@ -1,6 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.google.android.material.tabs.TabLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
app:tabBackground="@android:color/transparent"
app:tabRippleColor="@android:color/transparent"
android:theme="?attr/actionBarStyle" /> android:theme="?attr/actionBarStyle" />

@ -5,5 +5,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:theme="?attr/actionBarStyle" android:theme="?attr/actionBarStyle"
app:tabBackground="@android:color/transparent"
app:tabRippleColor="@android:color/transparent"
app:tabMaxWidth="100dp" app:tabMaxWidth="100dp"
app:tabMinWidth="10dp" /> app:tabMinWidth="10dp" />
Loading…
Cancel
Save