From 907998d59d6155972866acf93d39576362b7b939 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Wed, 17 Oct 2018 13:51:18 +0300
Subject: [PATCH] AndroidX refactoring fix

---
 app/build.gradle                              |  2 +-
 .../gr/thmmy/mthmmy/base/BaseActivity.java    |  1 +
 .../res/xml-v26/app_preferences_guest.xml     | 18 +++++------
 .../main/res/xml-v26/app_preferences_user.xml | 30 +++++++++----------
 .../main/res/xml/app_preferences_guest.xml    | 26 ++++++++--------
 5 files changed, 39 insertions(+), 38 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index c7f02045..71169d70 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -56,6 +56,7 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'com.google.firebase:firebase-core:16.0.4'
     implementation 'com.google.firebase:firebase-messaging:17.3.3'
     implementation 'com.crashlytics.sdk.android:crashlytics:2.9.5'
@@ -75,7 +76,6 @@ dependencies {
     implementation "ru.noties:markwon:2.0.0"
     implementation 'net.gotev:uploadservice:3.4.2'
     implementation 'net.gotev:uploadservice-okhttp:3.4.2'
-    implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 485596fe..a44a0b99 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -323,6 +323,7 @@ public abstract class BaseActivity extends AppCompatActivity {
                 .withCompactStyle(true)
                 .withSelectionListEnabledForSingleProfile(false)
                 .withHeaderBackground(R.color.primary)
+                .withTextColor(getResources().getColor(R.color.iron))
                 .addProfiles(profileDrawerItem)
                 .withOnAccountHeaderListener((view, profile, currentProfile) -> {
                     if (sessionManager.isLoggedIn()) {
diff --git a/app/src/main/res/xml-v26/app_preferences_guest.xml b/app/src/main/res/xml-v26/app_preferences_guest.xml
index ee4ff969..2aa3e166 100644
--- a/app/src/main/res/xml-v26/app_preferences_guest.xml
+++ b/app/src/main/res/xml-v26/app_preferences_guest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.preference.PreferenceCategory android:title="@string/pref_category_app">
-        <android.support.v7.preference.ListPreference
+    <androidx.preference.PreferenceCategory android:title="@string/pref_category_app">
+        <androidx.preference.ListPreference
             android:defaultValue="0"
             android:dialogTitle="@string/pref_app_main_default_tab_dialog_title"
             android:entries="@array/pref_app_main_default_tab_entries"
@@ -10,21 +10,21 @@
             android:key="pref_app_main_default_tab_key"
             android:title="@string/pref_title_app_main_default_tab"
             android:summary="@string/pref_summary_app_main_default_tab" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-    <android.support.v7.preference.PreferenceCategory
+    <androidx.preference.PreferenceCategory
         android:key="pref_category_privacy_key"
         android:title="@string/pref_category_privacy">
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_crashlytics_enable_key"
             android:title="@string/pref_title_privacy_crashlytics_enable"
             android:summary="@string/pref_summary_privacy_crashlytics_enable" />
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_analytics_enable_key"
             android:title="@string/pref_title_privacy_analytics_enable"
             android:summary="@string/pref_summary_privacy_analytics_enable" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-</android.support.v7.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml-v26/app_preferences_user.xml b/app/src/main/res/xml-v26/app_preferences_user.xml
index 4b62ebdb..6010320f 100644
--- a/app/src/main/res/xml-v26/app_preferences_user.xml
+++ b/app/src/main/res/xml-v26/app_preferences_user.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.preference.PreferenceCategory android:title="@string/pref_category_app">
-        <android.support.v7.preference.ListPreference
+    <androidx.preference.PreferenceCategory android:title="@string/pref_category_app">
+        <androidx.preference.ListPreference
             android:defaultValue="0"
             android:dialogTitle="@string/pref_app_main_default_tab_dialog_title"
             android:entries="@array/pref_app_main_default_tab_entries"
@@ -10,41 +10,41 @@
             android:key="pref_app_main_default_tab_key"
             android:title="@string/pref_title_app_main_default_tab"
             android:summary="@string/pref_summary_app_main_default_tab" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-    <android.support.v7.preference.PreferenceCategory
+    <androidx.preference.PreferenceCategory
         android:key="pref_category_posting_key"
         android:title="@string/pref_category_posting">
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_posting_app_signature_enable_key"
             android:title="@string/pref_title_posting_app_signature_enable"
             android:summary="@string/pref_summary_posting_app_signature_enable" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-    <!--<android.support.v7.preference.PreferenceCategory
+    <!--<androidx.preference.PreferenceCategory
         android:key="pref_category_uploading_key"
         android:title="@string/pref_category_uploading">
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_uploading_app_signature_enable_key"
             android:title="@string/pref_title_uploading_app_signature_enable"
             android:summary="@string/pref_summary_uploading_app_signature_enable" />
-    </android.support.v7.preference.PreferenceCategory>-->
+    </androidx.preference.PreferenceCategory>-->
 
-    <android.support.v7.preference.PreferenceCategory
+    <androidx.preference.PreferenceCategory
         android:key="pref_category_privacy_key"
         android:title="@string/pref_category_privacy">
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_crashlytics_enable_key"
             android:title="@string/pref_title_privacy_crashlytics_enable"
             android:summary="@string/pref_summary_privacy_crashlytics_enable" />
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_analytics_enable_key"
             android:title="@string/pref_title_privacy_analytics_enable"
             android:summary="@string/pref_summary_privacy_analytics_enable" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-</android.support.v7.preference.PreferenceScreen>
+</androidx.preference.PreferenceScreen>
diff --git a/app/src/main/res/xml/app_preferences_guest.xml b/app/src/main/res/xml/app_preferences_guest.xml
index 4aa2227f..364ad5a1 100644
--- a/app/src/main/res/xml/app_preferences_guest.xml
+++ b/app/src/main/res/xml/app_preferences_guest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <android.support.v7.preference.PreferenceCategory android:title="@string/pref_category_app">
-        <android.support.v7.preference.ListPreference
+    <androidx.preference.PreferenceCategory android:title="@string/pref_category_app">
+        <androidx.preference.ListPreference
             android:defaultValue="0"
             android:dialogTitle="@string/pref_app_main_default_tab_dialog_title"
             android:entries="@array/pref_app_main_default_tab_entries"
@@ -10,14 +10,14 @@
             android:key="pref_app_main_default_tab_key"
             android:title="@string/pref_title_app_main_default_tab"
             android:summary="@string/pref_summary_app_main_default_tab" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-    <android.support.v7.preference.PreferenceCategory android:title="@string/pref_category_notifications">
-        <android.support.v7.preference.SwitchPreferenceCompat
+    <androidx.preference.PreferenceCategory android:title="@string/pref_category_notifications">
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_notification_vibration_enable_key"
             android:title="@string/pref_title_notification_vibration_enable" />
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="true"
             android:key="pref_notification_led_enable_key"
             android:title="@string/pref_title_notification_led_enable"
@@ -26,21 +26,21 @@
             android:key="pref_notifications_select_sound_key"
             android:title="@string/pref_title_notifications_sound"
             android:summary="@string/pref_summary_notifications_sound" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-    <android.support.v7.preference.PreferenceCategory
+    <androidx.preference.PreferenceCategory
         android:key="pref_category_privacy_key"
         android:title="@string/pref_category_privacy">
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_crashlytics_enable_key"
             android:title="@string/pref_title_privacy_crashlytics_enable"
             android:summary="@string/pref_summary_privacy_crashlytics_enable" />
-        <android.support.v7.preference.SwitchPreferenceCompat
+        <androidx.preference.SwitchPreferenceCompat
             android:defaultValue="false"
             android:key="@string/pref_privacy_analytics_enable_key"
             android:title="@string/pref_title_privacy_analytics_enable"
             android:summary="@string/pref_summary_privacy_analytics_enable" />
-    </android.support.v7.preference.PreferenceCategory>
+    </androidx.preference.PreferenceCategory>
 
-</android.support.v7.preference.PreferenceScreen>
\ No newline at end of file
+</androidx.preference.preference.PreferenceScreen>