From ff09dec4e4734e79c567826fa528e2a2cf968bcf Mon Sep 17 00:00:00 2001
From: tarsin <yuanqingxiang233@163.com>
Date: Thu, 19 May 2022 00:00:10 +0800
Subject: [PATCH] Refine color schemes

---
 app/src/main/AndroidManifest.xml              |  3 +-
 app/src/main/res/layout/activity_main.xml     |  6 ----
 .../res/layout/gallery_detail_actions.xml     |  1 -
 .../res/layout/gallery_detail_comments.xml    |  3 +-
 .../main/res/layout/gallery_detail_info.xml   |  3 +-
 .../res/layout/gallery_detail_previews.xml    |  3 +-
 .../main/res/layout/gallery_detail_tags.xml   |  3 +-
 app/src/main/res/layout/item_download.xml     | 27 ++++++++--------
 app/src/main/res/layout/nav_header_main.xml   |  8 ++---
 .../main/res/layout/scene_cookie_sign_in.xml  |  3 +-
 app/src/main/res/layout/scene_login.xml       |  9 ++----
 app/src/main/res/values/attrs.xml             | 18 -----------
 app/src/main/res/values/colors.xml            | 15 ---------
 app/src/main/res/values/styles.xml            | 26 +++-------------
 app/src/main/res/values/themes.xml            | 12 -------
 app/src/main/res/xml/about_settings.xml       | 31 -------------------
 16 files changed, 30 insertions(+), 141 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 23018b681..45ee7a34c 100755
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -91,8 +91,7 @@
             android:name="com.hippo.ehviewer.ui.GalleryActivity"
             android:configChanges="screenSize"
             android:exported="true"
-            android:launchMode="singleTask"
-            android:theme="@style/AppTheme.Gallery">
+            android:launchMode="singleTask">
 
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 6a5b1503f..e30d1dfd7 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -52,13 +52,7 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_gravity="start"
-            android:background="?android:attr/colorBackground"
             app:headerLayout="@layout/nav_header_main"
-            app:insetForeground="@null"
-            app:itemShapeAppearanceOverlay="@style/ShapeAppearanceOverlay.MaterialComponents.NavigationView"
-            app:itemShapeInsetBottom="0dp"
-            app:itemShapeInsetStart="0dp"
-            app:itemShapeInsetTop="0dp"
             app:menu="@menu/nav_drawer_main" />
 
         <com.hippo.widget.DrawerView
diff --git a/app/src/main/res/layout/gallery_detail_actions.xml b/app/src/main/res/layout/gallery_detail_actions.xml
index 0e03a66b9..97205d4fe 100644
--- a/app/src/main/res/layout/gallery_detail_actions.xml
+++ b/app/src/main/res/layout/gallery_detail_actions.xml
@@ -29,7 +29,6 @@
         android:gravity="center"
         android:padding="8dp"
         android:text="@string/newer_version_avaliable"
-        android:textColor="?attr/textColorThemeAccent"
         android:visibility="gone" />
 
     <HorizontalScrollView
diff --git a/app/src/main/res/layout/gallery_detail_comments.xml b/app/src/main/res/layout/gallery_detail_comments.xml
index da43c6169..5ab55372e 100644
--- a/app/src/main/res/layout/gallery_detail_comments.xml
+++ b/app/src/main/res/layout/gallery_detail_comments.xml
@@ -29,7 +29,6 @@
         android:id="@+id/comments_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textColor="?attr/textColorThemeAccent" />
+        android:layout_gravity="center_horizontal" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_info.xml b/app/src/main/res/layout/gallery_detail_info.xml
index c6c0b089f..8e3b029cd 100644
--- a/app/src/main/res/layout/gallery_detail_info.xml
+++ b/app/src/main/res/layout/gallery_detail_info.xml
@@ -88,7 +88,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
         android:layout_marginTop="16dp"
-        android:text="@string/more_information"
-        android:textColor="?attr/textColorThemeAccent" />
+        android:text="@string/more_information" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_previews.xml b/app/src/main/res/layout/gallery_detail_previews.xml
index 3fdfb638e..396878742 100644
--- a/app/src/main/res/layout/gallery_detail_previews.xml
+++ b/app/src/main/res/layout/gallery_detail_previews.xml
@@ -39,7 +39,6 @@
         android:id="@+id/preview_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:textColor="?attr/textColorThemeAccent" />
+        android:layout_gravity="center_horizontal" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/gallery_detail_tags.xml b/app/src/main/res/layout/gallery_detail_tags.xml
index 8d625be43..607c41769 100644
--- a/app/src/main/res/layout/gallery_detail_tags.xml
+++ b/app/src/main/res/layout/gallery_detail_tags.xml
@@ -26,7 +26,6 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center_horizontal"
-        android:text="@string/no_tags"
-        android:textColor="?attr/textColorThemeAccent" />
+        android:text="@string/no_tags" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/item_download.xml b/app/src/main/res/layout/item_download.xml
index d1024b391..5ca86b176 100644
--- a/app/src/main/res/layout/item_download.xml
+++ b/app/src/main/res/layout/item_download.xml
@@ -46,7 +46,7 @@
             android:layout_marginLeft="8dp"
             android:layout_marginTop="4dp"
             android:layout_marginRight="8dp"
-            android:layout_toRightOf="@id/thumb" />
+            android:layout_toEndOf="@id/thumb" />
 
         <TextView
             android:id="@+id/uploader"
@@ -54,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/title"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:layout_marginTop="2dp" />
 
         <com.hippo.ehviewer.widget.SimpleRatingView
@@ -62,7 +62,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_below="@id/uploader"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:layout_marginTop="2dp" />
 
         <TextView
@@ -70,7 +70,7 @@
             style="@style/CardMessage"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:layout_alignBottom="@id/thumb"
             android:layout_marginBottom="8dp"
             android:paddingLeft="8dp"
@@ -85,8 +85,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBottom="@+id/thumb"
-            android:layout_alignParentRight="true"
-            android:paddingRight="8dp">
+            android:layout_alignParentEnd="true"
+            android:paddingEnd="8dp">
 
             <ImageView
                 android:id="@+id/start"
@@ -115,10 +115,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/actions"
-            android:layout_alignParentRight="true"
+            android:layout_alignParentEnd="true"
             android:layout_marginBottom="4dp"
-            android:paddingRight="16dp"
-            android:textColor="?attr/textColorThemeAccent" />
+            android:paddingRight="16dp" />
 
         <ProgressBar
             android:id="@+id/progress_bar"
@@ -126,8 +125,8 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_above="@id/actions"
-            android:layout_alignLeft="@id/title"
-            android:layout_marginRight="8dp"
+            android:layout_alignStart="@id/title"
+            android:layout_marginEnd="8dp"
             android:indeterminate="false" />
 
         <TextView
@@ -135,7 +134,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/progress_bar"
-            android:layout_alignLeft="@id/title"
+            android:layout_alignStart="@id/title"
             android:textSize="@dimen/text_super_small" />
 
         <TextView
@@ -143,8 +142,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_above="@id/progress_bar"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="8dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginEnd="8dp"
             android:textSize="@dimen/text_super_small" />
 
     </RelativeLayout>
diff --git a/app/src/main/res/layout/nav_header_main.xml b/app/src/main/res/layout/nav_header_main.xml
index 10c25b69b..b9769e91b 100644
--- a/app/src/main/res/layout/nav_header_main.xml
+++ b/app/src/main/res/layout/nav_header_main.xml
@@ -32,16 +32,15 @@
         android:layout_width="64dp"
         android:layout_height="64dp"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="16dp"
-        android:layout_marginBottom="48dp"
-        app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.App.CornerSize50Percent" />
+        android:layout_marginStart="16dp"
+        android:layout_marginBottom="48dp" />
 
     <TextView
         android:id="@+id/display_name"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="16dp"
+        android:layout_marginStart="16dp"
         android:layout_marginBottom="16dp"
         android:textColor="@android:color/white"
         android:textSize="@dimen/text_small" />
@@ -58,7 +57,6 @@
             android:id="@+id/night_mode"
             android:layout_width="36dp"
             android:layout_height="36dp"
-            android:background="?selectableItemBackgroundBorderless"
             android:clickable="true"
             android:focusable="true"
             android:padding="6dp"
diff --git a/app/src/main/res/layout/scene_cookie_sign_in.xml b/app/src/main/res/layout/scene_cookie_sign_in.xml
index 87f5494a4..3d862d20d 100644
--- a/app/src/main/res/layout/scene_cookie_sign_in.xml
+++ b/app/src/main/res/layout/scene_cookie_sign_in.xml
@@ -154,8 +154,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:paddingHorizontal="8dp"
-            android:text="@string/from_clipboard"
-            android:textColor="?attr/textColorThemeAccent" />
+            android:text="@string/from_clipboard" />
 
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/scene_login.xml b/app/src/main/res/layout/scene_login.xml
index 88ef90c59..3eb363f60 100644
--- a/app/src/main/res/layout/scene_login.xml
+++ b/app/src/main/res/layout/scene_login.xml
@@ -135,8 +135,7 @@
                     android:layout_height="wrap_content"
                     android:background="?selectableItemBackground"
                     android:paddingHorizontal="8dp"
-                    android:text="@string/sign_in_via_webview"
-                    android:textColor="?attr/textColorThemeAccent" />
+                    android:text="@string/sign_in_via_webview" />
 
                 <TextView
                     android:id="@+id/sign_in_via_cookies"
@@ -144,8 +143,7 @@
                     android:layout_height="wrap_content"
                     android:background="?selectableItemBackground"
                     android:paddingHorizontal="8dp"
-                    android:text="@string/sign_in_via_cookies"
-                    android:textColor="?attr/textColorThemeAccent" />
+                    android:text="@string/sign_in_via_cookies" />
 
             </LinearLayout>
 
@@ -156,8 +154,7 @@
                 android:layout_gravity="center_horizontal"
                 android:background="?selectableItemBackground"
                 android:paddingHorizontal="8dp"
-                android:text="@string/skip_signing_in"
-                android:textColor="?attr/textColorThemeAccent" />
+                android:text="@string/skip_signing_in" />
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 61b016c77..9865ac015 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -18,34 +18,16 @@
 
     <declare-styleable name="Theme">
         <attr name="colorEdgeEffect" format="color" />
-
         <attr name="dividerColor" format="color" />
-
-        <attr name="textColorThemeAccent" format="color" />
-
-        <!-- For light theme, it's secondary dark color -->
-        <!-- For dark theme, it's secondary light color -->
-        <!-- For black theme, it's secondary light color -->
         <attr name="drawableColorSecondary" format="color" />
-        <!-- For light theme, it's primary color -->
-        <!-- For dark theme, it's primary light color -->
-        <!-- For black theme, it's primary light color -->
         <attr name="drawableColorThemePrimary" format="color" />
-
-        <!-- Color of card background -->
         <attr name="contentColorThemePrimary" format="color" />
         <attr name="contentColorThemeAccent" format="color" />
-        <attr name="contentColorReactive" format="color" />
-
         <attr name="guideBackgroundColor" format="color" />
         <attr name="guideTitleColor" format="color" />
         <attr name="guideTextColor" format="color" />
-
         <attr name="tagGroupBackgroundColor" format="color" />
         <attr name="tagBackgroundColor" format="color" />
-
-        <attr name="galleryDetailHeaderTitleColor" format="color" />
-        <attr name="galleryDetailHeaderBackgroundColor" format="color" />
     </declare-styleable>
 
     <declare-styleable name="ProgressView">
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 05a7d3742..874c023f2 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -15,31 +15,19 @@
   -->
 
 <resources>
-
-    <!-- primary_drawable     54% -->
-    <!-- secondary_drawable   26% -->
-    <!-- primary_drawable_dark     100% -->
-    <!-- secondary_drawable_dark    30% -->
-    <!-- primary_drawable_black     80% -->
-    <!-- secondary_drawable_black   24% -->
     <color name="primary_drawable">#8a000000</color>
     <color name="secondary_drawable">#42000000</color>
     <color name="primary_drawable_dark">#ffffffff</color>
     <color name="primary_drawable_black">#ccffffff</color>
     <color name="secondary_drawable_black">#3dffffff</color>
-
     <color name="content">#fff</color>
     <color name="content_black">@color/grey_925</color>
