Replace Takisoft's PreferenceCompat improved library to original Goog…

…le's PreferenceCompat library
OpenVK · Dec 23, 2024 · 01dbd05 · 01dbd05
1 parent 891ea6c
commit 01dbd05
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 12 deletions.
diff --git a/app/app.iml b/app/app.iml
@@ -111,15 +111,21 @@
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/pre-dexed" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/tmp" />
     </content>
     <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
@@ -129,9 +135,9 @@
     <orderEntry type="library" exported="" name="Gradle: com.android.support:animated-vector-drawable-24.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.readystatesoftware.systembartint:systembartint:1.0.3@jar" level="project" />
     <orderEntry type="library" exported="" name="Gradle: ch.acra:acra:4.6.0@jar" level="project" />
+    <orderEntry type="library" exported="" name="Gradle: com.android.support:preference-v7-24.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: pl.droidsonroids.gif:android-gif-drawable-1.0.12" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:support-annotations:24.0.0@jar" level="project" />
-    <orderEntry type="library" exported="" name="Gradle: com.takisoft.fix:preference-v7-24.1.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.android.support:support-vector-drawable-24.0.0" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.commit451:PhotoView-1.2.5" level="project" />
     <orderEntry type="library" exported="" name="Gradle: com.seppius.plurals:android-i18n-plurals-1.1" level="project" />

diff --git a/app/build.gradle b/app/build.gradle
@@ -142,8 +142,8 @@ dependencies {
     compile 'com.android.support:support-v4:24.0.0'
     //noinspection GradleDependency,GradleCompatible
     compile 'com.android.support:appcompat-v7:24.0.0'
-    //noinspection GradleDependency
-    compile 'com.takisoft.fix:preference-v7:24.1.0.0'
+    //noinspection GradleCompatible,GradleDependency
+    compile 'com.android.support:preference-v7:24.0.0'
     compile 'com.readystatesoftware.systembartint:systembartint:1.0.3'
     compile project(':modules:actionbar')
     compile project(':modules:popupmenu')

diff --git a/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java b/app/src/main/java/uk/openvk/android/legacy/core/fragments/MainSettingsFragment.java
@@ -77,7 +77,7 @@ public class MainSettingsFragment extends ActivePreferenceFragment {
 
     @SuppressWarnings("ConstantConditions")
     @Override
-    public void onCreatePreferencesFix(Bundle bundle, String s) {
+    public void onCreatePreferences(Bundle bundle, String s) {
         global_prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         instance_prefs = ((OvkApplication) getContext().getApplicationContext()).getAccountPreferences();
         Bundle data = getActivity().getIntent().getExtras();
@@ -100,7 +100,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
     @Override
     public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
         super.onViewCreated(view, savedInstanceState);
-        setDividerPreferences(DIVIDER_PADDING_CHILD | DIVIDER_CATEGORY_AFTER_LAST | DIVIDER_CATEGORY_BETWEEN);
+        // setDividerPreferences(DIVIDER_PADDING_CHILD | DIVIDER_CATEGORY_AFTER_LAST | DIVIDER_CATEGORY_BETWEEN);
         view.setBackgroundColor(getResources().getColor(R.color.white));
     }
 

diff --git a/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java b/app/src/main/java/uk/openvk/android/legacy/core/fragments/base/ActivePreferenceFragment.java
@@ -20,11 +20,12 @@
 package uk.openvk.android.legacy.core.fragments.base;
 
 import android.os.Bundle;
+import android.preference.PreferenceFragment;
 import android.support.v4.app.Fragment;
+import android.support.v7.preference.PreferenceFragmentCompat;
 
-import com.takisoft.fix.support.v7.preference.PreferenceFragmentCompatDividers;
 
-public class ActivePreferenceFragment extends PreferenceFragmentCompatDividers {
+public class ActivePreferenceFragment extends PreferenceFragmentCompat {
     private boolean isActivated;
 
     public boolean isActivated() {
@@ -43,12 +44,12 @@ public void deactivate() {
         onDeactivated();
     }
 
-    public  void onDeactivated() {
+    public void onDeactivated() {
         isActivated = false;
     }
 
     @Override
-    public void onCreatePreferencesFix(Bundle bundle, String s) {
+    public void onCreatePreferences(Bundle bundle, String s) {
 
     }
 }
diff --git a/app/src/main/res/values-v11/style.xml b/app/src/main/res/values-v11/style.xml
@@ -36,6 +36,7 @@
         <item name="android:homeAsUpIndicator">@drawable/ic_ab_back_holo_dark</item>
 		<item name="android:actionDropDownStyle">@style/ActionBarSpinner</item>
 		<item name="preferenceTheme">@style/BaseStyle.PreferenceThemeOverlay</item>
+		<item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
 	</style>
 
 	<style name="BaseStyle.PreferenceThemeOverlay">

diff --git a/app/src/main/res/values-v14/style.xml b/app/src/main/res/values-v14/style.xml
@@ -46,7 +46,8 @@
         <item name="android:actionDropDownStyle">@style/ActionBarSpinner</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowNoTitle">true</item>
-        <item name="android:preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
+        <item name="android:textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
     </style>
 
     <style name="BaseStyle.NoActionBar.NoShadow" parent="android:style/Theme.Holo.Light.DarkActionBar">

diff --git a/app/src/main/res/values-v19/style.xml b/app/src/main/res/values-v19/style.xml
@@ -58,6 +58,7 @@
         <item name="android:windowNoTitle">true</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
     </style>
 
     <style name="BaseStyle.NoActionBar.NoShadow" parent="android:style/Theme.Holo.Light.DarkActionBar">

diff --git a/app/src/main/res/values-v7/style.xml b/app/src/main/res/values-v7/style.xml
@@ -51,6 +51,7 @@
         <item name="android:alertDialogStyle">@style/BaseStyle.DialogStyle</item>
         <item name="preferenceTheme">@style/PreferenceThemeOverlay</item>
         <item name="android:listDivider">@android:color/transparent</item>
+        <item name="textAppearanceListItem">@style/TextAppearance.AppCompat.Subhead</item>
     </style>
 
     <style name="BaseStyle.NoActionBar.NoShadow" parent="android:style/Theme.Holo.Light.DarkActionBar">

diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
@@ -113,5 +113,4 @@
     <declare-styleable name="FragmentMaster">
         <attr name="masterFragmentTheme" format="reference"/>
     </declare-styleable>
-
 </resources>
diff --git a/mobile-android-legacy.iml b/mobile-android-legacy.iml
@@ -12,7 +12,6 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
-      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/modules/modules.iml b/modules/modules.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

diff --git a/modules/slidingmenu/slidingmenu.iml b/modules/slidingmenu/slidingmenu.iml
@@ -17,6 +17,7 @@
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />