Преглед на файлове

优化强调色和文字颜色一样是文字颜色的显示

kunfei преди 4 години
родител
ревизия
c3dde6e8e2

+ 15 - 12
app/src/main/java/io/legado/app/ui/widget/text/AccentBgTextView.kt

@@ -23,7 +23,6 @@ class AccentBgTextView @JvmOverloads constructor(
         radius = typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, radius)
         radius = typedArray.getDimensionPixelOffset(R.styleable.AccentBgTextView_radius, radius)
         typedArray.recycle()
         typedArray.recycle()
         upBackground()
         upBackground()
-        setTextColor(Color.WHITE)
     }
     }
 
 
     fun setRadius(radius: Int) {
     fun setRadius(radius: Int) {
@@ -32,18 +31,22 @@ class AccentBgTextView @JvmOverloads constructor(
     }
     }
 
 
     private fun upBackground() {
     private fun upBackground() {
-        background = if (isInEditMode) {
-            Selector.shapeBuild()
-                .setCornerRadius(radius)
-                .setDefaultBgColor(context.getCompatColor(R.color.accent))
-                .setPressedBgColor(ColorUtils.darkenColor(context.getCompatColor(R.color.accent)))
-                .create()
+        val accentColor = if (isInEditMode) {
+            context.getCompatColor(R.color.accent)
         } else {
         } else {
-            Selector.shapeBuild()
-                .setCornerRadius(radius)
-                .setDefaultBgColor(ThemeStore.accentColor(context))
-                .setPressedBgColor(ColorUtils.darkenColor(ThemeStore.accentColor(context)))
-                .create()
+            ThemeStore.accentColor(context)
         }
         }
+        background = Selector.shapeBuild()
+            .setCornerRadius(radius)
+            .setDefaultBgColor(accentColor)
+            .setPressedBgColor(ColorUtils.darkenColor(accentColor))
+            .create()
+        setTextColor(
+            if (ColorUtils.isColorLight(accentColor)) {
+                Color.BLACK
+            } else {
+                Color.WHITE
+            }
+        )
     }
     }
 }
 }

+ 0 - 2
app/src/main/res/layout-land/activity_book_info.xml

@@ -402,11 +402,9 @@
                     android:layout_width="0dp"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
                     android:layout_weight="1"
-                    android:background="@drawable/selector_btn_accent_bg"
                     android:gravity="center"
                     android:gravity="center"
                     android:includeFontPadding="false"
                     android:includeFontPadding="false"
                     android:text="@string/reading"
                     android:text="@string/reading"
-                    android:textColor="@color/tv_text_button_nor"
                     android:textSize="15sp" />
                     android:textSize="15sp" />
 
 
             </LinearLayout>
             </LinearLayout>

+ 0 - 2
app/src/main/res/layout/activity_book_info.xml

@@ -383,11 +383,9 @@
                 android:layout_width="0dp"
                 android:layout_width="0dp"
                 android:layout_height="match_parent"
                 android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:layout_weight="1"
-                android:background="@drawable/selector_btn_accent_bg"
                 android:gravity="center"
                 android:gravity="center"
                 android:includeFontPadding="false"
                 android:includeFontPadding="false"
                 android:text="@string/reading"
                 android:text="@string/reading"
-                android:textColor="@color/tv_text_button_nor"
                 android:textSize="15sp" />
                 android:textSize="15sp" />
 
 
         </LinearLayout>
         </LinearLayout>