-
     <color name="content_activated">@color/grey_300</color>
     <color name="content_activated_black">@color/grey_700</color>
-
     <color name="tag_group_background">@color/colorAccent</color>
     <color name="tag_group_background_black">@color/grey_875</color>
-
     <color name="tag_background">@color/colorPrimary</color>
     <color name="tag_background_black">@color/grey_875</color>
-
     <color name="red_500">#fff44336</color>
     <color name="teal_500">#ff009688</color>
     <color name="purple_a200">#ffe040fb</color>
@@ -57,10 +45,8 @@
     <color name="grey_500">#ff9e9e9e</color>
     <color name="grey_300">#ffe0e0e0</color>
     <color name="brown_500">#ff795548</color>
-
     <color name="colorPrimary">@color/teal_500</color>
     <color name="colorAccent">@color/purple_a200</color>
-
     <color name="loading_indicator_red">#ffe53935</color>
     <color name="loading_indicator_purple">@color/purple_a700</color>
     <color name="loading_indicator_blue">#ff1d87e4</color>
@@ -68,7 +54,6 @@
     <color name="loading_indicator_green">@color/light_green_600</color>
     <color name="loading_indicator_yellow">@color/yellow_800</color>
     <color name="loading_indicator_orange">@color/deep_orange_400</color>
-
     <color name="check_text_view_mask">#4a000000</color>
 
     <!-- Red -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 1cc0fe3a9..2b2d0c445 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
     <style name="AppTheme" parent="Base.AppTheme" />
 
     <!-- TextAppearance -->
-    <style name="TextAppearance" parent="TextAppearance.AppCompat" />
+    <style name="TextAppearance" parent="TextAppearance.Material3.TitleMedium" />
 
     <!-- Progress View -->
     <style name="ProgressView">
@@ -30,7 +30,6 @@
 
     <style name="TextAppearance.CardTitle">
         <item name="android:textSize">@dimen/text_little_small</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
     </style>
 
     <style name="CardTitle">
@@ -42,7 +41,6 @@
 
     <style name="TextAppearance.CardMessage">
         <item name="android:textSize">@dimen/text_small</item>
-        <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
     <style name="CardMessage">
@@ -54,16 +52,14 @@
 
     <!-- CategoryText -->
     <style name="CategoryText">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Subhead</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.ActionBar.Subtitle</item>
         <item name="android:textStyle">bold</item>
         <item name="android:gravity">center</item>
         <item name="android:minHeight">@dimen/category_table_item_height</item>
         <item name="android:foreground">@drawable/check_text_view_foreground</item>
-        <item name="android:theme">@style/Theme.Material3.DynamicColors.DayNight</item>
     </style>
 
-    <style name="TextAppearance.CategoryTitle" parent="TextAppearance.AppCompat.Small">
-        <item name="android:textColor">?attr/textColorThemeAccent</item>
+    <style name="TextAppearance.CategoryTitle" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -75,13 +71,12 @@
     </style>
 
     <style name="ButtonInCard">
-        <item name="android:textAppearance">@style/TextAppearance.AppCompat.Button</item>
+        <item name="android:textAppearance">@style/TextAppearance.Material3.LabelLarge</item>
         <item name="android:textStyle">bold</item>
         <item name="android:gravity">center</item>
         <item name="android:minHeight">48dp</item>
         <item name="android:minWidth">88dp</item>
         <item name="android:padding">8dp</item>
-        <item name="android:textColor">?attr/colorPrimary</item>
     </style>
 
     <style name="Slider">
@@ -95,18 +90,7 @@
         <item name="indicatorColor">?attr/dividerColor</item>
     </style>
 
-    <style name="Guide.Title" parent="TextAppearance.AppCompat.Title">
+    <style name="Guide.Title" parent="TextAppearance.Material3.TitleMedium">
         <item name="android:textColor">?attr/guideTitleColor</item>
     </style>
