Переглянути джерело

Fixed icon color for about dialog

Vadik Sirekanyan 7 роки тому
батько
коміт
5d228d4016

+ 0 - 7
app/src/main/java/me/vadik/knigopis/MainActivity.kt

@@ -258,7 +258,6 @@ class MainActivity : AppCompatActivity(), Router {
                 R.id.option_about -> {
                     val dialogView = View.inflate(this, R.layout.about, null)
                     val versionView = dialogView.aboutAppVersion
-                    val designerView = dialogView.aboutDesignerText
                     versionView.text = BuildConfig.VERSION_NAME
                     var count = 0
                     val enabled = config.isDevMode
@@ -267,17 +266,11 @@ class MainActivity : AppCompatActivity(), Router {
                     } else {
                         VERSION_CLICK_COUNT_ON
                     }
-                    if (enabled) {
-                        designerView.setCompoundDrawablesRelativeWithIntrinsicBounds(
-                            R.drawable.ic_about_designer_highlighted, 0, 0, 0
-                        )
-                    }
                     versionView.setOnClickListener {
                         if (++count == max) {
                             enabled.not().let {
                                 if (it) toast(R.string.common_info_dev)
                                 config.isDevMode = it
-                                recreate()
                             }
                         }
                     }

+ 51 - 23
app/src/main/res/layout/about.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -40,29 +41,56 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="8dp"
-        android:orientation="vertical">
-
-        <TextView
-            style="@style/AboutItem"
-            android:drawableLeft="@drawable/ic_about_api"
-            android:drawableStart="@drawable/ic_about_api"
-            android:text="@string/about.text.idea"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <TextView
-            style="@style/AboutItem"
-            android:drawableLeft="@drawable/ic_about_developer"
-            android:drawableStart="@drawable/ic_about_developer"
-            android:text="@string/about.text.developer"
-            android:textColor="?android:attr/textColorPrimary" />
-
-        <TextView
-            android:id="@+id/aboutDesignerText"
-            style="@style/AboutItem"
-            android:drawableLeft="@drawable/ic_about_designer"
-            android:drawableStart="@drawable/ic_about_designer"
-            android:text="@string/about.text.designer"
-            android:textColor="?android:attr/textColorPrimary" />
+        android:orientation="vertical"
+        tools:ignore="ContentDescription,UseCompoundDrawables">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                style="@style/AboutIconItem"
+                app:srcCompat="@drawable/ic_about_api" />
+
+            <TextView
+                style="@style/AboutItem"
+                android:text="@string/about.text.idea" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                style="@style/AboutIconItem"
+                app:srcCompat="@drawable/ic_about_developer" />
+
+            <TextView
+                style="@style/AboutItem"
+                android:text="@string/about.text.developer" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <ImageView
+                style="@style/AboutIconItem"
+                app:srcCompat="@drawable/ic_about_designer" />
+
+            <TextView
+                style="@style/AboutItem"
+                android:text="@string/about.text.designer" />
+
+        </LinearLayout>
 
     </LinearLayout>
 

+ 8 - 2
app/src/main/res/values/styles.xml

@@ -39,11 +39,17 @@
 
     <style name="AboutItem">
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:autoLink">web|email</item>
         <item name="android:padding">8dp</item>
         <item name="android:textSize">14sp</item>
-        <item name="android:drawablePadding">8dp</item>
+        <item name="android:textColor">?android:attr/textColorSecondary</item>
+    </style>
+
+    <style name="AboutIconItem">
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_width">wrap_content</item>
+        <item name="android:tint">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="ProfileCaptionItem">