-
-    <style name="ShapeAppearanceOverlay.App.CornerSize50Percent" parent="">
-        <item name="cornerSize">50%</item>
-    </style>
-
-    <style name="ShapeAppearanceOverlay.MaterialComponents.NavigationView" parent="">
-        <item name="cornerSizeTopLeft">0dp</item>
-        <item name="cornerSizeBottomLeft">0dp</item>
-        <item name="cornerSize">50%</item>
-    </style>
-
 </resources>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 19f8a3428..7a00ca64c 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -24,28 +24,20 @@
         <item name="colorControlActivated">@color/colorPrimary</item>
         <item name="colorEdgeEffect">@color/grey_500</item>
         <item name="dividerColor">@color/divider</item>
-        <item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
         <item name="colorControlNormal">@color/primary_drawable</item>
         <item name="drawableColorSecondary">@color/secondary_drawable</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable</item>
-        <item name="contentColorReactive">@color/content_reactive</item>
         <item name="guideBackgroundColor">#e5303030</item>
         <item name="guideTitleColor">?android:attr/textColorPrimary</item>
         <item name="guideTextColor">?android:attr/textColorSecondary</item>
         <item name="tagGroupBackgroundColor">@color/tag_group_background</item>
         <item name="tagBackgroundColor">@color/tag_background</item>
-        <item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
-        <item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>
     </style>
 
-    <!-- =============== -->
-    <!-- Base Black Theme -->
-    <!-- =============== -->
-
     <style name="ThemeOverlay" />
 
     <style name="ThemeOverlay.Black">
@@ -53,15 +45,11 @@
         <item name="colorControlNormal">@color/primary_drawable_black</item>
         <item name="drawableColorSecondary">@color/secondary_drawable_black</item>
         <item name="drawableColorThemePrimary">@color/primary_drawable_black</item>
-        <item name="contentColorReactive">@color/content_reactive_black</item>
         <item name="guideBackgroundColor">#e5000000</item>
         <item name="tagGroupBackgroundColor">@color/tag_group_background_black</item>
         <item name="tagBackgroundColor">@color/tag_background_black</item>
-        <item name="galleryDetailHeaderBackgroundColor">@android:color/black</item>
     </style>
 
-    <style name="AppTheme.Gallery" parent="AppTheme"></style>
-
     <!-- ============ -->
     <!-- Widget Theme -->
     <!-- ============ -->
diff --git a/app/src/main/res/xml/about_settings.xml b/app/src/main/res/xml/about_settings.xml
index ddee3bc8e..ff5361922 100644
--- a/app/src/main/res/xml/about_settings.xml
+++ b/app/src/main/res/xml/about_settings.xml
@@ -36,12 +36,6 @@
         app:iconSpaceReserved="false"
         app:url="https://github.com/asuka-mio/Ehviewer/releases" />
 
-    <!--<com.hippo.preference.UrlPreference
-        android:key="website"
-        android:title="@string/settings_about_website"
-        app:iconSpaceReserved="false"
-        app:url="http://www.ehviewer.com" />-->
-
     <com.hippo.preference.UrlPreference
         android:key="source"
         android:title="@string/settings_about_source"
@@ -49,18 +43,6 @@
         app:iconSpaceReserved="false"
         app:url="https://github.com/asuka-mio/Ehviewer" />
 
-    <!--<com.hippo.preference.UrlPreference
-        android:key="changelog"
-        android:title="@string/settings_about_changelog"
-        app:iconSpaceReserved="false"
-        app:url="http://www.ehviewer.com/changelog" />
-
-    <com.hippo.preference.UrlPreference
-        android:key="help"
-        android:title="@string/settings_about_help"
-        app:iconSpaceReserved="false"
-        app:url="http://www.ehviewer.com/help" />-->
-
     <com.hippo.ehviewer.preference.VersionPreference
         android:key="version"
         app:iconSpaceReserved="false" />
@@ -69,17 +51,4 @@
         android:key="check_for_updates"
         android:title="@string/settings_about_check_for_updates"
         app:iconSpaceReserved="false" />
-
-    <!--<SwitchPreferenceCompat
-        android:defaultValue="@bool/beta"
-        android:key="beta_update_channel"
-        android:summary="@string/settings_about_beta_update_channel_summary"
-        android:title="@string/settings_about_beta_update_channel"
-        app:iconSpaceReserved="false" />
-
-    <Preference
-        android:key="donate"
-        android:title="@string/settings_about_donate"
-        app:iconSpaceReserved="false" />-->
-
 </PreferenceScreen>