diff --git a/README.md b/README.md
index b654c4822..247cf2bb8 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
- # v6.8.0 is out!
+ # v6.9.0 is out!
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 92623826b..6b802cd55 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,8 +16,8 @@ android {
applicationId = "com.drdisagree.iconify"
minSdk = 31
targetSdk = 34
- versionCode = 20
- versionName = "6.8.0"
+ versionCode = 21
+ versionName = "6.9.0"
setProperty("archivesBaseName", "Iconify v$versionName")
buildConfigField("int", "MIN_SDK_VERSION", "$minSdk")
}
@@ -65,6 +65,7 @@ android {
viewBinding = true
dataBinding = true
buildConfig = true
+ aidl = true
}
compileOptions {
@@ -112,6 +113,7 @@ dependencies {
// Data Binding
implementation(libs.library)
+ implementation(libs.androidx.palette.ktx)
// Xposed API
compileOnly(files("libs/api-82.jar"))
@@ -128,7 +130,7 @@ dependencies {
implementation(libs.kotlinx.coroutines.android)
// Color Picker
- implementation(libs.colorpicker)
+ implementation(libs.jaredrummler.colorpicker)
// Splash Screen
implementation(libs.androidx.core.splashscreen)
@@ -142,6 +144,9 @@ dependencies {
// Zip Util
implementation(libs.zip4j)
+ // Preference
+ implementation(libs.androidx.preference.ktx)
+
// Remote Preference
implementation(libs.remotepreferences)
@@ -190,12 +195,20 @@ dependencies {
// Fading Edge Layout
implementation(libs.fadingedgelayout)
+ // Google Subject Segmentation - MLKit
+ implementation(libs.com.google.android.gms.play.services.mlkit.subject.segmentation)
+ implementation(libs.play.services.base)
+
+ // Blur View
+ implementation(libs.blurview)
+
// Misc
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.work.runtime)
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.slf4j.api)
+ implementation(libs.commons.text)
}
tasks.register("printVersionName") {
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
index bd62f20fe..474870070 100644
--- a/app/proguard-rules.pro
+++ b/app/proguard-rules.pro
@@ -21,15 +21,23 @@
public static int d(...);
}
+# Activity and Fragment names
+-keep class com.drdisagree.iconify.ui.activities.**
+-keep class com.drdisagree.iconify.ui.fragments.**
+
# Xposed
-keep class de.robv.android.xposed.**
-keep class com.drdisagree.iconify.xposed.InitHook
-keepnames class com.drdisagree.iconify.xposed.**
--keepnames class com.drdisagree.iconify.config.XPrefs
+-keepnames class com.drdisagree.iconify.xposed.utils.XPrefs
-keep class com.drdisagree.iconify.xposed.** {
(android.content.Context);
}
+# Weather
+-keepnames class com.drdisagree.iconify.utils.weather.**
+-keep class com.drdisagree.iconify.utils.weather.** { *; }
+
# EventBus
-keepattributes *Annotation*
-keepclassmembers,allowoptimization,allowobfuscation class * {
@@ -59,4 +67,13 @@
# Obfuscation
-repackageclasses
--allowaccessmodification
\ No newline at end of file
+-allowaccessmodification
+
+# Root Service
+-keep class com.drdisagree.iconify.services.RootProviderProxy { *; }
+-keep class com.drdisagree.iconify.IRootProviderProxy { *; }
+
+# AIDL Classes
+-keep interface **.I* { *; }
+-keep class **.I*$Stub { *; }
+-keep class **.I*$Stub$Proxy { *; }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a7b81b747..676021d76 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -22,6 +22,17 @@
+
+
+
+
+
+
+
+
+
+
-->
+
+
@@ -170,12 +191,192 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/aidl/com/drdisagree/iconify/IExtractSubjectCallback.aidl b/app/src/main/aidl/com/drdisagree/iconify/IExtractSubjectCallback.aidl
new file mode 100644
index 000000000..d66b84c6e
--- /dev/null
+++ b/app/src/main/aidl/com/drdisagree/iconify/IExtractSubjectCallback.aidl
@@ -0,0 +1,6 @@
+package com.drdisagree.iconify;
+
+interface IExtractSubjectCallback {
+ void onStart(String message);
+ void onResult(boolean success, String message);
+}
\ No newline at end of file
diff --git a/app/src/main/aidl/com/drdisagree/iconify/IRootProviderProxy.aidl b/app/src/main/aidl/com/drdisagree/iconify/IRootProviderProxy.aidl
new file mode 100644
index 000000000..e874a37be
--- /dev/null
+++ b/app/src/main/aidl/com/drdisagree/iconify/IRootProviderProxy.aidl
@@ -0,0 +1,10 @@
+package com.drdisagree.iconify;
+
+import com.drdisagree.iconify.IExtractSubjectCallback;
+
+interface IRootProviderProxy {
+ String[] runCommand(String command);
+ void extractSubject(in Bitmap input, String resultPath, IExtractSubjectCallback callback);
+ void enableOverlay(in String packageName);
+ void disableOverlay(in String packageName);
+}
\ No newline at end of file
diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml
new file mode 100644
index 000000000..e15325f98
--- /dev/null
+++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml
@@ -0,0 +1,34 @@
+
+
+ -
+
+
-
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml
new file mode 100644
index 000000000..e15325f98
--- /dev/null
+++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml
@@ -0,0 +1,34 @@
+
+
+ -
+
+
-
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml
new file mode 100644
index 000000000..e05ab934e
--- /dev/null
+++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml
@@ -0,0 +1,6 @@
+
+
+
+ @android:color/system_neutral2_800
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml
new file mode 100644
index 000000000..b3ee65f40
--- /dev/null
+++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml
@@ -0,0 +1,6 @@
+
+
+
+ @android:color/system_neutral1_50
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Module/IconifyCompanion/META-INF/com/google/android/update-binary b/app/src/main/assets/Module/IconifyCompanion/META-INF/com/google/android/update-binary
index b91ebe4d6..88816b3ad 100644
--- a/app/src/main/assets/Module/IconifyCompanion/META-INF/com/google/android/update-binary
+++ b/app/src/main/assets/Module/IconifyCompanion/META-INF/com/google/android/update-binary
@@ -83,7 +83,8 @@ file_paths="/system/system_ext/priv-app/SystemUI/SystemUI.apk
/system/system_ext/priv-app/sysuia/sysuia.apk
/system/system_ext/priv-app/TranSystemUI/TranSystemUI.apk
/system/system_ext/priv-app/MiuiSystemUI/MiuiSystemUI.apk
-/system/product/priv-app/MiuiSystemUI/MiuiSystemUI.apk"
+/system/product/priv-app/MiuiSystemUI/MiuiSystemUI.apk
+/system/system_ext/priv-app/LMOSystemUI/LMOSystemUI.apk"
found=0
diff --git a/app/src/main/assets/Overlays/android/QSPBA/res/values-night/iconify.xml b/app/src/main/assets/Overlays/android/QSPBA/res/values-night/iconify.xml
index 3b3e92095..2d42498a7 100644
--- a/app/src/main/assets/Overlays/android/QSPBA/res/values-night/iconify.xml
+++ b/app/src/main/assets/Overlays/android/QSPBA/res/values-night/iconify.xml
@@ -1,6 +1,9 @@
+
@*android:color/black
+ @*android:color/black
+ @*android:color/black
@*android:color/black
@*android:color/black
@*android:color/black
diff --git a/app/src/main/assets/Overlays/android/QSPBD/res/values-night/iconify.xml b/app/src/main/assets/Overlays/android/QSPBD/res/values-night/iconify.xml
index 799c3435e..1afddfcd9 100644
--- a/app/src/main/assets/Overlays/android/QSPBD/res/values-night/iconify.xml
+++ b/app/src/main/assets/Overlays/android/QSPBD/res/values-night/iconify.xml
@@ -1,6 +1,9 @@
+
@*android:color/black
+ @*android:color/black
+ @*android:color/system_neutral1_800
@*android:color/black
@*android:color/black
@*android:color/black
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..834225d2d
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..834225d2d
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..effcde5d9
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..effcde5d9
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..504cc95a7
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..504cc95a7
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..e6aad62df
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..e6aad62df
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..62f871e78
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..62f871e78
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..62f871e78
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC1/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..79fb7f04c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..79fb7f04c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..581331608
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..581331608
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..7765c318e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..7765c318e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..679d52e93
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..679d52e93
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..6876c0799
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..6876c0799
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..6876c0799
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC10/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..66158ad22
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..66158ad22
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..f625c4edb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..f625c4edb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..316b0d3a5
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..316b0d3a5
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..4106a2347
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..4106a2347
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..cf10b0123
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..cf10b0123
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..cf10b0123
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC11/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_1x_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_1x_mobiledata.xml
new file mode 100644
index 000000000..9c394a97b
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_1x_mobiledata.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_3g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_3g_mobiledata.xml
new file mode 100644
index 000000000..948ca6340
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_3g_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_mobiledata.xml
new file mode 100644
index 000000000..c20075c6c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_plus_mobiledata.xml
new file mode 100644
index 000000000..6d0930c28
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_4g_plus_mobiledata.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_e_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_e_mobiledata.xml
new file mode 100644
index 000000000..4e6694d92
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_e_mobiledata.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_mobiledata.xml
new file mode 100644
index 000000000..66bdfcc7b
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_plus_mobiledata.xml
new file mode 100644
index 000000000..b8b302488
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_plus_mobiledata.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uc_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uc_mobiledata.xml
new file mode 100644
index 000000000..66bdfcc7b
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uc_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uw_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uw_mobiledata.xml
new file mode 100644
index 000000000..66bdfcc7b
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_5g_uw_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_e_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_e_mobiledata.xml
new file mode 100644
index 000000000..25138723c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_e_mobiledata.xml
@@ -0,0 +1,52 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_g_mobiledata.xml
new file mode 100644
index 000000000..aae9af97f
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_g_mobiledata.xml
@@ -0,0 +1,40 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_mobiledata.xml
new file mode 100644
index 000000000..8c2fea791
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_mobiledata.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_plus_mobiledata.xml
new file mode 100644
index 000000000..ca99c0c70
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_h_plus_mobiledata.xml
@@ -0,0 +1,54 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_mobiledata.xml
new file mode 100644
index 000000000..b0fbb24e0
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_mobiledata.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_plus_mobiledata.xml
new file mode 100644
index 000000000..593db9ec5
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_lte_plus_mobiledata.xml
@@ -0,0 +1,84 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..c461365dd
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..c461365dd
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..b4bed1feb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..b4bed1feb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..59adc2ab9
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..ebcf3b106
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..b1c402dfc
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..b1c402dfc
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..5836f94f2
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..5836f94f2
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..5836f94f2
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC12/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,60 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..51dbcbf08
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..51dbcbf08
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..70c43f196
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..70c43f196
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..3ba81ab0c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..3ba81ab0c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..7326f8eeb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..7326f8eeb
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..882677438
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..882677438
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..882677438
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC13/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_1x_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_1x_mobiledata.xml
new file mode 100644
index 000000000..4b4a46b9c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_1x_mobiledata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_3g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_3g_mobiledata.xml
new file mode 100644
index 000000000..72326376b
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_3g_mobiledata.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_mobiledata.xml
new file mode 100644
index 000000000..f5c04def5
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_mobiledata.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_plus_mobiledata.xml
new file mode 100644
index 000000000..f11915a96
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_4g_plus_mobiledata.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_e_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_e_mobiledata.xml
new file mode 100644
index 000000000..964bd1630
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_e_mobiledata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_mobiledata.xml
new file mode 100644
index 000000000..f63b3efad
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_mobiledata.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_plus_mobiledata.xml
new file mode 100644
index 000000000..60f758e57
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_plus_mobiledata.xml
@@ -0,0 +1,38 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uc_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uc_mobiledata.xml
new file mode 100644
index 000000000..f63b3efad
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uc_mobiledata.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uw_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uw_mobiledata.xml
new file mode 100644
index 000000000..f63b3efad
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_5g_uw_mobiledata.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_e_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_e_mobiledata.xml
new file mode 100644
index 000000000..97ee8cf2c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_e_mobiledata.xml
@@ -0,0 +1,14 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_g_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_g_mobiledata.xml
new file mode 100644
index 000000000..4651eab4a
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_g_mobiledata.xml
@@ -0,0 +1,14 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_mobiledata.xml
new file mode 100644
index 000000000..8f2438d1e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_mobiledata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_plus_mobiledata.xml
new file mode 100644
index 000000000..6f9f0fdb6
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_h_plus_mobiledata.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_mobiledata.xml
new file mode 100644
index 000000000..43bfef140
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_mobiledata.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_plus_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_plus_mobiledata.xml
new file mode 100644
index 000000000..1277d3094
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_lte_plus_mobiledata.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_4_bar.xml
new file mode 100644
index 000000000..8ea4c2470
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_4_bar.xml
@@ -0,0 +1,14 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_5_bar.xml
new file mode 100644
index 000000000..8ea4c2470
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_0_5_bar.xml
@@ -0,0 +1,14 @@
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_4_bar.xml
new file mode 100644
index 000000000..695c5263e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_4_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_5_bar.xml
new file mode 100644
index 000000000..695c5263e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_1_5_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_4_bar.xml
new file mode 100644
index 000000000..695c5263e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_4_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_5_bar.xml
new file mode 100644
index 000000000..695c5263e
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_2_5_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_4_bar.xml
new file mode 100644
index 000000000..83254ff81
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_4_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_5_bar.xml
new file mode 100644
index 000000000..83254ff81
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_3_5_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_4_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_4_bar.xml
new file mode 100644
index 000000000..4f271f0a1
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_4_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_5_bar.xml
new file mode 100644
index 000000000..4f271f0a1
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_4_5_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_5_5_bar.xml b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_5_5_bar.xml
new file mode 100644
index 000000000..4f271f0a1
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC14/res/drawable/ic_signal_cellular_5_5_bar.xml
@@ -0,0 +1,22 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/assets/Overlays/android/SGIC15/res/drawable/ic_1x_mobiledata.xml b/app/src/main/assets/Overlays/android/SGIC15/res/drawable/ic_1x_mobiledata.xml
new file mode 100644
index 000000000..785f1dc3c
--- /dev/null
+++ b/app/src/main/assets/Overlays/android/SGIC15/res/drawable/ic_1x_mobiledata.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+ This is a good place to grab references to custom Views in the layout and set
+ * properties on them.
+ *
+ *
Make sure to call through to the superclass's implementation.
+ *
+ * @param holder The ViewHolder that provides references to the views to fill in. These views
+ * will be recycled, so you should not hold a reference to them after this method
+ * returns.
+ */
+ @SuppressLint("WrongConstant")
+ @Override
+ public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ View summaryContainer = holder.findViewById(R.id.summary_container);
+ if (summaryContainer != null) {
+ summaryContainer.setVisibility(
+ TextUtils.isEmpty(getSummary()) ? View.GONE : View.VISIBLE);
+ mAppendix = holder.findViewById(R.id.appendix);
+ if (mAppendix != null && mAppendixVisibility != -1) {
+ mAppendix.setVisibility(mAppendixVisibility);
+ }
+ }
+
+ mExtraWidget = (ImageView) holder.findViewById(R.id.selector_extra_widget);
+ mExtraWidgetContainer = holder.findViewById(R.id.selector_extra_widget_container);
+
+ setExtraWidgetOnClickListener(mExtraWidgetOnClickListener);
+ }
+
+ /**
+ * Set the visibility state of appendix view.
+ *
+ * @param visibility One of {@link View#VISIBLE}, {@link View#INVISIBLE}, or {@link View#GONE}.
+ */
+ public void setAppendixVisibility(int visibility) {
+ if (mAppendix != null) {
+ mAppendix.setVisibility(visibility);
+ }
+ mAppendixVisibility = visibility;
+ }
+
+ /**
+ * Sets the callback to be invoked when extra widget is clicked by the user.
+ *
+ * @param listener The callback to be invoked
+ */
+ public void setExtraWidgetOnClickListener(View.OnClickListener listener) {
+ mExtraWidgetOnClickListener = listener;
+
+ if (mExtraWidget == null || mExtraWidgetContainer == null) {
+ return;
+ }
+
+ mExtraWidget.setOnClickListener(mExtraWidgetOnClickListener);
+
+ mExtraWidgetContainer.setVisibility((mExtraWidgetOnClickListener != null)
+ ? View.VISIBLE : View.GONE);
+ }
+
+ /**
+ * Returns whether this preference is a checkbox.
+ */
+ public boolean isCheckBox() {
+ return mIsCheckBox;
+ }
+
+ private void init() {
+ if (mIsCheckBox) {
+ setWidgetLayoutResource(R.layout.preference_widget_checkbox);
+ } else {
+ setWidgetLayoutResource(R.layout.preference_widget_radiobutton);
+ }
+ setLayoutResource(R.layout.preference_selector_with_widget);
+ setIconSpaceReserved(false);
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/SliderPreference.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/SliderPreference.java
new file mode 100644
index 000000000..cebbff3e6
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/SliderPreference.java
@@ -0,0 +1,343 @@
+package com.drdisagree.iconify.ui.preferences;
+
+/*
+ * From Siavash79/rangesliderpreference
+ * https://github.com/siavash79/rangesliderpreference
+ */
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.TypedArray;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.util.JsonReader;
+import android.util.JsonWriter;
+import android.util.Log;
+import android.view.View;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.core.content.ContextCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.drdisagree.iconify.utils.HapticUtils;
+import com.google.android.material.button.MaterialButton;
+import com.google.android.material.slider.LabelFormatter;
+import com.google.android.material.slider.RangeSlider;
+
+import java.io.StringReader;
+import java.io.StringWriter;
+import java.math.BigDecimal;
+import java.text.DecimalFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Scanner;
+
+import com.drdisagree.iconify.R;
+
+public class SliderPreference extends Preference {
+
+ private static final String TAG = SliderPreference.class.getSimpleName();
+ private float valueFrom;
+ private float valueTo;
+ private final float tickInterval;
+ private final boolean showResetButton;
+ public final List defaultValue = new ArrayList<>();
+ public RangeSlider slider;
+ private MaterialButton mResetButton;
+ @SuppressWarnings("unused")
+ private TextView sliderValue;
+ int valueCount;
+ private String valueFormat;
+ private final float outputScale;
+ private final boolean isDecimalFormat;
+ private String decimalFormat = "#.#";
+
+ boolean updateConstantly, showValueLabel;
+
+ @SuppressWarnings("unused")
+ public SliderPreference(Context context, AttributeSet attrs) {
+ this(context, attrs, 0);
+ setSelectable(false);
+ }
+
+ public SliderPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ setSelectable(false);
+ setLayoutResource(R.layout.custom_preference_slider);
+
+ TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.SliderPreference);
+ updateConstantly = a.getBoolean(R.styleable.SliderPreference_updatesContinuously, false);
+ valueCount = a.getInteger(R.styleable.SliderPreference_valueCount, 1);
+ valueFrom = a.getFloat(R.styleable.SliderPreference_minVal, 0f);
+ valueTo = a.getFloat(R.styleable.SliderPreference_maxVal, 100f);
+ tickInterval = a.getFloat(R.styleable.SliderPreference_tickInterval, 1f);
+ showResetButton = a.getBoolean(R.styleable.SliderPreference_showResetButton, false);
+ showValueLabel = a.getBoolean(R.styleable.SliderPreference_showValueLabel, true);
+ valueFormat = a.getString(R.styleable.SliderPreference_valueFormat);
+ isDecimalFormat = a.getBoolean(R.styleable.SliderPreference_isDecimalFormat, false);
+ if (a.hasValue(R.styleable.SliderPreference_decimalFormat)) {
+ decimalFormat = a.getString(R.styleable.SliderPreference_decimalFormat);
+ } else {
+ decimalFormat = "#.#"; // Default decimal format
+ }
+ outputScale = a.getFloat(R.styleable.SliderPreference_outputScale, 1f);
+ String defaultValStr = a.getString(androidx.preference.R.styleable.Preference_defaultValue);
+
+ if (valueFormat == null) valueFormat = "";
+
+ try {
+ Scanner scanner = new Scanner(defaultValStr);
+ scanner.useDelimiter(",");
+ scanner.useLocale(Locale.ENGLISH);
+
+ while (scanner.hasNext()) {
+ defaultValue.add(scanner.nextFloat());
+ }
+ } catch (Exception ignored) {
+ Log.e(TAG, String.format("SliderPreference: Error parsing default values for key: %s", getKey()));
+ }
+
+ a.recycle();
+ }
+
+ public void savePrefs() {
+ setValues(getSharedPreferences(), getKey(), slider.getValues());
+ }
+
+ @SuppressWarnings("UnusedReturnValue")
+ public static boolean setValues(SharedPreferences sharedPreferences, String key, List values) {
+ try {
+ StringWriter writer = new StringWriter();
+ JsonWriter jsonWriter = new JsonWriter(writer);
+ jsonWriter.beginObject();
+ jsonWriter.name("");
+ jsonWriter.beginArray();
+
+ for (float value : values) {
+ jsonWriter.value(value);
+ }
+ jsonWriter.endArray();
+ jsonWriter.endObject();
+ jsonWriter.close();
+ String jsonString = writer.toString();
+
+ sharedPreferences.edit().putString(key, jsonString).apply();
+
+ return true;
+
+ } catch (Exception ignored) {
+ return false;
+ }
+ }
+
+ public void syncState() {
+ boolean needsCommit = false;
+
+ List values = getValues(getSharedPreferences(), getKey(), valueFrom);
+ BigDecimal step = new BigDecimal(String.valueOf(slider.getStepSize())); //float and double are not accurate when it comes to decimal points
+
+ for (int i = 0; i < values.size(); i++) {
+ BigDecimal round = new BigDecimal(Math.round(values.get(i) / slider.getStepSize()));
+ double v = Math.min(Math.max(step.multiply(round).doubleValue(), slider.getValueFrom()), slider.getValueTo());
+ if (v != values.get(i)) {
+ values.set(i, (float) v);
+ needsCommit = true;
+ }
+ }
+ if (values.size() < valueCount) {
+ needsCommit = true;
+ values = defaultValue;
+ while (values.size() < valueCount) {
+ values.add(valueFrom);
+ }
+ } else if (values.size() > valueCount) {
+ needsCommit = true;
+ while (values.size() > valueCount) {
+ values.remove(values.size() - 1);
+ }
+ }
+
+ try {
+ slider.setValues(values);
+ if (needsCommit) savePrefs();
+ } catch (Throwable t) {
+ values.clear();
+ }
+ }
+
+ RangeSlider.OnChangeListener changeListener = (slider, value, fromUser) -> {
+ if (!getKey().equals(slider.getTag())) return;
+
+ if (updateConstantly && fromUser) {
+ savePrefs();
+ }
+ };
+
+ RangeSlider.OnSliderTouchListener sliderTouchListener = new RangeSlider.OnSliderTouchListener() {
+ @Override
+ public void onStartTrackingTouch(@NonNull RangeSlider slider) {
+ slider.setLabelFormatter(labelFormatter);
+ }
+
+ @Override
+ public void onStopTrackingTouch(@NonNull RangeSlider slider) {
+ if (!getKey().equals(slider.getTag())) return;
+
+ handleResetButton();
+
+ if (!updateConstantly) {
+ savePrefs();
+ }
+ }
+ };
+
+ LabelFormatter labelFormatter = new LabelFormatter() {
+ @NonNull
+ @Override
+ public String getFormattedValue(float value) {
+ String result;
+ if (valueFormat != null && (valueFormat.isBlank() || valueFormat.isEmpty())) {
+ result = !isDecimalFormat
+ ? Integer.toString((int) (slider.getValues().get(0) / outputScale))
+ : new DecimalFormat(decimalFormat).format(slider.getValues().get(0) / outputScale);
+ } else {
+ result = !isDecimalFormat
+ ? Integer.toString((int) (slider.getValues().get(0) / 1f))
+ : new DecimalFormat(decimalFormat).format(slider.getValues().get(0) / outputScale);
+ }
+ result += valueFormat;
+
+ return result;
+ }
+ };
+
+ @Override
+ public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+
+ if (isEnabled()) {
+ TextView title = holder.itemView.findViewById(android.R.id.title);
+ title.setTextColor(ContextCompat.getColor(getContext(), R.color.textColorPrimary));
+ }
+
+ slider = holder.itemView.findViewById(R.id.slider);
+ slider.setTag(getKey());
+
+ slider.addOnSliderTouchListener(sliderTouchListener);
+ slider.addOnChangeListener(changeListener);
+
+ slider.setLabelFormatter(labelFormatter);
+
+ mResetButton = holder.itemView.findViewById(R.id.reset_button);
+ if (showResetButton) {
+ mResetButton.setVisibility(View.VISIBLE);
+ mResetButton.setOnClickListener(v -> {
+ handleResetButton();
+ HapticUtils.weakVibrate(v);
+
+ slider.setValues(defaultValue);
+ savePrefs();
+ });
+ } else {
+ mResetButton.setVisibility(View.GONE);
+ }
+
+ sliderValue = holder.itemView.findViewById(androidx.preference.R.id.seekbar_value);
+
+ slider.setValueFrom(valueFrom);
+ slider.setValueTo(valueTo);
+ slider.setStepSize(tickInterval);
+
+ syncState();
+
+ handleResetButton();
+ }
+
+ public void setMin(float value) {
+ valueFrom = value;
+ if (slider != null) slider.setValueFrom(value);
+ }
+
+ public void setMax(float value) {
+ valueTo = value;
+ if (slider != null) slider.setValueTo(value);
+ }
+
+ public static List getValues(SharedPreferences prefs, String key, float defaultValue) {
+ List values;
+
+ try {
+ String JSONString = prefs.getString(key, "");
+ values = getValues(JSONString);
+ } catch (Exception ignored) {
+ try {
+ float value = prefs.getFloat(key, defaultValue);
+ values = Collections.singletonList(value);
+ } catch (Exception ignored2) {
+ try {
+ int value = prefs.getInt(key, Math.round(defaultValue));
+ values = Collections.singletonList((float) value);
+ } catch (Exception ignored3) {
+ values = Collections.singletonList(defaultValue);
+ }
+ }
+ }
+ return values;
+ }
+
+ public static List getValues(String JSONString) throws Exception {
+ List values = new ArrayList<>();
+
+ if (JSONString.trim().isEmpty()) return values;
+
+ JsonReader jsonReader = new JsonReader(new StringReader(JSONString));
+
+ jsonReader.beginObject();
+ try {
+ jsonReader.nextName();
+ jsonReader.beginArray();
+ } catch (Exception ignored) {
+ }
+
+ while (jsonReader.hasNext()) {
+ try {
+ jsonReader.nextName();
+ } catch (Exception ignored) {
+ }
+ values.add((float) jsonReader.nextDouble());
+ }
+
+ return values;
+ }
+
+ private void handleResetButton() {
+ if (mResetButton == null) return;
+
+ if (showResetButton) {
+ mResetButton.setVisibility(View.VISIBLE);
+ mResetButton.setEnabled(isEnabled() && !Objects.equals(slider.getValues().get(0), defaultValue.get(0)));
+ } else {
+ mResetButton.setVisibility(View.GONE);
+ }
+ }
+
+ public static float getSingleFloatValue(SharedPreferences prefs, String key, float defaultValue) {
+ float result = defaultValue;
+
+ try {
+ result = getValues(prefs, key, defaultValue).get(0);
+ } catch (Throwable ignored) {
+ }
+
+ return result;
+ }
+
+ public static int getSingleIntValue(SharedPreferences prefs, String key, int defaultValue) {
+ return Math.round(getSingleFloatValue(prefs, key, defaultValue));
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/SwitchPreference.kt b/app/src/main/java/com/drdisagree/iconify/ui/preferences/SwitchPreference.kt
new file mode 100644
index 000000000..9121bb20e
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/SwitchPreference.kt
@@ -0,0 +1,39 @@
+package com.drdisagree.iconify.ui.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import androidx.preference.SwitchPreferenceCompat
+import com.drdisagree.iconify.R
+
+class SwitchPreference : SwitchPreferenceCompat {
+
+ constructor(
+ context: Context,
+ attrs: AttributeSet?,
+ defStyleAttr: Int,
+ defStyleRes: Int
+ ) : super(context, attrs, defStyleAttr, defStyleRes) {
+ initResource()
+ }
+
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+ context,
+ attrs,
+ defStyleAttr
+ ) {
+ initResource()
+ }
+
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+ initResource()
+ }
+
+ constructor(context: Context) : super(context) {
+ initResource()
+ }
+
+ private fun initResource() {
+ layoutResource = R.layout.custom_preference_switch
+ widgetLayoutResource = R.layout.preference_material_switch
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/TimePickerPreference.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/TimePickerPreference.java
new file mode 100644
index 000000000..877c34f7f
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/TimePickerPreference.java
@@ -0,0 +1,113 @@
+package com.drdisagree.iconify.ui.preferences;
+
+/*
+ * Modified from https://github.com/etidoUP/Material-Time-picker-preference-
+ * Credits: etidoUP
+ */
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.format.DateFormat;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.google.android.material.timepicker.MaterialTimePicker;
+import com.google.android.material.timepicker.TimeFormat;
+
+import java.util.Locale;
+import java.util.concurrent.atomic.AtomicInteger;
+
+import com.drdisagree.iconify.R;
+
+public class TimePickerPreference extends Preference {
+
+ private String timeValue = "00:00";
+
+ public TimePickerPreference(Context context) {
+ super(context);
+ }
+
+ public TimePickerPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ init(context, attrs);
+ }
+
+ public TimePickerPreference(Context context, AttributeSet attrs, int defStyle) {
+ super(context, attrs, defStyle);
+ init(context, attrs);
+ }
+
+ private void init(Context context, AttributeSet attrs) {
+ setLayoutResource(R.layout.custom_preference_time_picker);
+ if (attrs != null) {
+ TypedArray a =
+ context.getTheme().obtainStyledAttributes(attrs, R.styleable.MaterialTimePickerPreference, 0, 0);
+ try {
+ timeValue = a.getString(R.styleable.MaterialTimePickerPreference_presetValue);
+ } catch (Exception e) {
+ timeValue = "00:00";
+ } finally {
+ a.recycle();
+ }
+ }
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull PreferenceViewHolder holder) {
+ super.onBindViewHolder(holder);
+ TextView timeTextView = (TextView) holder.findViewById(R.id.time_stamp);
+ timeTextView.setText(timeValue);
+ }
+
+ @Override
+ protected void onClick() {
+ super.onClick();
+
+ // parse hour and minute from timeValue
+ AtomicInteger hour = new AtomicInteger(Integer.parseInt(timeValue.split(":")[0]));
+ AtomicInteger minute = new AtomicInteger(Integer.parseInt(timeValue.split(":")[1]));
+
+ MaterialTimePicker timePicker =
+ new MaterialTimePicker.Builder().setTimeFormat(DateFormat.is24HourFormat(getContext()) ? TimeFormat.CLOCK_24H : TimeFormat.CLOCK_12H).setHour(hour.get()).setMinute(minute.get()).build();
+
+ timePicker.addOnPositiveButtonClickListener(
+ v -> {
+ hour.set(timePicker.getHour());
+ minute.set(timePicker.getMinute());
+ String selectedTime = String.format(Locale.getDefault(), "%02d:%02d", hour.get(), minute.get());
+
+ timeValue = selectedTime;
+ persistString(selectedTime);
+
+ notifyChanged();
+ });
+
+ timePicker.show(((AppCompatActivity) getContext()).getSupportFragmentManager(), "timePicker");
+ }
+
+ @Override
+ protected Object onGetDefaultValue(TypedArray a, int index) {
+ return a.getString(index);
+ }
+
+ @Override
+ protected void onSetInitialValue(Object defaultValue) {
+ timeValue = getPersistedString((String) defaultValue);
+ persistString(timeValue);
+ }
+
+ public String getTimeValue() {
+ return this.timeValue;
+ }
+
+ public void setTimeValue(String timeValue) {
+ this.timeValue = timeValue;
+ persistString(timeValue);
+ notifyChanged();
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/UpdateCheckerPreference.kt b/app/src/main/java/com/drdisagree/iconify/ui/preferences/UpdateCheckerPreference.kt
new file mode 100644
index 000000000..8c5b3412d
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/UpdateCheckerPreference.kt
@@ -0,0 +1,146 @@
+package com.drdisagree.iconify.ui.preferences
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.View
+import android.widget.TextView
+import androidx.preference.Preference
+import androidx.preference.PreferenceViewHolder
+import com.drdisagree.iconify.BuildConfig
+import com.drdisagree.iconify.R
+import com.drdisagree.iconify.common.Const.LATEST_VERSION_URL
+import com.drdisagree.iconify.common.Preferences.AUTO_UPDATE
+import com.drdisagree.iconify.common.Preferences.LAST_UPDATE_CHECK_TIME
+import com.drdisagree.iconify.common.Preferences.NEW_UPDATE_FOUND
+import com.drdisagree.iconify.common.Preferences.NEW_UPDATE_VERSION_CODE
+import com.drdisagree.iconify.common.Preferences.UPDATE_CHECK_TIME
+import com.drdisagree.iconify.common.Preferences.VER_CODE
+import com.drdisagree.iconify.config.RPrefs.getBoolean
+import com.drdisagree.iconify.config.RPrefs.getLong
+import com.drdisagree.iconify.config.RPrefs.getString
+import com.drdisagree.iconify.config.RPrefs.putBoolean
+import com.drdisagree.iconify.config.RPrefs.putLong
+import com.drdisagree.iconify.config.RPrefs.putString
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.SupervisorJob
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import org.json.JSONObject
+import java.io.BufferedReader
+import java.io.InputStreamReader
+import java.net.HttpURLConnection
+import java.net.URL
+
+class UpdateCheckerPreference(context: Context, attrs: AttributeSet?) : Preference(context, attrs) {
+
+ private val scope = CoroutineScope(Dispatchers.Main + SupervisorJob())
+ private var mView: View? = null
+
+ override fun onBindViewHolder(holder: PreferenceViewHolder) {
+ super.onBindViewHolder(holder)
+
+ mView = holder.itemView
+
+ if (newUpdateVersionCode != BuildConfig.VERSION_CODE.toString()) {
+ mView?.findViewById(R.id.update_desc)?.text = context.getString(
+ R.string.update_dialog_desc,
+ newUpdateVersionCode
+ )
+ }
+ }
+
+ fun checkForUpdate() {
+ if (shouldCheckForUpdate()) {
+ putLong(LAST_UPDATE_CHECK_TIME, System.currentTimeMillis())
+
+ scope.launch {
+ val result = fetchLatestVersion()
+
+ if (result != null) {
+ handleUpdateResult(result)
+ }
+ }
+ } else {
+ if (getString(NEW_UPDATE_VERSION_CODE, null) == null || getString(
+ NEW_UPDATE_VERSION_CODE,
+ BuildConfig.VERSION_CODE.toString()
+ )!!.toInt() <= BuildConfig.VERSION_CODE
+ ) {
+ putString(NEW_UPDATE_VERSION_CODE, BuildConfig.VERSION_CODE.toString())
+ putBoolean(NEW_UPDATE_FOUND, false)
+ }
+ }
+ }
+
+ private fun shouldCheckForUpdate(): Boolean {
+ val lastChecked = getLong(LAST_UPDATE_CHECK_TIME, -1)
+
+ return getBoolean(AUTO_UPDATE, true) && (lastChecked == -1L ||
+ (System.currentTimeMillis() - lastChecked >= getLong(UPDATE_CHECK_TIME, 0)))
+ }
+
+ private suspend fun fetchLatestVersion(): String? = withContext(Dispatchers.IO) {
+ var urlConnection: HttpURLConnection? = null
+ var bufferedReader: BufferedReader? = null
+
+ return@withContext try {
+ val url = URL(LATEST_VERSION_URL)
+ urlConnection = url.openConnection() as HttpURLConnection
+ urlConnection.connect()
+
+ val inputStream = urlConnection.inputStream
+ bufferedReader = BufferedReader(InputStreamReader(inputStream))
+
+ val stringBuffer = StringBuilder()
+ var line: String?
+
+ while (bufferedReader.readLine().also { line = it } != null) {
+ stringBuffer.append(line).append("\n")
+ }
+
+ if (stringBuffer.isEmpty()) {
+ null
+ } else {
+ stringBuffer.toString()
+ }
+ } catch (e: Exception) {
+ null
+ } finally {
+ urlConnection?.disconnect()
+ bufferedReader?.close()
+ }
+ }
+
+ private fun handleUpdateResult(result: String) {
+ try {
+ val latestVersion = JSONObject(result)
+
+ if (latestVersion.getString(VER_CODE).toInt() > BuildConfig.VERSION_CODE) {
+ newUpdateVersionCode = latestVersion.getString("versionName")
+
+ mView?.findViewById(R.id.update_desc)?.text = context.getString(
+ R.string.update_dialog_desc,
+ newUpdateVersionCode
+ )
+
+ putString(NEW_UPDATE_VERSION_CODE, newUpdateVersionCode)
+ putBoolean(NEW_UPDATE_FOUND, true)
+ } else {
+ putString(NEW_UPDATE_VERSION_CODE, BuildConfig.VERSION_CODE.toString())
+ putBoolean(NEW_UPDATE_FOUND, false)
+ }
+ } catch (_: Exception) {
+ }
+ }
+
+ override fun onDetached() {
+ scope.cancel()
+ super.onDetached()
+ }
+
+ companion object {
+ private var newUpdateVersionCode = BuildConfig.VERSION_CODE.toString()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/AnimationUtils.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/AnimationUtils.java
new file mode 100644
index 000000000..9442bcdcb
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/AnimationUtils.java
@@ -0,0 +1,89 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.ArgbEvaluator;
+import android.animation.ValueAnimator;
+import android.content.Context;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.view.View;
+import android.view.ViewAnimationUtils;
+
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
+
+public class AnimationUtils {
+ public static void registerCircularRevealAnimation(final Context context, final View view, final RevealAnimationSetting revealSettings) {
+ final int startColor = revealSettings.getColorAccent();
+ final int endColor = getBackgroundColor(view);
+
+ view.addOnLayoutChangeListener(new View.OnLayoutChangeListener() {
+ @Override
+ public void onLayoutChange(View v, int left, int top, int right, int bottom, int oldLeft, int oldTop, int oldRight, int oldBottom) {
+ v.removeOnLayoutChangeListener(this);
+ view.setVisibility(View.VISIBLE);
+ int cx = revealSettings.getCenterX();
+ int cy = revealSettings.getCenterY();
+ int width = revealSettings.getWidth();
+ int height = revealSettings.getHeight();
+ int duration = context.getResources().getInteger(android.R.integer.config_longAnimTime);
+
+ //Simply use the diagonal of the view
+ float finalRadius = (float) Math.sqrt(width * width + height * height);
+ Animator anim = ViewAnimationUtils.createCircularReveal(v, cx, cy, 0, finalRadius).setDuration(duration);
+ anim.setInterpolator(new FastOutSlowInInterpolator());
+ anim.start();
+ startColorAnimation(view, startColor, endColor, duration);
+ }
+ });
+ }
+
+ private static void startColorAnimation(final View view, final int startColor, final int endColor, int duration) {
+ ValueAnimator anim = new ValueAnimator();
+ anim.setIntValues(startColor, endColor);
+ anim.setEvaluator(new ArgbEvaluator());
+ anim.addUpdateListener(valueAnimator -> view.setBackgroundColor((Integer) valueAnimator.getAnimatedValue()));
+ anim.setDuration(duration);
+ anim.start();
+ }
+
+ @SuppressWarnings("unused")
+ public static void startCircularExitAnimation(final Context context, final View view, final RevealAnimationSetting revealSettings, final OnDismissedListener listener) {
+ final int startColor = getBackgroundColor(view);
+ final int endColor = revealSettings.getColorAccent();
+
+ int cx = revealSettings.getCenterX();
+ int cy = revealSettings.getCenterY();
+ int width = revealSettings.getWidth();
+ int height = revealSettings.getHeight();
+ int duration = context.getResources().getInteger(android.R.integer.config_longAnimTime);
+
+ float initRadius = (float) Math.sqrt(width * width + height * height);
+ Animator anim = ViewAnimationUtils.createCircularReveal(view, cx, cy, initRadius, 0);
+ anim.setDuration(duration);
+ anim.setInterpolator(new FastOutSlowInInterpolator());
+ anim.addListener(new AnimatorListenerAdapter() {
+ @Override
+ public void onAnimationEnd(Animator animation) {
+ view.setVisibility(View.INVISIBLE);
+ listener.onDismissed();
+ }
+ });
+ anim.start();
+ startColorAnimation(view, startColor, endColor, duration);
+ }
+
+ private static int getBackgroundColor(View view) {
+ int color = Color.TRANSPARENT;
+ Drawable background = view.getBackground();
+ if (background instanceof ColorDrawable) {
+ color = ((ColorDrawable) background).getColor();
+ }
+ return color;
+ }
+
+ public interface OnDismissedListener {
+ void onDismissed();
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/Breadcrumb.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/Breadcrumb.java
new file mode 100644
index 000000000..4a6e56601
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/Breadcrumb.java
@@ -0,0 +1,25 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.text.TextUtils;
+
+import androidx.annotation.Nullable;
+
+class Breadcrumb {
+ private Breadcrumb() {
+
+ }
+
+ /**
+ * Joins two breadcrumbs
+ *
+ * @param s1 First breadcrumb, might be null
+ * @param s2 Second breadcrumb
+ * @return Both breadcrumbs joined
+ */
+ static String concat(@Nullable String s1, String s2) {
+ if (TextUtils.isEmpty(s1)) {
+ return s2;
+ }
+ return s1 + " > " + s2;
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/HistoryItem.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/HistoryItem.java
new file mode 100644
index 000000000..ac192a6a2
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/HistoryItem.java
@@ -0,0 +1,28 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+class HistoryItem extends ListItem {
+ static final int TYPE = 1;
+ private final String term;
+
+ HistoryItem(String term) {
+ super();
+ this.term = term;
+ }
+
+ @Override
+ public int getType() {
+ return TYPE;
+ }
+
+ String getTerm() {
+ return term;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (obj instanceof HistoryItem) {
+ return ((HistoryItem) obj).term.equals(term);
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/ListItem.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/ListItem.java
new file mode 100644
index 000000000..7e142bef8
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/ListItem.java
@@ -0,0 +1,5 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+public abstract class ListItem {
+ public abstract int getType();
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceItem.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceItem.java
new file mode 100644
index 000000000..58b690ba0
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceItem.java
@@ -0,0 +1,175 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.annotation.SuppressLint;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.XmlRes;
+
+import org.apache.commons.text.similarity.FuzzyScore;
+
+import java.util.ArrayList;
+import java.util.Locale;
+
+public class PreferenceItem extends ListItem implements Parcelable {
+ public static final Creator CREATOR = new Creator<>() {
+ @Override
+ public PreferenceItem createFromParcel(Parcel in) {
+ return new PreferenceItem(in);
+ }
+
+ @Override
+ public PreferenceItem[] newArray(int size) {
+ return new PreferenceItem[size];
+ }
+ };
+ static final int TYPE = 2;
+ @SuppressLint("ConstantLocale")
+ private static final FuzzyScore fuzzyScore = new FuzzyScore(Locale.getDefault());
+ String title;
+ String summary;
+ String key;
+ String entries;
+ String breadcrumbs;
+ String keywords;
+ ArrayList keyBreadcrumbs = new ArrayList<>();
+ int resId;
+ private float lastScore = 0;
+ private String lastKeyword = null;
+
+ PreferenceItem() {
+ }
+
+ private PreferenceItem(Parcel in) {
+ this.title = in.readString();
+ this.summary = in.readString();
+ this.key = in.readString();
+ this.breadcrumbs = in.readString();
+ this.keywords = in.readString();
+ this.resId = in.readInt();
+ }
+
+ boolean hasData() {
+ return title != null || summary != null;
+ }
+
+ boolean matchesFuzzy(String keyword) {
+ return getScore(keyword) > 0.3;
+ }
+
+ boolean matches(String keyword) {
+ Locale locale = Locale.getDefault();
+ return getInfo().toLowerCase(locale).contains(keyword.toLowerCase(locale));
+ }
+
+ float getScore(String keyword) {
+ if (TextUtils.isEmpty(keyword)) {
+ return 0;
+ } else if (TextUtils.equals(lastKeyword, keyword)) {
+ return lastScore;
+ }
+ String info = getInfo();
+
+ float score = fuzzyScore.fuzzyScore(info, "ø" + keyword);
+ float maxScore = (keyword.length() + 1) * 3 - 2; // First item can not get +2 bonus score
+
+ lastScore = score / maxScore;
+ lastKeyword = keyword;
+ return lastScore;
+ }
+
+ private String getInfo() {
+ StringBuilder infoBuilder = new StringBuilder();
+ if (!TextUtils.isEmpty(title)) {
+ infoBuilder.append("ø").append(title);
+ }
+ if (!TextUtils.isEmpty(summary)) {
+ infoBuilder.append("ø").append(summary);
+ }
+ if (!TextUtils.isEmpty(entries)) {
+ infoBuilder.append("ø").append(entries);
+ }
+ if (!TextUtils.isEmpty(breadcrumbs)) {
+ infoBuilder.append("ø").append(breadcrumbs);
+ }
+ if (!TextUtils.isEmpty(keywords)) {
+ infoBuilder.append("ø").append(keywords);
+ }
+ return infoBuilder.toString();
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withKey(String key) {
+ this.key = key;
+ return this;
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withSummary(String summary) {
+ this.summary = summary;
+ return this;
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withTitle(String title) {
+ this.title = title;
+ return this;
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withEntries(String entries) {
+ this.entries = entries;
+ return this;
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withKeywords(String keywords) {
+ this.keywords = keywords;
+ return this;
+ }
+
+ @SuppressWarnings("unused")
+ public PreferenceItem withResId(@XmlRes Integer resId) {
+ this.resId = resId;
+ return this;
+ }
+
+ /**
+ * @param breadcrumb The breadcrumb to add
+ * @return For chaining
+ */
+ @SuppressWarnings("unused")
+ public PreferenceItem addBreadcrumb(String breadcrumb) {
+ this.breadcrumbs = Breadcrumb.concat(this.breadcrumbs, breadcrumb);
+ return this;
+ }
+
+ @NonNull
+ @Override
+ public String toString() {
+ return "PreferenceItem: " + title + " " + summary + " " + key;
+ }
+
+ @Override
+ public int getType() {
+ return TYPE;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel parcel, int i) {
+ parcel.writeString(title);
+ parcel.writeString(summary);
+ parcel.writeString(key);
+ parcel.writeString(breadcrumbs);
+ parcel.writeString(keywords);
+ parcel.writeInt(resId);
+ }
+
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceParser.kt b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceParser.kt
new file mode 100644
index 000000000..96f24c345
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/PreferenceParser.kt
@@ -0,0 +1,227 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch
+
+import android.content.Context
+import android.text.TextUtils
+import com.drdisagree.iconify.config.PrefsHelper.isVisible
+import com.drdisagree.iconify.ui.preferences.preferencesearch.SearchConfiguration.SearchIndexItem
+import org.xmlpull.v1.XmlPullParser
+
+internal class PreferenceParser(private val mContext: Context) {
+
+ private val allEntries = ArrayList()
+
+ fun addResourceFile(item: SearchIndexItem) {
+ allEntries.addAll(parseFile(item))
+ }
+
+ fun addPreferenceItems(preferenceItems: ArrayList) {
+ preferenceItems.removeIf { item: PreferenceItem -> !isVisible(item.key) }
+ allEntries.addAll(preferenceItems)
+ }
+
+ private fun parseFile(item: SearchIndexItem): ArrayList {
+ val results = ArrayList()
+ val xpp: XmlPullParser = mContext.resources.getXml(item.resId)
+ val bannedKeys: MutableList = item.searchConfiguration.bannedKeys
+
+ try {
+ xpp.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, true)
+ xpp.setFeature(XmlPullParser.FEATURE_REPORT_NAMESPACE_ATTRIBUTES, true)
+ val breadcrumbs = ArrayList()
+ val keyBreadcrumbs = ArrayList()
+ if (!TextUtils.isEmpty(item.breadcrumb)) {
+ breadcrumbs.add(item.breadcrumb)
+ }
+ while (xpp.eventType != XmlPullParser.END_DOCUMENT) {
+ if (xpp.eventType == XmlPullParser.START_TAG) {
+ val result = parseSearchResult(xpp)
+ result.resId = item.resId
+
+ try {
+ if (!isSearchable(result)) {
+ if (!bannedKeys.contains(result.key)) bannedKeys.add(result.key)
+ } else bannedKeys.remove(result.key)
+ } catch (ignored: Exception) {
+ }
+
+ if (!BLACKLIST.contains(xpp.name)
+ && result.hasData()
+ && "true" != getAttribute(xpp, NS_SEARCH, "ignore") && !bannedKeys.contains(
+ result.key
+ )
+ && shouldAddPreferenceItem(results, result)
+ ) {
+ result.breadcrumbs = joinBreadcrumbs(breadcrumbs)
+ result.keyBreadcrumbs = cleanupKeyBreadcrumbs(keyBreadcrumbs)
+ if (!results.contains(result)) {
+ results.add(result)
+ }
+ }
+ if (CONTAINERS.contains(xpp.name)) {
+ breadcrumbs.add(if (result.title == null) "" else result.title)
+ }
+ if (xpp.name == "PreferenceScreen") {
+ keyBreadcrumbs.add(getAttribute(xpp, "key"))
+ }
+ } else if (xpp.eventType == XmlPullParser.END_TAG && CONTAINERS.contains(xpp.name)) {
+ breadcrumbs.removeAt(breadcrumbs.size - 1)
+ if (xpp.name == "PreferenceScreen") {
+ keyBreadcrumbs.removeAt(keyBreadcrumbs.size - 1)
+ }
+ }
+
+ xpp.next()
+ }
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ return results
+ }
+
+ private fun isSearchable(result: PreferenceItem): Boolean {
+ if (TextUtils.isEmpty(result.key)) return false
+ return isVisible(result.key)
+ }
+
+ private fun shouldAddPreferenceItem(
+ results: ArrayList,
+ result: PreferenceItem
+ ): Boolean {
+ var isAlreadyAdded = false
+ for (item in results) {
+ if (item.key == result.key && item.resId == result.resId) {
+ isAlreadyAdded = true
+ break
+ }
+ }
+ return !isAlreadyAdded
+ }
+
+ private fun cleanupKeyBreadcrumbs(keyBreadcrumbs: ArrayList): ArrayList {
+ val result = ArrayList()
+ for (keyBreadcrumb in keyBreadcrumbs) {
+ if (keyBreadcrumb != null) {
+ result.add(keyBreadcrumb)
+ }
+ }
+ return result
+ }
+
+ private fun joinBreadcrumbs(breadcrumbs: ArrayList): String? {
+ var result: String? = ""
+ for (crumb in breadcrumbs) {
+ if (!TextUtils.isEmpty(crumb)) {
+ result = Breadcrumb.concat(result, crumb)
+ }
+ }
+ return result
+ }
+
+ private fun getAttribute(xpp: XmlPullParser, namespace: String?, attribute: String): String? {
+ for (i in 0 until xpp.attributeCount) {
+ if (attribute == xpp.getAttributeName(i) &&
+ (namespace == null || namespace == xpp.getAttributeNamespace(i))
+ ) {
+ return xpp.getAttributeValue(i)
+ }
+ }
+ return null
+ }
+
+ private fun getAttribute(xpp: XmlPullParser, attribute: String): String? {
+ return if (hasAttribute(xpp, NS_SEARCH, attribute)) {
+ getAttribute(xpp, NS_SEARCH, attribute)
+ } else {
+ getAttribute(xpp, NS_ANDROID, attribute)
+ }
+ }
+
+ private fun hasAttribute(xpp: XmlPullParser, namespace: String?, attribute: String): Boolean {
+ return getAttribute(xpp, namespace, attribute) != null
+ }
+
+ private fun parseSearchResult(xpp: XmlPullParser): PreferenceItem {
+ val result = PreferenceItem()
+ result.title = readString(getAttribute(xpp, "title"))
+ result.summary = readString(getAttribute(xpp, "summary"))
+ result.key = readString(getAttribute(xpp, "key"))
+ result.entries = readStringArray(getAttribute(xpp, "entries"))
+ result.keywords = readString(getAttribute(xpp, NS_SEARCH, "keywords"))
+ return result
+ }
+
+ private fun readStringArray(s: String?): String? {
+ if (s == null) {
+ return null
+ }
+ if (s.startsWith("@")) {
+ try {
+ val id = s.substring(1).toInt()
+ val elements = mContext.resources.getStringArray(id)
+ return TextUtils.join(",", elements)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+ return s
+ }
+
+ private fun readString(s: String?): String? {
+ if (s == null) {
+ return null
+ }
+ if (s.startsWith("@")) {
+ try {
+ val id = s.substring(1).toInt()
+ return mContext.getString(id)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+ return s
+ }
+
+ fun searchFor(keyword: String?, fuzzy: Boolean): List {
+ if (TextUtils.isEmpty(keyword)) {
+ return ArrayList()
+ }
+ val results = ArrayList()
+
+ for (item in allEntries) {
+ if ((fuzzy && item.matchesFuzzy(keyword))
+ || (!fuzzy && item.matches(keyword))
+ ) {
+ results.add(item)
+ }
+ }
+
+ results.sortWith { i1: PreferenceItem, i2: PreferenceItem ->
+ floatCompare(
+ i2.getScore(keyword),
+ i1.getScore(keyword)
+ )
+ }
+
+ return if (results.size > MAX_RESULTS) {
+ results.subList(0, MAX_RESULTS)
+ } else {
+ results
+ }
+ }
+
+ companion object {
+ private const val MAX_RESULTS = 10
+ private const val NS_ANDROID = "http://schemas.android.com/apk/res/android"
+ private const val NS_SEARCH =
+ "http://schemas.android.com/apk/com.drdisagree.iconify.ui.preferences.preferencesearch"
+ private val BLACKLIST: List = listOf(
+ SearchPreference::class.java.name, "PreferenceCategory"
+ )
+ private val CONTAINERS: List =
+ mutableListOf("PreferenceCategory", "PreferenceScreen")
+
+ private fun floatCompare(x: Float, y: Float): Int {
+ return if ((x < y)) -1 else (if ((x == y)) 0 else 1)
+ }
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/RevealAnimationSetting.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/RevealAnimationSetting.java
new file mode 100644
index 000000000..7b2c8fc4c
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/RevealAnimationSetting.java
@@ -0,0 +1,73 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+
+public class RevealAnimationSetting implements Parcelable {
+ public static final Creator CREATOR = new Creator<>() {
+ @Override
+ public RevealAnimationSetting createFromParcel(Parcel in) {
+ return new RevealAnimationSetting(in);
+ }
+
+ @Override
+ public RevealAnimationSetting[] newArray(int size) {
+ return new RevealAnimationSetting[size];
+ }
+ };
+ private final int centerX;
+ private final int centerY;
+ private final int width;
+ private final int height;
+ private final int colorAccent;
+
+ public RevealAnimationSetting(int centerX, int centerY, int width, int height, int colorAccent) {
+ this.centerX = centerX;
+ this.centerY = centerY;
+ this.width = width;
+ this.height = height;
+ this.colorAccent = colorAccent;
+ }
+
+ private RevealAnimationSetting(Parcel in) {
+ centerX = in.readInt();
+ centerY = in.readInt();
+ width = in.readInt();
+ height = in.readInt();
+ colorAccent = in.readInt();
+ }
+
+ public int getCenterX() {
+ return centerX;
+ }
+
+ public int getCenterY() {
+ return centerY;
+ }
+
+ public int getWidth() {
+ return width;
+ }
+
+ public int getHeight() {
+ return height;
+ }
+
+ public int getColorAccent() {
+ return colorAccent;
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeInt(centerX);
+ dest.writeInt(centerY);
+ dest.writeInt(width);
+ dest.writeInt(height);
+ dest.writeInt(colorAccent);
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchConfiguration.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchConfiguration.java
new file mode 100644
index 000000000..00a0e7b0c
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchConfiguration.java
@@ -0,0 +1,394 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.os.Bundle;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.ColorInt;
+import androidx.annotation.IdRes;
+import androidx.annotation.NonNull;
+import androidx.annotation.StringRes;
+import androidx.annotation.XmlRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+
+public class SearchConfiguration {
+ private static final String ARGUMENT_INDEX_FILES = "items";
+ private static final String ARGUMENT_INDEX_INDIVIDUAL_PREFERENCES = "individual_prefs";
+ private static final String ARGUMENT_FUZZY_ENABLED = "fuzzy";
+ private static final String ARGUMENT_HISTORY_ENABLED = "history_enabled";
+ private static final String ARGUMENT_SEARCH_BAR_ENABLED = "search_bar_enabled";
+ private static final String ARGUMENT_BREADCRUMBS_ENABLED = "breadcrumbs_enabled";
+ private static final String ARGUMENT_REVEAL_ANIMATION_SETTING = "reveal_anim_setting";
+ private static final String ARGUMENT_TEXT_HINT = "text_hint";
+ private static final String ARGUMENT_TEXT_CLEAR_HISTORY = "text_clear_history";
+ private static final String ARGUMENT_TEXT_NO_RESULTS = "text_no_results";
+ private final ArrayList bannedKeys = new ArrayList<>();
+ private ArrayList filesToIndex = new ArrayList<>();
+ private ArrayList preferencesToIndex = new ArrayList<>();
+ private boolean historyEnabled = true;
+ private boolean breadcrumbsEnabled = false;
+ private boolean fuzzySearchEnabled = true;
+ private boolean searchBarEnabled = true;
+ private AppCompatActivity activity;
+ private int containerResId = android.R.id.content;
+ private RevealAnimationSetting revealAnimationSetting = null;
+ private String textClearHistory;
+ private String textNoResults;
+ private String textHint;
+
+ public SearchConfiguration() {
+
+ }
+
+ /**
+ * Creates a new search configuration
+ *
+ * @param activity The Activity that receives callbacks. Must implement SearchPreferenceResultListener.
+ */
+ @SuppressWarnings("unused")
+ public SearchConfiguration(AppCompatActivity activity) {
+ setActivity(activity);
+ }
+
+ static SearchConfiguration fromBundle(Bundle bundle) {
+ SearchConfiguration config = new SearchConfiguration();
+ config.filesToIndex = bundle.getParcelableArrayList(ARGUMENT_INDEX_FILES);
+ config.preferencesToIndex = bundle.getParcelableArrayList(ARGUMENT_INDEX_INDIVIDUAL_PREFERENCES);
+ config.historyEnabled = bundle.getBoolean(ARGUMENT_HISTORY_ENABLED);
+ config.revealAnimationSetting = bundle.getParcelable(ARGUMENT_REVEAL_ANIMATION_SETTING);
+ config.fuzzySearchEnabled = bundle.getBoolean(ARGUMENT_FUZZY_ENABLED);
+ config.breadcrumbsEnabled = bundle.getBoolean(ARGUMENT_BREADCRUMBS_ENABLED);
+ config.searchBarEnabled = bundle.getBoolean(ARGUMENT_SEARCH_BAR_ENABLED);
+ config.textHint = bundle.getString(ARGUMENT_TEXT_HINT);
+ config.textClearHistory = bundle.getString(ARGUMENT_TEXT_CLEAR_HISTORY);
+ config.textNoResults = bundle.getString(ARGUMENT_TEXT_NO_RESULTS);
+ return config;
+ }
+
+ /**
+ * Shows the fragment
+ *
+ * @return A reference to the fragment
+ */
+ public SearchPreferenceFragment showSearchFragment() {
+ if (activity == null) {
+ throw new IllegalStateException("setActivity() not called");
+ }
+
+ Bundle arguments = this.toBundle();
+ SearchPreferenceFragment fragment = new SearchPreferenceFragment();
+ fragment.setArguments(arguments);
+ activity.getSupportFragmentManager().beginTransaction()
+ .add(containerResId, fragment, SearchPreferenceFragment.TAG)
+ .addToBackStack(SearchPreferenceFragment.TAG)
+ .commit();
+ return fragment;
+ }
+
+ private Bundle toBundle() {
+ Bundle arguments = new Bundle();
+ arguments.putParcelableArrayList(ARGUMENT_INDEX_FILES, filesToIndex);
+ arguments.putParcelableArrayList(ARGUMENT_INDEX_INDIVIDUAL_PREFERENCES, preferencesToIndex);
+ arguments.putBoolean(ARGUMENT_HISTORY_ENABLED, historyEnabled);
+ arguments.putParcelable(ARGUMENT_REVEAL_ANIMATION_SETTING, revealAnimationSetting);
+ arguments.putBoolean(ARGUMENT_FUZZY_ENABLED, fuzzySearchEnabled);
+ arguments.putBoolean(ARGUMENT_BREADCRUMBS_ENABLED, breadcrumbsEnabled);
+ arguments.putBoolean(ARGUMENT_SEARCH_BAR_ENABLED, searchBarEnabled);
+ arguments.putString(ARGUMENT_TEXT_HINT, textHint);
+ arguments.putString(ARGUMENT_TEXT_CLEAR_HISTORY, textClearHistory);
+ arguments.putString(ARGUMENT_TEXT_NO_RESULTS, textNoResults);
+ return arguments;
+ }
+
+ /**
+ * Sets the current activity that also receives callbacks
+ *
+ * @param activity The Activity that receives callbacks. Must implement SearchPreferenceResultListener.
+ */
+ public void setActivity(@NonNull AppCompatActivity activity) {
+ this.activity = activity;
+ if (!(activity instanceof SearchPreferenceResultListener)) {
+ throw new IllegalArgumentException("Activity must implement SearchPreferenceResultListener");
+ }
+ }
+
+ /**
+ * Sets the container to use when loading the fragment
+ *
+ * @param containerResId Resource id of the container
+ */
+ public void setFragmentContainerViewId(@IdRes int containerResId) {
+ this.containerResId = containerResId;
+ }
+
+ /**
+ * Display a reveal animation
+ *
+ * @param centerX Origin of the reveal animation
+ * @param centerY Origin of the reveal animation
+ * @param width Size of the main container
+ * @param height Size of the main container
+ * @param colorAccent Accent color to use
+ */
+ @SuppressWarnings("unused")
+ public void useAnimation(int centerX, int centerY, int width, int height, @ColorInt int colorAccent) {
+ revealAnimationSetting = new RevealAnimationSetting(centerX, centerY, width, height, colorAccent);
+ }
+
+ /**
+ * Adds a new file to the index
+ *
+ * @param resId The preference file to index
+ */
+ public SearchIndexItem index(@XmlRes int resId) {
+ SearchIndexItem item = new SearchIndexItem(resId, this);
+ if (!filesToIndex.contains(item)) {
+ filesToIndex.add(item);
+ }
+ return item;
+ }
+
+ /**
+ * Indexes a single preference
+ *
+ * @return the indexed PreferenceItem to configure it with chaining
+ * @see PreferenceItem for the available methods for configuring it
+ */
+ @SuppressWarnings("unused")
+ public PreferenceItem indexItem() {
+ PreferenceItem preferenceItem = new PreferenceItem();
+ preferencesToIndex.add(preferenceItem);
+ return preferenceItem;
+ }
+
+ /**
+ * Indexes a single android preference
+ *
+ * @param preference to get its key, summary, title and entries
+ * @return the indexed PreferenceItem to configure it with chaining
+ * @see PreferenceItem for the available methods for configuring it
+ */
+ @SuppressWarnings("unused")
+ public PreferenceItem indexItem(@NonNull Preference preference) {
+ PreferenceItem preferenceItem = new PreferenceItem();
+
+ if (preference.getKey() != null) {
+ preferenceItem.key = preference.getKey();
+ }
+ if (preference.getSummary() != null) {
+ preferenceItem.summary = preference.getSummary().toString();
+ }
+ if (preference.getTitle() != null) {
+ preferenceItem.title = preference.getTitle().toString();
+ }
+ if (preference instanceof ListPreference listPreference) {
+ if (listPreference.getEntries() != null) {
+ preferenceItem.entries = Arrays.toString(listPreference.getEntries());
+ }
+ }
+ preferencesToIndex.add(preferenceItem);
+ return preferenceItem;
+ }
+
+ ArrayList getBannedKeys() {
+ return bannedKeys;
+ }
+
+ /**
+ * @param key of the preference to be ignored
+ */
+ @SuppressWarnings("unused")
+ public void ignorePreference(@NonNull String key) {
+ bannedKeys.add(key);
+ }
+
+ ArrayList getFiles() {
+ return filesToIndex;
+ }
+
+ ArrayList getPreferencesToIndex() {
+ return preferencesToIndex;
+ }
+
+ boolean isHistoryEnabled() {
+ return historyEnabled;
+ }
+
+ /**
+ * Show a history of recent search terms if nothing was typed yet. Default is true
+ *
+ * @param historyEnabled True if history should be enabled
+ */
+ public void setHistoryEnabled(boolean historyEnabled) {
+ this.historyEnabled = historyEnabled;
+ }
+
+ boolean isBreadcrumbsEnabled() {
+ return breadcrumbsEnabled;
+ }
+
+ /**
+ * Show breadcrumbs in the list of search results, containing of
+ * the prefix given in addResourceFileToIndex, PreferenceCategory and PreferenceScreen.
+ * Default is false
+ *
+ * @param breadcrumbsEnabled True if breadcrumbs should be shown
+ */
+ public void setBreadcrumbsEnabled(boolean breadcrumbsEnabled) {
+ this.breadcrumbsEnabled = breadcrumbsEnabled;
+ }
+
+ boolean isFuzzySearchEnabled() {
+ return fuzzySearchEnabled;
+ }
+
+ /**
+ * Allow to enable and disable fuzzy searching. Default is true
+ *
+ * @param fuzzySearchEnabled True if search should be fuzzy
+ */
+ public void setFuzzySearchEnabled(boolean fuzzySearchEnabled) {
+ this.fuzzySearchEnabled = fuzzySearchEnabled;
+ }
+
+ boolean isSearchBarEnabled() {
+ return searchBarEnabled;
+ }
+
+ /**
+ * Show the search bar above the list. When setting this to false, you have to use {@see SearchPreferenceFragment#setSearchTerm(String) setSearchTerm} instead
+ * Default is true
+ *
+ * @param searchBarEnabled True if search bar should be shown
+ */
+ public void setSearchBarEnabled(boolean searchBarEnabled) {
+ this.searchBarEnabled = searchBarEnabled;
+ }
+
+ RevealAnimationSetting getRevealAnimationSetting() {
+ return revealAnimationSetting;
+ }
+
+ @SuppressWarnings("unused")
+ public String getTextClearHistory() {
+ return textClearHistory;
+ }
+
+ public void setTextClearHistory(String textClearHistory) {
+ this.textClearHistory = textClearHistory;
+ }
+
+ public String getTextNoResults() {
+ return textNoResults;
+ }
+
+ public void setTextNoResults(String textNoResults) {
+ this.textNoResults = textNoResults;
+ }
+
+ public String getTextHint() {
+ return textHint;
+ }
+
+ public void setTextHint(String textHint) {
+ this.textHint = textHint;
+ }
+
+ /**
+ * Adds a given R.xml resource to the search index
+ */
+ public static class SearchIndexItem implements Parcelable {
+ public static final Creator CREATOR = new Creator() {
+ @Override
+ public SearchIndexItem createFromParcel(Parcel in) {
+ return new SearchIndexItem(in);
+ }
+
+ @Override
+ public SearchIndexItem[] newArray(int size) {
+ return new SearchIndexItem[size];
+ }
+ };
+ private final @XmlRes int resId;
+ private final SearchConfiguration searchConfiguration;
+ private String breadcrumb = "";
+
+ /**
+ * Includes the given R.xml resource in the index
+ *
+ * @param resId The resource to index
+ */
+ private SearchIndexItem(@XmlRes int resId, SearchConfiguration searchConfiguration) {
+ this.resId = resId;
+ this.searchConfiguration = searchConfiguration;
+ }
+
+ private SearchIndexItem(Parcel parcel) {
+ this.breadcrumb = parcel.readString();
+ this.resId = parcel.readInt();
+ this.searchConfiguration = null;
+ }
+
+ /**
+ * Adds a breadcrumb
+ *
+ * @param breadcrumb The breadcrumb to add
+ * @return For chaining
+ */
+ @SuppressWarnings("unused")
+ public SearchIndexItem addBreadcrumb(@StringRes int breadcrumb) {
+ assertNotParcel();
+ return addBreadcrumb(searchConfiguration.activity.getString(breadcrumb));
+ }
+
+ /**
+ * Adds a breadcrumb
+ *
+ * @param breadcrumb The breadcrumb to add
+ * @return For chaining
+ */
+ public SearchIndexItem addBreadcrumb(String breadcrumb) {
+ assertNotParcel();
+ this.breadcrumb = Breadcrumb.concat(this.breadcrumb, breadcrumb);
+ return this;
+ }
+
+ /**
+ * Throws an exception if the item does not have a searchConfiguration (thus, is restored from a parcel)
+ */
+ private void assertNotParcel() {
+ if (searchConfiguration == null) {
+ throw new IllegalStateException("SearchIndexItems that are restored from parcel can not be modified.");
+ }
+ }
+
+ @XmlRes
+ int getResId() {
+ return resId;
+ }
+
+ String getBreadcrumb() {
+ return breadcrumb;
+ }
+
+ SearchConfiguration getSearchConfiguration() {
+ return searchConfiguration;
+ }
+
+ @Override
+ public void writeToParcel(Parcel dest, int flags) {
+ dest.writeString(this.breadcrumb);
+ dest.writeInt(this.resId);
+ }
+
+ @Override
+ public int describeContents() {
+ return 0;
+ }
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreference.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreference.java
new file mode 100644
index 000000000..990e944f2
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreference.java
@@ -0,0 +1,87 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.text.InputType;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.EditText;
+
+import androidx.preference.Preference;
+import androidx.preference.PreferenceViewHolder;
+
+import com.drdisagree.iconify.R;
+
+public class SearchPreference extends Preference implements View.OnClickListener {
+ private final SearchConfiguration searchConfiguration = new SearchConfiguration();
+ private String hint = null;
+
+ @SuppressWarnings("unused")
+ public SearchPreference(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ setLayoutResource(R.layout.searchpreference_preference);
+ parseAttrs(attrs);
+ }
+
+ @SuppressWarnings("unused")
+ public SearchPreference(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ setLayoutResource(R.layout.searchpreference_preference);
+ parseAttrs(attrs);
+ }
+
+ @SuppressWarnings("unused")
+ public SearchPreference(Context context) {
+ super(context);
+ setLayoutResource(R.layout.searchpreference_preference);
+ }
+
+ private void parseAttrs(AttributeSet attrs) {
+ TypedArray a = getContext().obtainStyledAttributes(attrs, new int[]{R.attr.textHint});
+ if (a.getText(0) != null) {
+ hint = a.getText(0).toString();
+ searchConfiguration.setTextHint(a.getText(0).toString());
+ }
+ a.recycle();
+ a = getContext().obtainStyledAttributes(attrs, new int[]{R.attr.textClearHistory});
+ if (a.getText(0) != null) {
+ searchConfiguration.setTextClearHistory(a.getText(0).toString());
+ }
+ a.recycle();
+ a = getContext().obtainStyledAttributes(attrs, new int[]{R.attr.textNoResults});
+ if (a.getText(0) != null) {
+ searchConfiguration.setTextNoResults(a.getText(0).toString());
+ }
+ a.recycle();
+ }
+
+ @Override
+ public void onBindViewHolder(PreferenceViewHolder holder) {
+ EditText searchText = (EditText) holder.findViewById(R.id.search);
+ searchText.setFocusable(false);
+ searchText.setInputType(InputType.TYPE_NULL);
+ searchText.setOnClickListener(this);
+
+ if (hint != null) {
+ searchText.setHint(hint);
+ }
+
+ holder.findViewById(R.id.search_card).setOnClickListener(this);
+ holder.itemView.setOnClickListener(this);
+ holder.itemView.setBackgroundColor(0x0);
+ }
+
+ @Override
+ public void onClick(View view) {
+ getSearchConfiguration().showSearchFragment();
+ }
+
+ /**
+ * Returns the search configuration object for this preference
+ *
+ * @return The search configuration
+ */
+ public SearchConfiguration getSearchConfiguration() {
+ return searchConfiguration;
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceActionView.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceActionView.java
new file mode 100644
index 000000000..fc22e9fc5
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceActionView.java
@@ -0,0 +1,93 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.SearchView;
+import androidx.fragment.app.FragmentManager;
+
+public class SearchPreferenceActionView extends SearchView {
+ protected SearchPreferenceFragment searchFragment;
+ protected SearchConfiguration searchConfiguration = new SearchConfiguration();
+ protected AppCompatActivity activity;
+
+ public SearchPreferenceActionView(Context context) {
+ super(context);
+ initView();
+ }
+
+ public SearchPreferenceActionView(Context context, AttributeSet attrs) {
+ super(context, attrs);
+ initView();
+ }
+
+ public SearchPreferenceActionView(Context context, AttributeSet attrs, int defStyleAttr) {
+ super(context, attrs, defStyleAttr);
+ initView();
+ }
+
+ private void initView() {
+ searchConfiguration.setSearchBarEnabled(false);
+ setOnQueryTextListener(new OnQueryTextListener() {
+ @Override
+ public boolean onQueryTextSubmit(String query) {
+ return false;
+ }
+
+ @Override
+ public boolean onQueryTextChange(String newText) {
+ if (searchFragment != null) {
+ searchFragment.setSearchTerm(newText);
+ }
+ return true;
+ }
+ });
+ setOnQueryTextFocusChangeListener((v, hasFocus) -> {
+ if (hasFocus && (searchFragment == null || !searchFragment.isVisible())) {
+ searchFragment = searchConfiguration.showSearchFragment();
+ searchFragment.setHistoryClickListener(entry -> setQuery(entry, false));
+ }
+ });
+ }
+
+ @SuppressWarnings("unused")
+ public SearchConfiguration getSearchConfiguration() {
+ return searchConfiguration;
+ }
+
+ /**
+ * Hides the search fragment
+ *
+ * @return true if it was hidden, so the calling activity should not go back itself.
+ */
+ @SuppressWarnings("unused")
+ public boolean cancelSearch() {
+ setQuery("", false);
+
+ boolean didSomething = false;
+ if (!isIconified()) {
+ setIconified(true);
+ didSomething = true;
+ }
+ if (searchFragment != null && searchFragment.isVisible()) {
+ removeFragment();
+ didSomething = true;
+ }
+ return didSomething;
+ }
+
+ protected void removeFragment() {
+ if (searchFragment.isVisible()) {
+ FragmentManager fm = activity.getSupportFragmentManager();
+ fm.beginTransaction().remove(searchFragment).commit();
+ fm.popBackStack(SearchPreferenceFragment.TAG, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+ }
+ }
+
+ @SuppressWarnings("unused")
+ public void setActivity(AppCompatActivity activity) {
+ searchConfiguration.setActivity(activity);
+ this.activity = activity;
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceAdapter.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceAdapter.java
new file mode 100644
index 000000000..380849a1d
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceAdapter.java
@@ -0,0 +1,139 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+
+import android.annotation.SuppressLint;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.drdisagree.iconify.R;
+
+import java.util.ArrayList;
+import java.util.List;
+
+class SearchPreferenceAdapter extends RecyclerView.Adapter {
+ private List dataset;
+ private SearchConfiguration searchConfiguration;
+ private SearchClickListener onItemClickListener;
+
+
+ SearchPreferenceAdapter() {
+ dataset = new ArrayList<>();
+ }
+
+ @NonNull
+ @Override
+ public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ if (viewType == PreferenceItem.TYPE) {
+ return new PreferenceViewHolder(
+ LayoutInflater.from(parent.getContext()).inflate(
+ R.layout.searchpreference_list_item_result, parent, false));
+ } else {
+ return new HistoryViewHolder(
+ LayoutInflater.from(parent.getContext()).inflate(
+ R.layout.searchpreference_list_item_history, parent, false));
+ }
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull final ViewHolder h, final int position) {
+ final ListItem listItem = dataset.get(position);
+ if (getItemViewType(position) == HistoryItem.TYPE) {
+ HistoryViewHolder holder = (HistoryViewHolder) h;
+ HistoryItem item = (HistoryItem) listItem;
+ holder.term.setText(item.getTerm());
+ } else if (getItemViewType(position) == PreferenceItem.TYPE) {
+ PreferenceViewHolder holder = (PreferenceViewHolder) h;
+ PreferenceItem item = (PreferenceItem) listItem;
+ holder.title.setText(item.title);
+
+ if (TextUtils.isEmpty(item.summary) || item.summary.contains("%s")) {
+ holder.summary.setVisibility(View.GONE);
+ } else {
+ holder.summary.setVisibility(View.VISIBLE);
+ holder.summary.setText(item.summary);
+ holder.summary.setAlpha(0.8f);
+ }
+
+ if (searchConfiguration.isBreadcrumbsEnabled()) {
+ holder.breadcrumbs.setText(item.breadcrumbs);
+ holder.breadcrumbs.setAlpha(0.6f);
+ holder.summary.setAlpha(0.8f);
+ } else {
+ holder.breadcrumbs.setVisibility(View.GONE);
+ holder.summary.setAlpha(0.6f);
+ }
+
+ }
+
+ h.root.setOnClickListener(v -> {
+ if (onItemClickListener != null) {
+ onItemClickListener.onItemClicked(listItem, h.getBindingAdapterPosition());
+ }
+ });
+ }
+
+ @SuppressLint("NotifyDataSetChanged")
+ void setContent(List items) {
+ dataset = new ArrayList<>(items);
+ this.notifyDataSetChanged();
+ }
+
+ @Override
+ public int getItemCount() {
+ return dataset.size();
+ }
+
+ @Override
+ public int getItemViewType(int position) {
+ return dataset.get(position).getType();
+ }
+
+ void setSearchConfiguration(SearchConfiguration searchConfiguration) {
+ this.searchConfiguration = searchConfiguration;
+ }
+
+ void setOnItemClickListener(SearchClickListener onItemClickListener) {
+ this.onItemClickListener = onItemClickListener;
+ }
+
+ interface SearchClickListener {
+ void onItemClicked(ListItem item, int position);
+ }
+
+ static class ViewHolder extends RecyclerView.ViewHolder {
+ View root;
+
+ ViewHolder(View v) {
+ super(v);
+ root = v;
+ }
+ }
+
+ static class HistoryViewHolder extends ViewHolder {
+ TextView term;
+
+ HistoryViewHolder(View v) {
+ super(v);
+ term = v.findViewById(R.id.term);
+ }
+ }
+
+ static class PreferenceViewHolder extends ViewHolder {
+ TextView title;
+ TextView summary;
+ TextView breadcrumbs;
+
+ PreferenceViewHolder(View v) {
+ super(v);
+ title = v.findViewById(R.id.title);
+ summary = v.findViewById(R.id.summary);
+ breadcrumbs = v.findViewById(R.id.breadcrumbs);
+ }
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceFragment.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceFragment.java
new file mode 100644
index 000000000..8d1696cd6
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceFragment.java
@@ -0,0 +1,355 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.os.Bundle;
+import android.text.Editable;
+import android.text.TextUtils;
+import android.text.TextWatcher;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.PopupMenu;
+import androidx.core.view.MenuHost;
+import androidx.core.view.MenuProvider;
+import androidx.fragment.app.Fragment;
+import androidx.lifecycle.Lifecycle;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.drdisagree.iconify.R;
+import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.card.MaterialCardView;
+
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Set;
+
+public class SearchPreferenceFragment extends Fragment implements SearchPreferenceAdapter.SearchClickListener {
+ /**
+ * Default tag used on the library's Fragment transactions with {@link SearchPreferenceFragment}
+ */
+ public static final String TAG = SearchPreferenceFragment.class.getSimpleName();
+
+ private static final String SHARED_PREFS_FILE = "preferenceSearch";
+ private static final int MAX_HISTORY = 5;
+ private PreferenceParser searcher;
+ private List results;
+ private List history;
+ private SharedPreferences prefs;
+ private SearchViewHolder viewHolder;
+ private SearchConfiguration searchConfiguration;
+ private SearchPreferenceAdapter adapter;
+ private HistoryClickListener historyClickListener;
+ private CharSequence searchTermPreset = null;
+ private final TextWatcher textWatcher = new TextWatcher() {
+ @Override
+ public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+ }
+
+ @Override
+ public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) {
+ }
+
+ @Override
+ public void afterTextChanged(Editable editable) {
+ updateSearchResults(editable.toString());
+ viewHolder.clearButton.setVisibility(editable.toString().isEmpty() ? View.GONE : View.VISIBLE);
+ }
+ };
+
+ private void initSearch() {
+ searcher = new PreferenceParser(requireContext());
+
+ assert getArguments() != null;
+ searchConfiguration = SearchConfiguration.fromBundle(getArguments());
+ ArrayList files = searchConfiguration.getFiles();
+ for (SearchConfiguration.SearchIndexItem file : files) {
+ searcher.addResourceFile(file);
+ }
+ searcher.addPreferenceItems(searchConfiguration.getPreferencesToIndex());
+ loadHistory();
+ }
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ prefs = requireContext().getSharedPreferences(SHARED_PREFS_FILE, Context.MODE_PRIVATE);
+
+ initSearch();
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ inflater.getContext().setTheme(R.style.PrefsThemeToolbar);
+ View rootView = inflater.inflate(R.layout.searchpreference_fragment, container, false);
+ viewHolder = new SearchViewHolder(rootView);
+
+ viewHolder.clearButton.setOnClickListener(view -> viewHolder.searchView.setText(""));
+ if (searchConfiguration.isHistoryEnabled()) {
+ viewHolder.moreButton.setVisibility(View.VISIBLE);
+ }
+ if (searchConfiguration.getTextHint() != null) {
+ viewHolder.searchView.setHint(searchConfiguration.getTextHint());
+ }
+ if (searchConfiguration.getTextNoResults() != null) {
+ viewHolder.noResults.setText(searchConfiguration.getTextNoResults());
+ }
+ viewHolder.moreButton.setOnClickListener(v -> {
+ PopupMenu popup = new PopupMenu(requireContext(), viewHolder.moreButton);
+ popup.getMenuInflater().inflate(R.menu.search_more, popup.getMenu());
+ popup.setOnMenuItemClickListener(item -> {
+ if (item.getItemId() == R.id.clear_history) {
+ clearHistory();
+ }
+ return true;
+ });
+ popup.show();
+ });
+
+ viewHolder.recyclerView.setLayoutManager(new LinearLayoutManager(requireContext()));
+ adapter = new SearchPreferenceAdapter();
+ adapter.setSearchConfiguration(searchConfiguration);
+ adapter.setOnItemClickListener(this);
+ viewHolder.recyclerView.setAdapter(adapter);
+
+ viewHolder.searchView.addTextChangedListener(textWatcher);
+
+ if (!searchConfiguration.isSearchBarEnabled()) {
+ viewHolder.searchContainer.setVisibility(View.GONE);
+ }
+
+ if (searchTermPreset != null) {
+ viewHolder.searchView.setText(searchTermPreset);
+ }
+
+ RevealAnimationSetting anim = searchConfiguration.getRevealAnimationSetting();
+ if (anim != null) {
+ AnimationUtils.registerCircularRevealAnimation(requireContext(), rootView, anim);
+ }
+
+ return rootView;
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ MenuHost menuHost = requireActivity();
+ menuHost.addMenuProvider(new MenuProvider() {
+ @Override
+ public void onCreateMenu(@NonNull Menu menu, @NonNull MenuInflater menuInflater) {
+ menu.clear();
+ menuInflater.inflate(R.menu.search_menu, menu);
+ }
+
+ @Override
+ public boolean onMenuItemSelected(@NonNull MenuItem menuItem) {
+ return false;
+ }
+ }, getViewLifecycleOwner(), Lifecycle.State.RESUMED);
+ }
+
+ private void loadHistory() {
+ history = new ArrayList<>();
+ if (!searchConfiguration.isHistoryEnabled()) {
+ return;
+ }
+
+ int size = prefs.getInt("history_size", 0);
+ for (int i = 0; i < size; i++) {
+ String title = prefs.getString("history_" + i, null);
+ history.add(new HistoryItem(title));
+ }
+ }
+
+ private void saveHistory() {
+ SharedPreferences.Editor editor = prefs.edit();
+ editor.putInt("history_size", history.size());
+ for (int i = 0; i < history.size(); i++) {
+ editor.putString("history_" + i, history.get(i).getTerm());
+ }
+ editor.apply();
+ }
+
+ private void clearHistory() {
+ viewHolder.searchView.setText("");
+ history.clear();
+ saveHistory();
+ updateSearchResults("");
+ }
+
+ private void addHistoryEntry(String entry) {
+ HistoryItem newItem = new HistoryItem(entry);
+ if (!history.contains(newItem)) {
+ if (history.size() >= MAX_HISTORY) {
+ history.remove(history.size() - 1);
+ }
+ history.add(0, newItem);
+ saveHistory();
+ updateSearchResults(viewHolder.searchView.getText().toString());
+ }
+ }
+
+ @Override
+ public void onResume() {
+ super.onResume();
+
+ initSearch();
+
+ updateSearchResults(viewHolder.searchView.getText().toString());
+
+ if (searchConfiguration.isSearchBarEnabled()) {
+ showKeyboard();
+ }
+
+ if (getContext() != null) {
+ if (viewHolder.toolbar != null) {
+ ((AppCompatActivity) getContext()).setSupportActionBar(viewHolder.toolbar);
+ viewHolder.toolbar.setTitle(R.string.search_title);
+ }
+
+ if (getContext() instanceof AppCompatActivity) {
+ Objects.requireNonNull(((AppCompatActivity) getContext())
+ .getSupportActionBar()).setDisplayHomeAsUpEnabled(true);
+ }
+ }
+ }
+
+ private void showKeyboard() {
+ viewHolder.searchView.post(() -> {
+ viewHolder.searchView.requestFocus();
+ InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (imm != null) {
+ imm.showSoftInput(viewHolder.searchView, InputMethodManager.SHOW_IMPLICIT);
+ }
+ });
+ }
+
+ private void hideKeyboard() {
+ View view = requireActivity().getCurrentFocus();
+ InputMethodManager imm = (InputMethodManager) requireActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
+ if (view != null && imm != null) {
+ imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
+ }
+ }
+
+ public void setSearchTerm(CharSequence term) {
+ if (viewHolder != null) {
+ viewHolder.searchView.setText(term);
+ } else {
+ searchTermPreset = term;
+ }
+ }
+
+ private void updateSearchResults(String keyword) {
+ if (TextUtils.isEmpty(keyword)) {
+ showHistory();
+ return;
+ }
+
+ results = searcher.searchFor(keyword, searchConfiguration.isFuzzySearchEnabled());
+
+ Set seen = new HashSet<>();
+ List distinctResults = new ArrayList<>();
+
+ for (PreferenceItem result : results) {
+ String key = result.title + result.summary + result.breadcrumbs;
+ if (seen.add(key)) {
+ distinctResults.add(result);
+ }
+ }
+
+ adapter.setContent(new ArrayList<>(distinctResults));
+
+ setEmptyViewShown(distinctResults.isEmpty());
+ }
+
+ private void setEmptyViewShown(boolean shown) {
+ if (shown) {
+ viewHolder.noResults.setVisibility(View.VISIBLE);
+ viewHolder.recyclerView.setVisibility(View.GONE);
+ } else {
+ viewHolder.noResults.setVisibility(View.GONE);
+ viewHolder.recyclerView.setVisibility(View.VISIBLE);
+ }
+ }
+
+ private void showHistory() {
+ viewHolder.noResults.setVisibility(View.GONE);
+ viewHolder.recyclerView.setVisibility(View.VISIBLE);
+
+ adapter.setContent(new ArrayList<>(history));
+ setEmptyViewShown(history.isEmpty());
+ }
+
+ @Override
+ public void onItemClicked(ListItem item, int position) {
+ if (item.getType() == HistoryItem.TYPE) {
+ CharSequence text = ((HistoryItem) item).getTerm();
+ viewHolder.searchView.setText(text);
+ viewHolder.searchView.setSelection(text.length());
+ if (historyClickListener != null) {
+ historyClickListener.onHistoryEntryClicked(text.toString());
+ }
+ } else {
+ hideKeyboard();
+
+ try {
+ final SearchPreferenceResultListener callback = (SearchPreferenceResultListener) getActivity();
+ PreferenceItem r = results.get(position);
+ addHistoryEntry(r.title);
+ String screen = null;
+ if (!r.keyBreadcrumbs.isEmpty()) {
+ screen = r.keyBreadcrumbs.get(r.keyBreadcrumbs.size() - 1);
+ }
+ SearchPreferenceResult result = new SearchPreferenceResult(r.key, r.resId, screen);
+ assert callback != null;
+ callback.onSearchResultClicked(result);
+ } catch (ClassCastException e) {
+ throw new ClassCastException(requireActivity() + " must implement SearchPreferenceResultListener");
+ }
+ }
+ }
+
+ public void setHistoryClickListener(HistoryClickListener historyClickListener) {
+ this.historyClickListener = historyClickListener;
+ }
+
+ public interface HistoryClickListener {
+ void onHistoryEntryClicked(String entry);
+ }
+
+ private static class SearchViewHolder {
+ private final ImageView clearButton;
+ private final ImageView moreButton;
+ private final EditText searchView;
+ private final RecyclerView recyclerView;
+ private final TextView noResults;
+ private final MaterialCardView searchContainer;
+ private final MaterialToolbar toolbar;
+
+ SearchViewHolder(View root) {
+ searchView = root.findViewById(R.id.search);
+ clearButton = root.findViewById(R.id.clear);
+ recyclerView = root.findViewById(R.id.list);
+ moreButton = root.findViewById(R.id.more);
+ noResults = root.findViewById(R.id.no_results);
+ searchContainer = root.findViewById(R.id.search_card);
+ toolbar = root.findViewById(R.id.toolbar);
+ }
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResult.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResult.java
new file mode 100644
index 000000000..4e2b69970
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResult.java
@@ -0,0 +1,170 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.RippleDrawable;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Log;
+import android.view.View;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.view.ViewCompat;
+import androidx.fragment.app.FragmentManager;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroup;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.drdisagree.iconify.R;
+import com.google.android.material.appbar.AppBarLayout;
+
+import java.util.Objects;
+
+public class SearchPreferenceResult {
+ private final String key;
+ private final int file;
+ private final String screen;
+
+ SearchPreferenceResult(String key, int file, String screen) {
+ this.key = key;
+ this.file = file;
+ this.screen = screen;
+ }
+
+ public static void highlight(final PreferenceFragmentCompat prefsFragment, final String key) {
+ new Handler(Looper.getMainLooper()).post(() -> doHighlight(prefsFragment, key));
+ }
+
+ private static void doHighlight(final PreferenceFragmentCompat prefsFragment, final String key) {
+ final Preference prefResult = prefsFragment.findPreference(key);
+
+ if (prefResult == null) {
+ Log.w("doHighlight", "Preference with key " + key + " not found on given screen " + prefsFragment.getClass().getSimpleName() + ".");
+ return;
+ }
+
+ final RecyclerView recyclerView = prefsFragment.getListView();
+ final RecyclerView.Adapter adapter = recyclerView.getAdapter();
+
+ if (adapter instanceof PreferenceGroup.PreferencePositionCallback callback) {
+ final int position = callback.getPreferenceAdapterPosition(prefResult);
+
+ if (prefsFragment.getView() != null && prefsFragment.getView().findViewById(R.id.collapsing_toolbar) != null) {
+ AppBarLayout appBarLayout = (AppBarLayout) prefsFragment.getView().findViewById(R.id.collapsing_toolbar).getParent();
+ appBarLayout.setExpanded(false);
+ }
+
+ if (position != RecyclerView.NO_POSITION) {
+ recyclerView.post(() -> recyclerView.scrollToPosition(position));
+
+ recyclerView.postDelayed(() -> {
+ RecyclerView.ViewHolder holder = recyclerView.findViewHolderForAdapterPosition(position);
+ if (holder != null) {
+ Drawable background = holder.itemView.getBackground();
+ if (background instanceof RippleDrawable) {
+ forceRippleAnimation((RippleDrawable) background);
+ return;
+ }
+ }
+ highlightFallback(prefsFragment, prefResult);
+ }, 200);
+ return;
+ }
+ }
+
+ highlightFallback(prefsFragment, prefResult);
+ }
+
+ /**
+ * Alternative (old) highlight method if ripple does not work
+ */
+ private static void highlightFallback(PreferenceFragmentCompat prefsFragment, final Preference prefResult) {
+ prefsFragment.scrollToPreference(prefResult);
+
+ new Handler(Looper.getMainLooper()).postDelayed(() -> {
+ try {
+ final RecyclerView recyclerView = prefsFragment.getListView();
+ final RecyclerView.Adapter adapter = recyclerView.getAdapter();
+
+ if (adapter instanceof PreferenceGroup.PreferencePositionCallback callback) {
+ final int position = callback.getPreferenceAdapterPosition(prefResult);
+
+ if (prefsFragment.getView() != null && prefsFragment.getView().findViewById(R.id.collapsing_toolbar) != null) {
+ AppBarLayout appBarLayout = (AppBarLayout) prefsFragment.getView().findViewById(R.id.collapsing_toolbar).getParent();
+ appBarLayout.setExpanded(false);
+ }
+
+ if (position != RecyclerView.NO_POSITION) {
+ recyclerView.post(() -> recyclerView.scrollToPosition(position));
+
+ recyclerView.postDelayed(() -> {
+ RecyclerView.ViewHolder holder = recyclerView.findViewHolderForAdapterPosition(position);
+ if (holder != null) {
+ Drawable background = holder.itemView.getBackground();
+ if (background instanceof RippleDrawable) {
+ forceRippleAnimation((RippleDrawable) background);
+ }
+ }
+ }, 200);
+ }
+ }
+ } catch (Exception e) {
+ Log.e("highlightFallback", "Failed to highlight preference", e);
+ }
+ }, 400);
+ }
+
+ protected static void forceRippleAnimation(RippleDrawable background) {
+ final RippleDrawable rippleDrawable = background;
+ rippleDrawable.setState(new int[]{android.R.attr.state_pressed, android.R.attr.state_enabled});
+ new Handler(Looper.getMainLooper()).postDelayed(() -> rippleDrawable.setState(new int[]{}), 300);
+ }
+
+ /**
+ * Returns the key of the preference pressed
+ *
+ * @return The key
+ */
+ public String getKey() {
+ return key;
+ }
+
+ /**
+ * Returns the file in which the result was found
+ *
+ * @return The file in which the result was found
+ */
+ public int getResourceFile() {
+ return file;
+ }
+
+ /**
+ * Returns the screen in which the result was found
+ *
+ * @return The screen in which the result was found
+ */
+ public String getScreen() {
+ return screen;
+ }
+
+ /**
+ * Highlight the preference that was found
+ *
+ * @param prefsFragment Fragment that contains the preference
+ */
+ @SuppressWarnings("unused")
+ public void highlight(final PreferenceFragmentCompat prefsFragment) {
+ new Handler(Looper.getMainLooper()).post(() -> doHighlight(prefsFragment, getKey()));
+ }
+
+ /**
+ * Closes the search results page
+ *
+ * @param activity The current activity
+ */
+ @SuppressWarnings("unused")
+ public void closeSearchPage(AppCompatActivity activity) {
+ FragmentManager fm = activity.getSupportFragmentManager();
+ fm.beginTransaction().remove(Objects.requireNonNull(fm.findFragmentByTag(SearchPreferenceFragment.TAG))).commit();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResultListener.java b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResultListener.java
new file mode 100644
index 000000000..368360d44
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/preferences/preferencesearch/SearchPreferenceResultListener.java
@@ -0,0 +1,7 @@
+package com.drdisagree.iconify.ui.preferences.preferencesearch;
+
+import androidx.annotation.NonNull;
+
+public interface SearchPreferenceResultListener {
+ void onSearchResultClicked(@NonNull SearchPreferenceResult result);
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/Animatoo.kt b/app/src/main/java/com/drdisagree/iconify/ui/utils/Animatoo.kt
index 85224841b..10b949038 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/utils/Animatoo.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/Animatoo.kt
@@ -7,7 +7,6 @@ import com.drdisagree.iconify.R
@Suppress("deprecation")
object Animatoo {
- @JvmStatic
fun animateZoom(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_zoom_enter,
@@ -15,7 +14,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateFade(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_fade_enter,
@@ -23,7 +21,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateWindmill(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_windmill_enter,
@@ -31,7 +28,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSpin(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_spin_enter,
@@ -39,7 +35,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateDiagonal(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_diagonal_right_enter,
@@ -47,7 +42,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSplit(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_split_enter,
@@ -55,7 +49,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateShrink(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_shrink_enter,
@@ -63,7 +56,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateCard(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_card_enter,
@@ -71,7 +63,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateInAndOut(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_in_out_enter,
@@ -79,7 +70,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSwipeLeft(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_swipe_left_enter,
@@ -87,7 +77,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSwipeRight(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_swipe_right_enter,
@@ -95,7 +84,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSlideLeft(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_slide_left_enter,
@@ -103,7 +91,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSlideRight(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_slide_in_left,
@@ -111,7 +98,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSlideDown(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_slide_down_enter,
@@ -119,7 +105,6 @@ object Animatoo {
)
}
- @JvmStatic
fun animateSlideUp(context: Context) {
(context as Activity).overridePendingTransition(
R.anim.animate_slide_up_enter,
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/FragmentHelper.kt b/app/src/main/java/com/drdisagree/iconify/ui/utils/FragmentHelper.kt
new file mode 100644
index 000000000..7d1449184
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/FragmentHelper.kt
@@ -0,0 +1,124 @@
+package com.drdisagree.iconify.ui.utils
+
+import androidx.fragment.app.Fragment
+import com.drdisagree.iconify.ui.fragments.home.BrightnessBar
+import com.drdisagree.iconify.ui.fragments.home.BrightnessBarPixel
+import com.drdisagree.iconify.ui.fragments.home.CellularIcons
+import com.drdisagree.iconify.ui.fragments.home.Home
+import com.drdisagree.iconify.ui.fragments.home.IconPack
+import com.drdisagree.iconify.ui.fragments.home.IconShape
+import com.drdisagree.iconify.ui.fragments.home.MediaIcons
+import com.drdisagree.iconify.ui.fragments.home.Notification
+import com.drdisagree.iconify.ui.fragments.home.NotificationPixel
+import com.drdisagree.iconify.ui.fragments.home.ProgressBar
+import com.drdisagree.iconify.ui.fragments.home.QsPanelTile
+import com.drdisagree.iconify.ui.fragments.home.QsPanelTilePixel
+import com.drdisagree.iconify.ui.fragments.home.SettingsIcons
+import com.drdisagree.iconify.ui.fragments.home.Switch
+import com.drdisagree.iconify.ui.fragments.home.ToastFrame
+import com.drdisagree.iconify.ui.fragments.home.WiFiIcons
+import com.drdisagree.iconify.ui.fragments.settings.AppUpdates
+import com.drdisagree.iconify.ui.fragments.settings.Changelog
+import com.drdisagree.iconify.ui.fragments.settings.Credits
+import com.drdisagree.iconify.ui.fragments.settings.Experimental
+import com.drdisagree.iconify.ui.fragments.settings.Settings
+import com.drdisagree.iconify.ui.fragments.tweaks.BasicColors
+import com.drdisagree.iconify.ui.fragments.tweaks.ColorEngine
+import com.drdisagree.iconify.ui.fragments.tweaks.ColoredBattery
+import com.drdisagree.iconify.ui.fragments.tweaks.MediaPlayer
+import com.drdisagree.iconify.ui.fragments.tweaks.Miscellaneous
+import com.drdisagree.iconify.ui.fragments.tweaks.MonetEngine
+import com.drdisagree.iconify.ui.fragments.tweaks.NavigationBar
+import com.drdisagree.iconify.ui.fragments.tweaks.QsIconLabel
+import com.drdisagree.iconify.ui.fragments.tweaks.QsPanelMargin
+import com.drdisagree.iconify.ui.fragments.tweaks.QsRowColumn
+import com.drdisagree.iconify.ui.fragments.tweaks.QsTileSize
+import com.drdisagree.iconify.ui.fragments.tweaks.Statusbar
+import com.drdisagree.iconify.ui.fragments.tweaks.Tweaks
+import com.drdisagree.iconify.ui.fragments.tweaks.UiRoundness
+import com.drdisagree.iconify.ui.fragments.tweaks.VolumePanel
+import com.drdisagree.iconify.ui.fragments.xposed.BackgroundChip
+import com.drdisagree.iconify.ui.fragments.xposed.BatteryStyle
+import com.drdisagree.iconify.ui.fragments.xposed.DepthWallpaper
+import com.drdisagree.iconify.ui.fragments.xposed.HeaderClock
+import com.drdisagree.iconify.ui.fragments.xposed.HeaderImage
+import com.drdisagree.iconify.ui.fragments.xposed.LockscreenClock
+import com.drdisagree.iconify.ui.fragments.xposed.LockscreenWeather
+import com.drdisagree.iconify.ui.fragments.xposed.LockscreenWidget
+import com.drdisagree.iconify.ui.fragments.xposed.Others
+import com.drdisagree.iconify.ui.fragments.xposed.QuickSettings
+import com.drdisagree.iconify.ui.fragments.xposed.Themes
+import com.drdisagree.iconify.ui.fragments.xposed.TransparencyBlur
+import com.drdisagree.iconify.ui.fragments.xposed.Xposed
+
+object FragmentHelper {
+
+ fun isInGroup(fragment: Fragment, group: Int): Boolean {
+ return when (group) {
+ 0 -> {
+ fragment is Home ||
+ fragment is IconPack ||
+ fragment is ColoredBattery ||
+ fragment is MediaIcons ||
+ fragment is SettingsIcons ||
+ fragment is CellularIcons ||
+ fragment is WiFiIcons ||
+ fragment is BrightnessBar ||
+ fragment is BrightnessBarPixel ||
+ fragment is QsPanelTile ||
+ fragment is QsPanelTilePixel ||
+ fragment is Notification ||
+ fragment is NotificationPixel ||
+ fragment is ProgressBar ||
+ fragment is Switch ||
+ fragment is ToastFrame ||
+ fragment is IconShape
+ }
+
+ 1 -> {
+ fragment is Tweaks ||
+ fragment is ColorEngine ||
+ fragment is BasicColors ||
+ fragment is MonetEngine ||
+ fragment is UiRoundness ||
+ fragment is QsRowColumn ||
+ fragment is QsIconLabel ||
+ fragment is QsTileSize ||
+ fragment is QsPanelMargin ||
+ fragment is Statusbar ||
+ fragment is NavigationBar ||
+ fragment is MediaPlayer ||
+ fragment is VolumePanel ||
+ fragment is Miscellaneous
+ }
+
+ 2 -> {
+ fragment is Xposed ||
+ fragment is TransparencyBlur ||
+ fragment is QuickSettings ||
+ fragment is Themes ||
+ fragment is BatteryStyle ||
+ fragment is com.drdisagree.iconify.ui.fragments.xposed.Statusbar ||
+ fragment is com.drdisagree.iconify.ui.fragments.xposed.VolumePanel ||
+ fragment is HeaderImage ||
+ fragment is HeaderClock ||
+ fragment is LockscreenClock ||
+ fragment is LockscreenWeather ||
+ fragment is LockscreenWidget ||
+ fragment is DepthWallpaper ||
+ fragment is BackgroundChip ||
+ fragment is Others
+ }
+
+ 3 -> {
+ fragment is Settings ||
+ fragment is AppUpdates ||
+ fragment is Changelog ||
+ fragment is Credits ||
+ fragment is Experimental
+ }
+
+ else -> false
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/SnapOnScrollListener.java b/app/src/main/java/com/drdisagree/iconify/ui/utils/SnapOnScrollListener.java
new file mode 100644
index 000000000..d6b1ed4bb
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/SnapOnScrollListener.java
@@ -0,0 +1,72 @@
+package com.drdisagree.iconify.ui.utils;
+
+import android.view.View;
+
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.SnapHelper;
+
+public class SnapOnScrollListener extends RecyclerView.OnScrollListener {
+ private final SnapHelper snapHelper;
+ private Behavior behavior = Behavior.NOTIFY_ON_SCROLL;
+ private OnSnapPositionChangeListener onSnapPositionChangeListener;
+
+ private int snapPosition = RecyclerView.NO_POSITION;
+
+ public SnapOnScrollListener(SnapHelper snapHelper) {
+ this.snapHelper = snapHelper;
+ }
+
+ public SnapOnScrollListener(SnapHelper snapHelper, Behavior behavior, OnSnapPositionChangeListener onSnapPositionChangeListener) {
+ this.snapHelper = snapHelper;
+ this.behavior = behavior;
+ this.onSnapPositionChangeListener = onSnapPositionChangeListener;
+ }
+
+ @Override
+ public void onScrolled(RecyclerView recyclerView, int dx, int dy) {
+ if (behavior == Behavior.NOTIFY_ON_SCROLL) {
+ maybeNotifySnapPositionChange(recyclerView);
+ }
+ }
+
+ @Override
+ public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+ if (behavior == Behavior.NOTIFY_ON_SCROLL_STATE_IDLE
+ && newState == RecyclerView.SCROLL_STATE_IDLE) {
+ maybeNotifySnapPositionChange(recyclerView);
+ }
+ }
+
+ private void maybeNotifySnapPositionChange(RecyclerView recyclerView) {
+ int snapPosition = getSnapPosition(recyclerView);
+ boolean snapPositionChanged = this.snapPosition != snapPosition;
+ if (snapPositionChanged) {
+ if (onSnapPositionChangeListener != null) {
+ onSnapPositionChangeListener.onSnapPositionChange(snapPosition);
+ }
+ this.snapPosition = snapPosition;
+ }
+ }
+
+ public int getSnapPosition(RecyclerView recyclerView) {
+ RecyclerView.LayoutManager layoutManager = recyclerView.getLayoutManager();
+ if (layoutManager == null) {
+ return RecyclerView.NO_POSITION;
+ }
+ View snapView = snapHelper.findSnapView(layoutManager);
+ if (snapView == null) {
+ return RecyclerView.NO_POSITION;
+ }
+ return layoutManager.getPosition(snapView);
+ }
+
+
+ public enum Behavior {
+ NOTIFY_ON_SCROLL,
+ NOTIFY_ON_SCROLL_STATE_IDLE
+ }
+
+ public interface OnSnapPositionChangeListener {
+ void onSnapPositionChange(int position);
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/ThemeHelper.kt b/app/src/main/java/com/drdisagree/iconify/ui/utils/ThemeHelper.kt
index daaca2fe4..e739d6cc7 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/utils/ThemeHelper.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/ThemeHelper.kt
@@ -2,14 +2,14 @@ package com.drdisagree.iconify.ui.utils
import androidx.appcompat.app.AppCompatDelegate
import com.drdisagree.iconify.common.Preferences.APP_THEME
-import com.drdisagree.iconify.config.Prefs.getInt
+import com.drdisagree.iconify.config.RPrefs
object ThemeHelper {
- @JvmStatic
val theme: Int
get() {
- val theme = getInt(APP_THEME, 2)
+ val theme = RPrefs.getString(APP_THEME, "2")!!.toInt()
+
return when (theme) {
0 -> AppCompatDelegate.MODE_NIGHT_NO
1 -> AppCompatDelegate.MODE_NIGHT_YES
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewBindingHelpers.kt b/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewBindingHelpers.kt
index 12af40a2a..684dcd342 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewBindingHelpers.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewBindingHelpers.kt
@@ -13,25 +13,21 @@ import com.bumptech.glide.request.transition.Transition
object ViewBindingHelpers {
- @JvmStatic
fun setImageUrl(imageView: ImageView, url: String) {
Glide.with(imageView.context).load(url.replace("http://", "https://"))
.apply(RequestOptions.centerCropTransform())
.transition(DrawableTransitionOptions.withCrossFade()).into(imageView)
}
- @JvmStatic
fun setDrawable(imageView: ImageView, drawable: Drawable?) {
Glide.with(imageView.context).load(drawable).into(imageView)
}
- @JvmStatic
fun setDrawableWithAnimation(imageView: ImageView, drawable: Drawable?) {
Glide.with(imageView.context).load(drawable)
.transition(DrawableTransitionOptions.withCrossFade()).into(imageView)
}
- @JvmStatic
fun setDrawable(viewGroup: ViewGroup, drawable: Drawable?) {
Glide.with(viewGroup.context).load(drawable).into(object : CustomTarget() {
override fun onResourceReady(
@@ -45,7 +41,6 @@ object ViewBindingHelpers {
})
}
- @JvmStatic
fun setDrawableWithAnimation(viewGroup: ViewGroup, drawable: Drawable?) {
Glide.with(viewGroup.context).load(drawable)
.transition(DrawableTransitionOptions.withCrossFade())
@@ -61,13 +56,11 @@ object ViewBindingHelpers {
})
}
- @JvmStatic
fun setBitmap(imageView: ImageView, bitmap: Bitmap?) {
val drawable: Drawable = BitmapDrawable(imageView.context.resources, bitmap)
setDrawable(imageView, drawable)
}
- @JvmStatic
fun setBitmapWithAnimation(imageView: ImageView, bitmap: Bitmap?) {
val drawable: Drawable = BitmapDrawable(imageView.context.resources, bitmap)
setDrawableWithAnimation(imageView, drawable)
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewHelper.kt b/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewHelper.kt
index 61679cda7..04197e037 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewHelper.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/utils/ViewHelper.kt
@@ -8,6 +8,8 @@ import android.os.BatteryManager
import android.os.Handler
import android.os.Looper
import android.util.TypedValue
+import android.view.ViewGroup
+import android.widget.TextView
import androidx.annotation.DrawableRes
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.Toolbar
@@ -59,7 +61,6 @@ import com.drdisagree.iconify.xposed.modules.batterystyles.RLandscapeBatteryStyl
object ViewHelper {
- @JvmStatic
fun disableNestedScrolling(viewPager: ViewPager2) {
var recyclerView: RecyclerView? = null
@@ -75,22 +76,38 @@ object ViewHelper {
}
}
- @JvmStatic
- fun setHeader(context: Context, toolbar: Toolbar, title: Int) {
+ fun setHeader(context: Context, toolbar: Toolbar, title: Any) {
(context as AppCompatActivity).setSupportActionBar(toolbar)
context.supportActionBar?.setDisplayHomeAsUpEnabled(true)
context.supportActionBar?.setDisplayShowHomeEnabled(true)
- toolbar.setTitle(title)
+ if (title is Int) {
+ toolbar.setTitle(title)
+ } else if (title is String) {
+ toolbar.setTitle(title)
+ }
}
- @JvmStatic
fun setHeader(
context: Context,
fragmentManager: FragmentManager,
toolbar: Toolbar,
title: Int
) {
- toolbar.setTitle(context.resources.getString(title))
+ setHeader(
+ context,
+ fragmentManager,
+ toolbar,
+ context.resources.getString(title)
+ )
+ }
+
+ fun setHeader(
+ context: Context,
+ fragmentManager: FragmentManager,
+ toolbar: Toolbar,
+ title: String
+ ) {
+ toolbar.setTitle(title)
(context as AppCompatActivity).setSupportActionBar(toolbar)
context.supportActionBar?.setDisplayHomeAsUpEnabled(true)
context.supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -106,7 +123,6 @@ object ViewHelper {
return dp2px(dp.toInt())
}
- @JvmStatic
fun dp2px(dp: Int): Int {
return TypedValue.applyDimension(
TypedValue.COMPLEX_UNIT_DIP,
@@ -115,7 +131,6 @@ object ViewHelper {
).toInt()
}
- @JvmStatic
fun getBatteryDrawables(context: Context): Array {
val batteryColor = appContext.getColor(R.color.textColorPrimary)
@@ -183,10 +198,10 @@ object ViewHelper {
batteryDrawables[2] = getRotateDrawable(batteryIcon, -90f)
}
}
+
return batteryDrawables
}
- @JvmStatic
fun getChargingIcons(context: Context): Array {
val chargingIcons = arrayOf(
getDrawable(context, R.drawable.ic_charging_bold)!!, // Bold
@@ -257,4 +272,27 @@ object ViewHelper {
private fun getDrawable(context: Context, @DrawableRes batteryRes: Int): Drawable? {
return ResourcesCompat.getDrawable(context.resources, batteryRes, context.theme)
}
+
+ fun setTextRecursively(viewGroup: ViewGroup, text: String?) {
+ for (i in 0 until viewGroup.childCount) {
+ val child = viewGroup.getChildAt(i)
+ if (child is ViewGroup) {
+ setTextRecursively(child, text)
+ } else if (child is TextView) {
+ child.text = text
+ }
+ }
+ }
+
+ fun applyTextSizeRecursively(viewGroup: ViewGroup, textSize: Int) {
+ for (i in 0 until viewGroup.childCount) {
+ val child = viewGroup.getChildAt(i)
+ if (child is ViewGroup) {
+ applyTextSizeRecursively(child, textSize)
+ } else if (child is TextView) {
+ child.setTextSize(TypedValue.COMPLEX_UNIT_SP, textSize.toFloat())
+ }
+ }
+ }
+
}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/views/OnboardingView.kt b/app/src/main/java/com/drdisagree/iconify/ui/views/OnboardingView.kt
index 6f8cd4995..3a2679afb 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/views/OnboardingView.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/views/OnboardingView.kt
@@ -30,13 +30,12 @@ import com.drdisagree.iconify.common.Preferences.UPDATE_DETECTED
import com.drdisagree.iconify.common.Preferences.VER_CODE
import com.drdisagree.iconify.common.Preferences.XPOSED_ONLY_MODE
import com.drdisagree.iconify.common.Resources
-import com.drdisagree.iconify.config.Prefs
-import com.drdisagree.iconify.config.Prefs.clearPref
-import com.drdisagree.iconify.config.Prefs.getBoolean
-import com.drdisagree.iconify.config.Prefs.getInt
-import com.drdisagree.iconify.config.Prefs.putBoolean
-import com.drdisagree.iconify.config.Prefs.putInt
import com.drdisagree.iconify.config.RPrefs
+import com.drdisagree.iconify.config.RPrefs.clearPref
+import com.drdisagree.iconify.config.RPrefs.getBoolean
+import com.drdisagree.iconify.config.RPrefs.getInt
+import com.drdisagree.iconify.config.RPrefs.putBoolean
+import com.drdisagree.iconify.config.RPrefs.putInt
import com.drdisagree.iconify.databinding.ViewOnboardingPageBinding
import com.drdisagree.iconify.ui.activities.MainActivity
import com.drdisagree.iconify.ui.adapters.OnboardingAdapter
@@ -45,20 +44,20 @@ import com.drdisagree.iconify.ui.dialogs.ErrorDialog
import com.drdisagree.iconify.ui.dialogs.InstallationDialog
import com.drdisagree.iconify.ui.entity.OnboardingPage
import com.drdisagree.iconify.ui.utils.Animatoo.animateSlideLeft
-import com.drdisagree.iconify.utils.FileUtil.copyAssets
-import com.drdisagree.iconify.utils.ModuleUtil.createModule
-import com.drdisagree.iconify.utils.ModuleUtil.flashModule
-import com.drdisagree.iconify.utils.ModuleUtil.handleModule
-import com.drdisagree.iconify.utils.ModuleUtil.moduleExists
-import com.drdisagree.iconify.utils.RootUtil.deviceProperlyRooted
-import com.drdisagree.iconify.utils.RootUtil.isDeviceRooted
-import com.drdisagree.iconify.utils.SystemUtil.hasStoragePermission
-import com.drdisagree.iconify.utils.SystemUtil.requestStoragePermission
-import com.drdisagree.iconify.utils.SystemUtil.restartDevice
-import com.drdisagree.iconify.utils.SystemUtil.savedVersionCode
+import com.drdisagree.iconify.utils.FileUtils.copyAssets
+import com.drdisagree.iconify.utils.ModuleUtils.createModule
+import com.drdisagree.iconify.utils.ModuleUtils.flashModule
+import com.drdisagree.iconify.utils.ModuleUtils.handleModule
+import com.drdisagree.iconify.utils.ModuleUtils.moduleExists
+import com.drdisagree.iconify.utils.RootUtils.deviceProperlyRooted
+import com.drdisagree.iconify.utils.RootUtils.isDeviceRooted
+import com.drdisagree.iconify.utils.SystemUtils.hasStoragePermission
+import com.drdisagree.iconify.utils.SystemUtils.requestStoragePermission
+import com.drdisagree.iconify.utils.SystemUtils.restartDevice
+import com.drdisagree.iconify.utils.SystemUtils.savedVersionCode
import com.drdisagree.iconify.utils.helper.BackupRestore.restoreFiles
import com.drdisagree.iconify.utils.helper.Logger.writeLog
-import com.drdisagree.iconify.utils.overlay.OverlayUtil.overlayExists
+import com.drdisagree.iconify.utils.overlay.OverlayUtils.overlayExists
import com.drdisagree.iconify.utils.overlay.compiler.OnboardingCompiler.apkSigner
import com.drdisagree.iconify.utils.overlay.compiler.OnboardingCompiler.createManifest
import com.drdisagree.iconify.utils.overlay.compiler.OnboardingCompiler.runAapt
@@ -213,7 +212,6 @@ class OnboardingView : FrameLayout {
if (getInt(VER_CODE) != BuildConfig.VERSION_CODE || !moduleExists || !overlayExists) {
if (!moduleExists || !overlayExists) {
- Prefs.clearAllPrefs()
RPrefs.clearAllPrefs()
}
@@ -271,12 +269,11 @@ class OnboardingView : FrameLayout {
}, (if (clickedButton) 10 else 1000).toLong())
} else {
if (!moduleExists()) {
- Prefs.clearAllPrefs()
RPrefs.clearAllPrefs()
handleInstallation()
} else {
- putBoolean(XPOSED_ONLY_MODE, true)
+ putBoolean(XPOSED_ONLY_MODE, !overlayExists())
val intent = Intent(context, MainActivity::class.java)
intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK or Intent.FLAG_ACTIVITY_NEW_TASK)
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/BottomSheetWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/BottomSheetWidget.kt
index f159be955..348285d4d 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/BottomSheetWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/BottomSheetWidget.kt
@@ -17,7 +17,8 @@ import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.RecyclerView
import com.drdisagree.iconify.R
import com.drdisagree.iconify.ui.adapters.IconsAdapter
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.ui.adapters.IconsAdapter.Companion.ICONS_ADAPTER
+import com.drdisagree.iconify.utils.SystemUtils
import com.google.android.material.appbar.MaterialToolbar
import com.google.android.material.bottomsheet.BottomSheetDialog
import kotlinx.parcelize.Parcelize
@@ -37,7 +38,8 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
private lateinit var mEntryValues: Array
private var mDrawables: Array? = null
private var mValue: String = selectedIndex.toString()
- private var mAdapter: IconsAdapter? = null
+ private var mAdapter: RecyclerView.Adapter? = null
+ private var mLayoutManager: RecyclerView.LayoutManager? = null
private var onItemClickListener: OnItemClickListener? = null
constructor(context: Context) : super(context) {
@@ -103,6 +105,11 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
}
private fun buildEntries() {
+ if (arrayResId == 0) {
+ mEntries = emptyArray()
+ mEntryValues = emptyArray()
+ return
+ }
mEntries = resources.getTextArray(arrayResId)
val mValues: MutableList = ArrayList()
@@ -121,6 +128,10 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
titleTextView.text = title
}
+ fun setSummary(summary: String) {
+ summaryTextView.text = summary
+ }
+
private fun setSelectedText(summaryResId: Int) {
setSelectedText(context.getString(summaryResId))
}
@@ -144,12 +155,16 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
fun setDrawable(drawable: Array) {
mDrawables = drawable
- mAdapter?.setDrawables(drawable)
+ if (mAdapter is IconsAdapter) (mAdapter as IconsAdapter).setDrawables(drawable)
}
fun setCurrentValue(currentValue: String) {
mValue = currentValue
- mAdapter?.setCurrentValue(currentValue)
+ if (mAdapter is IconsAdapter) (mAdapter as IconsAdapter).setCurrentValue(currentValue)
+ }
+
+ fun setLayoutManager(layoutManager: RecyclerView.LayoutManager) {
+ mLayoutManager = layoutManager
}
fun setIconVisibility(visibility: Int) {
@@ -161,6 +176,7 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
}
fun setSelectedIndex(selectedIndex: Int) {
+ if (arrayResId == 0) return
var idx = selectedIndex
val list = listOf(*resources.getStringArray(arrayResId))
@@ -185,15 +201,22 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
toolbar.title = titleTextView.text
toolbar.isTitleCentered = true
- recyclerView.layoutManager = GridLayoutManager(context, 3)
+ recyclerView.layoutManager = mLayoutManager ?: GridLayoutManager(context, 3)
- mAdapter = IconsAdapter(mEntries, mEntryValues, mValue, this)
- mAdapter!!.setDrawables(mDrawables)
+ if (mAdapter == null) {
+ mAdapter = IconsAdapter(mEntries, mEntryValues, mValue, ICONS_ADAPTER, this)
+ (mAdapter!! as IconsAdapter).setDrawables(mDrawables)
+ }
recyclerView.adapter = mAdapter
mBottomSheetDialog.setContentView(view)
}
+ fun setAdapter(adapter: RecyclerView.Adapter) {
+ mAdapter = adapter
+ initBottomSheetDialog()
+ }
+
override fun setEnabled(enabled: Boolean) {
super.setEnabled(enabled)
@@ -207,7 +230,7 @@ class BottomSheetWidget : RelativeLayout, IconsAdapter.OnItemClickListener {
iconImageView.imageTintList = ColorStateList.valueOf(color)
} else {
- if (SystemUtil.isDarkMode) {
+ if (SystemUtils.isDarkMode) {
iconImageView.imageTintList = ColorStateList.valueOf(Color.DKGRAY)
} else {
iconImageView.imageTintList = ColorStateList.valueOf(Color.LTGRAY)
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerSmallWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerSmallWidget.kt
index a5a66046e..3c431e647 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerSmallWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerSmallWidget.kt
@@ -16,7 +16,7 @@ import com.drdisagree.iconify.R
import com.drdisagree.iconify.ui.activities.MainActivity
import com.drdisagree.iconify.ui.events.ColorDismissedEvent
import com.drdisagree.iconify.ui.events.ColorSelectedEvent
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.SystemUtils
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
import org.greenrobot.eventbus.EventBus
@@ -108,7 +108,7 @@ class ColorPickerSmallWidget : RelativeLayout {
selectedColor = colorCode
if (!isEnabled) {
- colorCode = if (SystemUtil.isDarkMode) {
+ colorCode = if (SystemUtils.isDarkMode) {
Color.DKGRAY
} else {
Color.LTGRAY
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerWidget.kt
index 9fa58cef6..fceed6153 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/ColorPickerWidget.kt
@@ -15,7 +15,7 @@ import com.drdisagree.iconify.R
import com.drdisagree.iconify.ui.activities.MainActivity
import com.drdisagree.iconify.ui.events.ColorDismissedEvent
import com.drdisagree.iconify.ui.events.ColorSelectedEvent
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.SystemUtils
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
import org.greenrobot.eventbus.EventBus
@@ -53,18 +53,18 @@ class ColorPickerWidget : RelativeLayout {
private fun init(context: Context, attrs: AttributeSet?) {
inflate(context, R.layout.view_widget_colorpicker, this)
-
+
initializeId()
-
+
val typedArray = context.obtainStyledAttributes(attrs, R.styleable.ColorPickerWidget)
-
+
setTitle(typedArray.getString(R.styleable.ColorPickerWidget_titleText))
setSummary(typedArray.getString(R.styleable.ColorPickerWidget_summaryText))
val colorResId = typedArray.getResourceId(R.styleable.ColorPickerWidget_previewColor, -1)
selectedColor = typedArray.getColor(R.styleable.ColorPickerWidget_previewColor, Color.WHITE)
-
+
typedArray.recycle()
-
+
if (colorResId != -1) {
previewColor = ContextCompat.getColor(getContext(), colorResId)
}
@@ -80,10 +80,20 @@ class ColorPickerWidget : RelativeLayout {
fun setSummary(summaryResId: Int) {
summaryTextView.setText(summaryResId)
+ if (summaryResId == 0) {
+ summaryTextView.visibility = View.GONE
+ } else {
+ summaryTextView.visibility = View.VISIBLE
+ }
}
fun setSummary(summary: String?) {
summaryTextView.text = summary
+ if (summary.isNullOrEmpty()) {
+ summaryTextView.visibility = View.GONE
+ } else {
+ summaryTextView.visibility = View.VISIBLE
+ }
}
fun setColorPickerListener(
@@ -117,7 +127,7 @@ class ColorPickerWidget : RelativeLayout {
selectedColor = colorCode
if (!isEnabled) {
- colorCode = if (SystemUtil.isDarkMode) {
+ colorCode = if (SystemUtils.isDarkMode) {
Color.DKGRAY
} else {
Color.LTGRAY
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/EditTextWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/EditTextWidget.kt
new file mode 100644
index 000000000..71027d235
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/EditTextWidget.kt
@@ -0,0 +1,181 @@
+package com.drdisagree.iconify.ui.widgets
+
+import android.content.Context
+import android.content.res.ColorStateList
+import android.graphics.Color
+import android.graphics.drawable.Drawable
+import android.text.TextUtils
+import android.util.AttributeSet
+import android.util.TypedValue
+import android.view.View
+import android.widget.ImageView
+import android.widget.RelativeLayout
+import android.widget.TextView
+import com.drdisagree.iconify.R
+import com.drdisagree.iconify.ui.dialogs.EditTextDialog
+import com.drdisagree.iconify.utils.SystemUtils
+
+class EditTextWidget : RelativeLayout {
+
+ private lateinit var container: RelativeLayout
+ private lateinit var titleTextView: TextView
+ private lateinit var summaryTextView: TextView
+ private lateinit var iconImageView: ImageView
+ private lateinit var dialogTitle: String
+ private lateinit var dialogSubtitle: String
+ private lateinit var dialogHint: String
+ private lateinit var dialogText: String
+ private lateinit var mEditTextDialog: EditTextDialog
+
+ constructor(context: Context) : super(context) {
+ init(context, null)
+ }
+
+ constructor(context: Context, attrs: AttributeSet?) : super(context, attrs) {
+ init(context, attrs)
+ }
+
+ constructor(context: Context, attrs: AttributeSet?, defStyleAttr: Int) : super(
+ context,
+ attrs,
+ defStyleAttr
+ ) {
+ init(context, attrs)
+ }
+
+ private fun init(context: Context, attrs: AttributeSet?) {
+ inflate(context, R.layout.view_widget_bottomsheet, this)
+
+ initializeId()
+
+ val typedArray = context.obtainStyledAttributes(attrs, R.styleable.EditTextWidget)
+ dialogTitle = typedArray.getString(R.styleable.EditTextWidget_dialogTitleText).toString()
+ if (TextUtils.isEmpty(dialogTitle) || dialogTitle == "null") dialogTitle = typedArray.getString(R.styleable.EditTextWidget_titleText).toString();
+ dialogSubtitle = typedArray.getString(R.styleable.EditTextWidget_dialogSubtitleText).toString()
+ if (dialogSubtitle.isEmpty() || dialogSubtitle == "null") dialogSubtitle = typedArray.getString(R.styleable.EditTextWidget_summaryText).toString();
+ if (dialogSubtitle == "null") dialogSubtitle = "" // catch null summary
+ dialogHint = typedArray.getString(R.styleable.EditTextWidget_dialogHintText).toString()
+ dialogText = typedArray.getString(R.styleable.EditTextWidget_dialogText).toString()
+
+ setTitle(typedArray.getString(R.styleable.EditTextWidget_titleText))
+ setSummary(typedArray.getString(R.styleable.EditTextWidget_summaryText))
+
+ val icon = typedArray.getResourceId(R.styleable.BottomSheetWidget_icon, 0)
+ var iconSpaceReserved =
+ typedArray.getBoolean(R.styleable.BottomSheetWidget_iconSpaceReserved, false)
+
+ typedArray.recycle()
+
+ if (icon != 0) {
+ iconSpaceReserved = true
+ iconImageView.setImageResource(icon)
+ }
+
+ if (!iconSpaceReserved) {
+ iconImageView.visibility = View.GONE
+ }
+
+ container.setOnClickListener { mEditTextDialog.show(dialogTitle, dialogSubtitle, dialogHint, dialogText) }
+ }
+
+ fun setTitle(titleResId: Int) {
+ titleTextView.setText(titleResId)
+ }
+
+ fun setTitle(title: String?) {
+ titleTextView.text = title
+ }
+
+ fun setSummary(summary: String?) {
+ summaryTextView.text = summary
+ }
+
+ /**
+ * Set the text for the EditText in the dialog
+ * @param text The text to be displayed in the EditText
+ */
+ fun setEditTextValue(text: String) {
+ dialogText = text
+ }
+
+ /**
+ * Set the hint for the EditText in the dialog
+ * @param hint The hint to be displayed in the EditText
+ */
+ fun setEditTextHint(hint: String) {
+ dialogHint = hint
+ }
+
+ fun setIcon(icon: Int) {
+ iconImageView.setImageResource(icon)
+ iconImageView.visibility = View.VISIBLE
+ }
+
+ fun setIcon(drawable: Drawable?) {
+ iconImageView.setImageDrawable(drawable)
+ iconImageView.visibility = View.VISIBLE
+ }
+
+ fun setIconVisibility(visibility: Int) {
+ iconImageView.visibility = visibility
+ }
+
+ override fun setEnabled(enabled: Boolean) {
+ super.setEnabled(enabled)
+
+ if (enabled) {
+ val typedValue = TypedValue()
+ val a = context.obtainStyledAttributes(
+ typedValue.data, intArrayOf(com.google.android.material.R.attr.colorPrimary)
+ )
+ val color = a.getColor(0, 0)
+ a.recycle()
+
+ iconImageView.imageTintList = ColorStateList.valueOf(color)
+ } else {
+ if (SystemUtils.isDarkMode) {
+ iconImageView.imageTintList = ColorStateList.valueOf(Color.DKGRAY)
+ } else {
+ iconImageView.imageTintList = ColorStateList.valueOf(Color.LTGRAY)
+ }
+ }
+
+ container.isEnabled = enabled
+ titleTextView.isEnabled = enabled
+ summaryTextView.isEnabled = enabled
+ iconImageView.isEnabled = enabled
+ }
+
+ // to avoid listener bug, we need to re-generate unique id for each view
+ private fun initializeId() {
+ container = findViewById(R.id.container)
+ titleTextView = findViewById(R.id.title)
+ summaryTextView = findViewById(R.id.summary)
+ iconImageView = findViewById(R.id.icon)
+ container.setId(generateViewId())
+ titleTextView.setId(generateViewId())
+ summaryTextView.setId(generateViewId())
+ iconImageView.setId(generateViewId())
+
+ mEditTextDialog = EditTextDialog(context, container.id)
+
+ val layoutParams = findViewById(R.id.text_container).layoutParams as LayoutParams
+ layoutParams.addRule(END_OF, iconImageView.id)
+ findViewById(R.id.text_container).setLayoutParams(layoutParams)
+ }
+
+ override fun onDetachedFromWindow() {
+ mEditTextDialog.dismiss()
+ super.onDetachedFromWindow()
+ }
+
+ /**
+ * Set the listener for the EditTextDialog
+ * @param listener The listener to be set
+ * @see EditTextDialog.EditTextDialogListener
+ */
+ fun setOnEditTextListener(listener: EditTextDialog.EditTextDialogListener?) {
+ mEditTextDialog.setDialogListener(listener)
+ }
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/FilePickerWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/FilePickerWidget.kt
index 3cda45d65..683711c5b 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/FilePickerWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/FilePickerWidget.kt
@@ -8,8 +8,8 @@ import android.widget.RelativeLayout
import android.widget.TextView
import androidx.activity.result.ActivityResultLauncher
import com.drdisagree.iconify.R
-import com.drdisagree.iconify.utils.FileUtil
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.FileUtils
+import com.drdisagree.iconify.utils.SystemUtils
import com.google.android.material.button.MaterialButton
class FilePickerWidget : RelativeLayout {
@@ -102,11 +102,11 @@ class FilePickerWidget : RelativeLayout {
activityResultLauncher = launcher
buttonPicker.setOnClickListener {
- if (!SystemUtil.hasStoragePermission()) {
- SystemUtil.requestStoragePermission(context)
+ if (!SystemUtils.hasStoragePermission()) {
+ SystemUtils.requestStoragePermission(context)
} else {
if (::activityResultLauncher.isInitialized) {
- FileUtil.launchFilePicker(activityResultLauncher, fileType)
+ FileUtils.launchFilePicker(activityResultLauncher, fileType)
}
}
}
@@ -151,10 +151,10 @@ class FilePickerWidget : RelativeLayout {
if (::activityResultLauncher.isInitialized) {
buttonPicker.setOnClickListener {
- if (!SystemUtil.hasStoragePermission()) {
- SystemUtil.requestStoragePermission(context)
+ if (!SystemUtils.hasStoragePermission()) {
+ SystemUtils.requestStoragePermission(context)
} else {
- FileUtil.launchFilePicker(activityResultLauncher, fileType)
+ FileUtils.launchFilePicker(activityResultLauncher, fileType)
}
}
}
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/MenuWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/MenuWidget.kt
index 30042b0e0..6cfba1a02 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/MenuWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/MenuWidget.kt
@@ -11,7 +11,7 @@ import android.widget.ImageView
import android.widget.RelativeLayout
import android.widget.TextView
import com.drdisagree.iconify.R
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.SystemUtils
class MenuWidget : RelativeLayout {
@@ -127,7 +127,7 @@ class MenuWidget : RelativeLayout {
)
)
} else {
- if (SystemUtil.isDarkMode) {
+ if (SystemUtils.isDarkMode) {
iconImageView.setImageTintList(ColorStateList.valueOf(Color.DKGRAY))
endArrowImageView.setImageTintList(ColorStateList.valueOf(Color.DKGRAY))
} else {
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/RadioDialogWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/RadioDialogWidget.kt
index 3d8fa94f7..09c1d6a1e 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/RadioDialogWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/RadioDialogWidget.kt
@@ -13,7 +13,7 @@ import android.widget.RelativeLayout
import android.widget.TextView
import com.drdisagree.iconify.R
import com.drdisagree.iconify.ui.dialogs.RadioDialog
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.SystemUtils
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
@@ -56,7 +56,14 @@ class RadioDialogWidget : RelativeLayout, RadioDialog.RadioDialogListener {
showSelectedPrefix =
typedArray.getBoolean(R.styleable.RadioDialogWidget_showSelectedPrefix, true)
titleResId = typedArray.getResourceId(R.styleable.RadioDialogWidget_titleText, 0)
- setTitle(titleResId)
+ if (titleResId != 0) {
+ setTitle(titleResId)
+ } else {
+ val title = typedArray.getString(R.styleable.RadioDialogWidget_titleText)
+ if (title != null) {
+ setTitle(title)
+ }
+ }
arrayResId = typedArray.getResourceId(R.styleable.RadioDialogWidget_entries, 0)
if (arrayResId != 0) {
try {
@@ -168,7 +175,7 @@ class RadioDialogWidget : RelativeLayout, RadioDialog.RadioDialogListener {
iconImageView.setImageTintList(ColorStateList.valueOf(color))
} else {
- if (SystemUtil.isDarkMode) {
+ if (SystemUtils.isDarkMode) {
iconImageView.setImageTintList(ColorStateList.valueOf(Color.DKGRAY))
} else {
iconImageView.setImageTintList(ColorStateList.valueOf(Color.LTGRAY))
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/SliderWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/SliderWidget.kt
index caf3801cf..12e5e787c 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/SliderWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/SliderWidget.kt
@@ -4,11 +4,12 @@ import android.content.Context
import android.os.Parcelable
import android.util.AttributeSet
import android.view.View
-import android.widget.ImageView
import android.widget.LinearLayout
import android.widget.RelativeLayout
import android.widget.TextView
import com.drdisagree.iconify.R
+import com.drdisagree.iconify.utils.HapticUtils.weakVibrate
+import com.google.android.material.button.MaterialButton
import com.google.android.material.slider.Slider
import kotlinx.parcelize.Parcelize
import kotlinx.parcelize.RawValue
@@ -21,7 +22,7 @@ class SliderWidget : RelativeLayout {
private lateinit var titleTextView: TextView
private lateinit var summaryTextView: TextView
private lateinit var materialSlider: Slider
- private lateinit var resetIcon: ImageView
+ private lateinit var resetButton: MaterialButton
private var valueFormat: String? = ""
private var defaultValue = 0
private var outputScale = 1f
@@ -78,7 +79,7 @@ class SliderWidget : RelativeLayout {
}
setSelectedText()
- handleResetVisibility()
+ handleResetButton()
setOnSliderTouchListener(null)
setResetClickListener(null)
}
@@ -117,7 +118,7 @@ class SliderWidget : RelativeLayout {
set(value) {
materialSlider.value = value.toFloat()
setSelectedText()
- handleResetVisibility()
+ handleResetButton()
}
fun setSliderValueFrom(value: Int) {
@@ -153,7 +154,7 @@ class SliderWidget : RelativeLayout {
override fun onStopTrackingTouch(slider: Slider) {
setSelectedText()
- handleResetVisibility()
+ handleResetButton()
notifyOnSliderTouchStopped(slider)
}
})
@@ -175,21 +176,20 @@ class SliderWidget : RelativeLayout {
fun setResetClickListener(listener: OnLongClickListener?) {
resetClickListener = listener
- resetIcon.setOnLongClickListener { v: View ->
+ resetButton.setOnClickListener { v: View ->
if (defaultValue == Int.MAX_VALUE) {
- return@setOnLongClickListener false
+ return@setOnClickListener
}
sliderValue = defaultValue
- handleResetVisibility()
+ handleResetButton()
notifyOnResetClicked(v)
- true
}
}
fun resetSlider() {
- resetIcon.performLongClick()
+ resetButton.performLongClick()
}
private fun notifyOnSliderTouchStarted(slider: Slider) {
@@ -201,24 +201,26 @@ class SliderWidget : RelativeLayout {
}
private fun notifyOnResetClicked(v: View) {
+ v.weakVibrate()
resetClickListener?.onLongClick(v)
}
- private fun handleResetVisibility() {
- if (defaultValue != Int.MAX_VALUE && materialSlider.value != defaultValue.toFloat()) {
- resetIcon.setVisibility(VISIBLE)
+ private fun handleResetButton() {
+ if (defaultValue != Int.MAX_VALUE) {
+ resetButton.visibility = VISIBLE
+ resetButton.isEnabled = isEnabled && materialSlider.value != defaultValue.toFloat()
} else {
- resetIcon.setVisibility(GONE)
+ resetButton.visibility = GONE
}
}
override fun setEnabled(enabled: Boolean) {
super.setEnabled(enabled)
- container.setEnabled(enabled)
- titleTextView.setEnabled(enabled)
- summaryTextView.setEnabled(enabled)
- resetIcon.setEnabled(enabled)
+ container.isEnabled = enabled
+ titleTextView.isEnabled = enabled
+ summaryTextView.isEnabled = enabled
+ resetButton.isEnabled = enabled
materialSlider.isEnabled = enabled
}
@@ -228,12 +230,12 @@ class SliderWidget : RelativeLayout {
titleTextView = findViewById(R.id.title)
summaryTextView = findViewById(R.id.summary)
materialSlider = findViewById(R.id.slider_widget)
- resetIcon = findViewById(R.id.reset)
- container.setId(generateViewId())
- titleTextView.setId(generateViewId())
- summaryTextView.setId(generateViewId())
- materialSlider.setId(generateViewId())
- resetIcon.setId(generateViewId())
+ resetButton = findViewById(R.id.reset_button)
+ container.id = generateViewId()
+ titleTextView.id = generateViewId()
+ summaryTextView.id = generateViewId()
+ materialSlider.id = generateViewId()
+ resetButton.id = generateViewId()
}
override fun onSaveInstanceState(): Parcelable {
@@ -249,7 +251,7 @@ class SliderWidget : RelativeLayout {
super.onRestoreInstanceState(state.superState)
materialSlider.value = state.sliderValue
setSelectedText()
- handleResetVisibility()
+ handleResetButton()
}
@Parcelize
diff --git a/app/src/main/java/com/drdisagree/iconify/ui/widgets/SwitchWidget.kt b/app/src/main/java/com/drdisagree/iconify/ui/widgets/SwitchWidget.kt
index 1a707bc07..1f28d1cc9 100644
--- a/app/src/main/java/com/drdisagree/iconify/ui/widgets/SwitchWidget.kt
+++ b/app/src/main/java/com/drdisagree/iconify/ui/widgets/SwitchWidget.kt
@@ -12,7 +12,7 @@ import android.widget.ImageView
import android.widget.RelativeLayout
import android.widget.TextView
import com.drdisagree.iconify.R
-import com.drdisagree.iconify.utils.SystemUtil
+import com.drdisagree.iconify.utils.SystemUtils
import com.google.android.material.materialswitch.MaterialSwitch
class SwitchWidget : RelativeLayout {
@@ -83,10 +83,20 @@ class SwitchWidget : RelativeLayout {
fun setSummary(summaryResId: Int) {
summaryTextView.setText(summaryResId)
+ if (summaryResId == 0) {
+ summaryTextView.visibility = GONE
+ } else {
+ summaryTextView.visibility = VISIBLE
+ }
}
fun setSummary(summary: String?) {
summaryTextView.text = summary
+ if (summary.isNullOrEmpty()) {
+ summaryTextView.visibility = GONE
+ } else {
+ summaryTextView.visibility = VISIBLE
+ }
}
fun setIcon(icon: Int) {
@@ -130,7 +140,7 @@ class SwitchWidget : RelativeLayout {
iconImageView.setImageTintList(ColorStateList.valueOf(color))
} else {
- if (SystemUtil.isDarkMode) {
+ if (SystemUtils.isDarkMode) {
iconImageView.setImageTintList(ColorStateList.valueOf(Color.DKGRAY))
} else {
iconImageView.setImageTintList(ColorStateList.valueOf(Color.LTGRAY))
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/AppUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/AppUtil.kt
deleted file mode 100644
index 28616f82e..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/AppUtil.kt
+++ /dev/null
@@ -1,127 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.annotation.SuppressLint
-import android.app.Activity
-import android.content.Intent
-import android.content.pm.ApplicationInfo
-import android.content.pm.PackageManager
-import android.graphics.drawable.Drawable
-import android.os.Handler
-import android.os.Looper
-import android.widget.Toast
-import androidx.core.content.ContextCompat
-import com.drdisagree.iconify.Iconify
-import com.drdisagree.iconify.Iconify.Companion.appContext
-import com.drdisagree.iconify.R
-import com.topjohnwu.superuser.Shell
-
-object AppUtil {
-
- fun isAppInstalled(packageName: String?): Boolean {
- val pm = appContext.packageManager
-
- try {
- pm.getPackageInfo(packageName!!, PackageManager.GET_ACTIVITIES)
- return pm.getApplicationInfo(packageName, 0).enabled
- } catch (ignored: PackageManager.NameNotFoundException) {
- }
-
- return false
- }
-
- @JvmStatic
- fun isAppInstalledRoot(packageName: String): Boolean {
- return Shell.cmd("res=$(pm path $packageName); if [ ! -z \"\$res\" ]; then echo \"installed\"; else echo \"not found\"; fi")
- .exec().out[0].contains("installed")
- }
-
- fun getAppUid(packageName: String?): Int {
- val pm = appContext.packageManager
-
- try {
- pm.getPackageInfo(packageName!!, PackageManager.GET_ACTIVITIES)
- return pm.getApplicationInfo(packageName, 0).uid
- } catch (ignored: PackageManager.NameNotFoundException) {
- }
-
- return 0
- }
-
- @JvmStatic
- @SuppressLint("UseCompatLoadingForDrawables")
- fun getAppIcon(packageName: String?): Drawable? {
- var appIcon = ContextCompat.getDrawable(appContext, R.drawable.ic_android)
-
- try {
- appIcon = appContext.packageManager.getApplicationIcon(packageName!!)
- } catch (ignored: PackageManager.NameNotFoundException) {
- }
-
- return appIcon
- }
-
- @JvmStatic
- fun getAppName(packageName: String?): String {
- val pm = appContext.applicationContext.packageManager
- var ai: ApplicationInfo? = null
-
- try {
- ai = pm.getApplicationInfo(packageName!!, 0)
- } catch (ignored: PackageManager.NameNotFoundException) {
- }
-
- return (if (ai == null) "Unavailable" else pm.getApplicationLabel(ai)) as String
- }
-
- @JvmStatic
- fun launchApp(activity: Activity, packageName: String?) {
- val launchIntent = appContext.packageManager.getLaunchIntentForPackage(
- packageName!!
- )
-
- if (launchIntent != null) {
- activity.startActivity(launchIntent)
- } else {
- Toast.makeText(
- appContext,
- appContext.resources.getString(R.string.app_not_found),
- Toast.LENGTH_SHORT
- ).show()
- }
- }
-
- @JvmStatic
- fun getSplitLocations(packageName: String?): Array {
- try {
- var splitLocations = appContext.packageManager.getApplicationInfo(
- packageName!!, 0
- ).splitSourceDirs
-
- if (splitLocations == null) {
- splitLocations = arrayOf(
- appContext.packageManager.getApplicationInfo(
- packageName, 0
- ).sourceDir
- )
- }
- return splitLocations
- } catch (ignored: PackageManager.NameNotFoundException) {
- }
-
- return arrayOfNulls(0)
- }
-
- @JvmStatic
- val isLsposedInstalled: Boolean
- get() = RootUtil.fileExists("/data/adb/lspd/manager.apk") || RootUtil.fileExists("/data/adb/modules/*lsposed*/manager.apk")
-
- @JvmStatic
- fun restartApplication(activity: Activity) {
- Handler(Looper.getMainLooper()).postDelayed({
- val intent = activity.intent
- intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
- activity.finish()
- activity.startActivity(intent)
- }, 600)
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/AppUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/AppUtils.kt
new file mode 100644
index 000000000..d0ead23ce
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/AppUtils.kt
@@ -0,0 +1,119 @@
+package com.drdisagree.iconify.utils
+
+import android.annotation.SuppressLint
+import android.app.Activity
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import android.os.Handler
+import android.os.Looper
+import android.widget.Toast
+import androidx.core.content.ContextCompat
+import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.R
+import com.topjohnwu.superuser.Shell
+
+object AppUtils {
+
+ fun isAppInstalled(packageName: String?): Boolean {
+ val pm = appContext.packageManager
+
+ try {
+ pm.getPackageInfo(packageName!!, PackageManager.GET_ACTIVITIES)
+ return pm.getApplicationInfo(packageName, 0).enabled
+ } catch (ignored: PackageManager.NameNotFoundException) {
+ }
+
+ return false
+ }
+
+ fun isAppInstalledRoot(packageName: String): Boolean {
+ return Shell.cmd("res=$(pm path $packageName); if [ ! -z \"\$res\" ]; then echo \"installed\"; else echo \"not found\"; fi")
+ .exec().out[0].contains("installed")
+ }
+
+ fun getAppUid(packageName: String?): Int {
+ val pm = appContext.packageManager
+
+ try {
+ pm.getPackageInfo(packageName!!, PackageManager.GET_ACTIVITIES)
+ return pm.getApplicationInfo(packageName, 0).uid
+ } catch (ignored: PackageManager.NameNotFoundException) {
+ }
+
+ return 0
+ }
+
+ @SuppressLint("UseCompatLoadingForDrawables")
+ fun getAppIcon(packageName: String?): Drawable? {
+ var appIcon = ContextCompat.getDrawable(appContext, R.drawable.ic_android)
+
+ try {
+ appIcon = appContext.packageManager.getApplicationIcon(packageName!!)
+ } catch (ignored: PackageManager.NameNotFoundException) {
+ }
+
+ return appIcon
+ }
+
+ fun getAppName(packageName: String?): String {
+ val pm = appContext.applicationContext.packageManager
+ var ai: ApplicationInfo? = null
+
+ try {
+ ai = pm.getApplicationInfo(packageName!!, 0)
+ } catch (ignored: PackageManager.NameNotFoundException) {
+ }
+
+ return (if (ai == null) "Unavailable" else pm.getApplicationLabel(ai)) as String
+ }
+
+ fun launchApp(activity: Activity, packageName: String?) {
+ val launchIntent = appContext.packageManager.getLaunchIntentForPackage(
+ packageName!!
+ )
+
+ if (launchIntent != null) {
+ activity.startActivity(launchIntent)
+ } else {
+ Toast.makeText(
+ appContext,
+ appContext.resources.getString(R.string.app_not_found),
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+ }
+
+ fun getSplitLocations(packageName: String?): Array {
+ try {
+ var splitLocations = appContext.packageManager.getApplicationInfo(
+ packageName!!, 0
+ ).splitSourceDirs
+
+ if (splitLocations == null) {
+ splitLocations = arrayOf(
+ appContext.packageManager.getApplicationInfo(
+ packageName, 0
+ ).sourceDir
+ )
+ }
+ return splitLocations
+ } catch (ignored: PackageManager.NameNotFoundException) {
+ }
+
+ return arrayOfNulls(0)
+ }
+
+ val isLsposedInstalled: Boolean
+ get() = RootUtils.fileExists("/data/adb/lspd/manager.apk") || RootUtils.fileExists("/data/adb/modules/*lsposed*/manager.apk")
+
+ fun restartApplication(activity: Activity) {
+ Handler(Looper.getMainLooper()).postDelayed({
+ val intent = activity.intent
+ intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK)
+ activity.finish()
+ activity.startActivity(intent)
+ }, 600)
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/CacheUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/CacheUtil.kt
deleted file mode 100644
index 3b2fa5502..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/CacheUtil.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.content.Context
-import java.io.File
-
-object CacheUtil {
-
- @JvmStatic
- fun clearCache(context: Context) {
- try {
- var dir = context.cacheDir
- deleteDir(dir)
-
- dir = context.externalCacheDir
- deleteDir(dir)
-
- dir = context.filesDir
- deleteDir(dir)
- } catch (e: Exception) {
- e.printStackTrace()
- }
- }
-
- private fun deleteDir(dir: File?): Boolean {
- return if (dir != null && dir.isDirectory()) {
- val children = dir.list() ?: return false
-
- for (child in children) {
- val success = deleteDir(File(dir, child))
-
- if (!success) {
- return false
- }
- }
-
- dir.delete()
- } else if (dir != null && dir.isFile()) {
- dir.delete()
- } else {
- false
- }
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/CacheUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/CacheUtils.kt
new file mode 100644
index 000000000..484f457d6
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/CacheUtils.kt
@@ -0,0 +1,42 @@
+package com.drdisagree.iconify.utils
+
+import android.content.Context
+import java.io.File
+
+object CacheUtils {
+
+ fun clearCache(context: Context) {
+ try {
+ var dir = context.cacheDir
+ deleteDir(dir)
+
+ dir = context.externalCacheDir
+ deleteDir(dir)
+
+ dir = context.filesDir
+ deleteDir(dir)
+ } catch (e: Exception) {
+ e.printStackTrace()
+ }
+ }
+
+ private fun deleteDir(dir: File?): Boolean {
+ return if (dir != null && dir.isDirectory()) {
+ val children = dir.list() ?: return false
+
+ for (child in children) {
+ val success = deleteDir(File(dir, child))
+
+ if (!success) {
+ return false
+ }
+ }
+
+ dir.delete()
+ } else if (dir != null && dir.isFile()) {
+ dir.delete()
+ } else {
+ false
+ }
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/FileUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/FileUtil.kt
deleted file mode 100644
index 14f602ecf..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/FileUtil.kt
+++ /dev/null
@@ -1,163 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.content.Intent
-import android.net.Uri
-import android.provider.OpenableColumns
-import androidx.activity.result.ActivityResultLauncher
-import com.drdisagree.iconify.Iconify
-import com.drdisagree.iconify.Iconify.Companion.appContext
-import com.drdisagree.iconify.common.Resources
-import com.topjohnwu.superuser.Shell
-import java.io.File
-import java.io.FileOutputStream
-import java.io.IOException
-import java.io.InputStream
-import java.io.OutputStream
-import java.nio.file.Files
-import java.nio.file.Paths
-import kotlin.math.min
-
-object FileUtil {
-
- val DATA_DIR = appContext.filesDir.toString()
-
- @JvmStatic
- @Throws(IOException::class)
- fun copyAssets(assetFolder: String) {
- cleanDir(assetFolder)
- createDir(assetFolder)
- copyFileOrDirectory(appContext, assetFolder, "$DATA_DIR/$assetFolder")
- }
-
- fun cleanDir(dirName: String) {
- Shell.cmd("rm -rf $DATA_DIR/$dirName").exec()
- }
-
- private fun createDir(dirName: String) {
- val newFolder = File("$DATA_DIR/$dirName/")
- newFolder.mkdirs()
- }
-
- @Throws(IOException::class)
- private fun copyFileOrDirectory(context: Context, dirName: String, outPath: String) {
- val srcFiles = context.assets.list(dirName) ?: return
-
- for (srcFileName in srcFiles) {
- val outFileName = outPath + File.separator + srcFileName
- var inFileName = dirName + File.separator + srcFileName
-
- if (dirName == "") {
- inFileName = srcFileName
- }
-
- try {
- val inputStream = context.assets.open(inFileName)
- copyAndClose(inputStream, Files.newOutputStream(Paths.get(outFileName)))
- } catch (e: IOException) {
- File(outFileName).mkdir()
- copyFileOrDirectory(context, inFileName, outFileName)
- }
- }
- }
-
- private fun closeQuietly(autoCloseable: AutoCloseable?) {
- try {
- autoCloseable?.close()
- } catch (ignored: Exception) {
- }
- }
-
- @Throws(IOException::class)
- fun copyAndClose(input: InputStream, output: OutputStream) {
- copy(input, output)
- closeQuietly(input)
- closeQuietly(output)
- }
-
- @Throws(IOException::class)
- fun copy(input: InputStream, output: OutputStream) {
- val buffer = ByteArray(1024)
- var n: Int
-
- while (-1 != input.read(buffer).also { n = it }) {
- output.write(buffer, 0, n)
- }
- }
-
- @JvmStatic
- fun getRealPath(obj: Any?): String? {
- return when (obj) {
- is Intent -> {
- getRealPathFromURI(obj.data)
- }
-
- is Uri -> {
- getRealPathFromURI(obj as Uri?)
- }
-
- else -> {
- throw IllegalArgumentException("Object must be an Intent or Uri")
- }
- }
- }
-
- @SuppressLint("Recycle")
- private fun getRealPathFromURI(uri: Uri?): String? {
- val file: File
- try {
- val returnCursor =
- appContext.contentResolver.query(
- uri!!, null, null, null, null
- ) ?: return null
- val nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
- returnCursor.moveToFirst()
-
- val name = returnCursor.getString(nameIndex)
- file = File(appContext.filesDir, name)
-
- val inputStream =
- appContext.contentResolver.openInputStream(
- uri
- )
- val outputStream = FileOutputStream(file)
- var read: Int
- val maxBufferSize = 1024 * 1024
-
- if (inputStream == null) return null
-
- val bytesAvailable = inputStream.available()
- val bufferSize = min(bytesAvailable.toDouble(), maxBufferSize.toDouble()).toInt()
- val buffers = ByteArray(bufferSize)
-
- while (inputStream.read(buffers).also { read = it } != -1) {
- outputStream.write(buffers, 0, read)
- }
-
- inputStream.close()
- outputStream.close()
- } catch (e: Exception) {
- e.printStackTrace()
- return null
- }
-
- return file.path
- }
-
- @JvmStatic
- fun moveToIconifyHiddenDir(source: String, destination: String): Boolean {
- return Shell.cmd(
- "mkdir -p " + Resources.XPOSED_RESOURCE_TEMP_DIR,
- "rm -f \"$destination\"",
- "mv -f \"$source\" \"$destination\""
- ).exec().isSuccess
- }
-
- fun launchFilePicker(launcher: ActivityResultLauncher, type: String?) {
- val chooseFile = Intent(Intent.ACTION_GET_CONTENT)
- chooseFile.addCategory(Intent.CATEGORY_OPENABLE)
- chooseFile.setType(type)
- launcher.launch(chooseFile)
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/FileUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/FileUtils.kt
new file mode 100644
index 000000000..c6e13fb42
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/FileUtils.kt
@@ -0,0 +1,195 @@
+package com.drdisagree.iconify.utils
+
+import android.annotation.SuppressLint
+import android.content.Context
+import android.content.Intent
+import android.net.Uri
+import android.provider.OpenableColumns
+import androidx.activity.result.ActivityResultLauncher
+import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.common.Resources
+import com.drdisagree.iconify.utils.SystemUtils.hasStoragePermission
+import com.drdisagree.iconify.utils.SystemUtils.requestStoragePermission
+import com.topjohnwu.superuser.Shell
+import java.io.File
+import java.io.FileOutputStream
+import java.io.IOException
+import java.io.InputStream
+import java.io.OutputStream
+import java.nio.file.Files
+import java.nio.file.Paths
+import kotlin.math.min
+
+object FileUtils {
+
+ val DATA_DIR = appContext.filesDir.toString()
+
+ @Throws(IOException::class)
+ fun copyAssets(assetFolder: String) {
+ cleanDir(assetFolder)
+ createDir(assetFolder)
+ copyFileOrDirectory(appContext, assetFolder, "$DATA_DIR/$assetFolder")
+ }
+
+ fun cleanDir(dirName: String) {
+ Shell.cmd("rm -rf $DATA_DIR/$dirName").exec()
+ }
+
+ private fun createDir(dirName: String) {
+ val newFolder = File("$DATA_DIR/$dirName/")
+ newFolder.mkdirs()
+ }
+
+ @Throws(IOException::class)
+ private fun copyFileOrDirectory(context: Context, dirName: String, outPath: String) {
+ val srcFiles = context.assets.list(dirName) ?: return
+
+ for (srcFileName in srcFiles) {
+ val outFileName = outPath + File.separator + srcFileName
+ var inFileName = dirName + File.separator + srcFileName
+
+ if (dirName == "") {
+ inFileName = srcFileName
+ }
+
+ try {
+ val inputStream = context.assets.open(inFileName)
+ copyAndClose(inputStream, Files.newOutputStream(Paths.get(outFileName)))
+ } catch (e: IOException) {
+ File(outFileName).mkdir()
+ copyFileOrDirectory(context, inFileName, outFileName)
+ }
+ }
+ }
+
+ private fun closeQuietly(autoCloseable: AutoCloseable?) {
+ try {
+ autoCloseable?.close()
+ } catch (ignored: Exception) {
+ }
+ }
+
+ @Throws(IOException::class)
+ fun copyAndClose(input: InputStream, output: OutputStream) {
+ copy(input, output)
+ closeQuietly(input)
+ closeQuietly(output)
+ }
+
+ @Throws(IOException::class)
+ fun copy(input: InputStream, output: OutputStream) {
+ val buffer = ByteArray(1024)
+ var n: Int
+
+ while (-1 != input.read(buffer).also { n = it }) {
+ output.write(buffer, 0, n)
+ }
+ }
+
+ fun getRealPath(obj: Any?): String? {
+ return when (obj) {
+ is Intent -> {
+ getRealPathFromURI(obj.data)
+ }
+
+ is Uri -> {
+ getRealPathFromURI(obj as Uri?)
+ }
+
+ else -> {
+ throw IllegalArgumentException("Object must be an Intent or Uri")
+ }
+ }
+ }
+
+ @SuppressLint("Recycle")
+ private fun getRealPathFromURI(uri: Uri?): String? {
+ val file: File
+ try {
+ val returnCursor =
+ appContext.contentResolver.query(
+ uri!!, null, null, null, null
+ ) ?: return null
+ val nameIndex = returnCursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
+ returnCursor.moveToFirst()
+
+ val name = returnCursor.getString(nameIndex)
+ file = File(appContext.filesDir, name)
+
+ val inputStream =
+ appContext.contentResolver.openInputStream(
+ uri
+ )
+ val outputStream = FileOutputStream(file)
+ var read: Int
+ val maxBufferSize = 1024 * 1024
+
+ if (inputStream == null) return null
+
+ val bytesAvailable = inputStream.available()
+ val bufferSize = min(bytesAvailable.toDouble(), maxBufferSize.toDouble()).toInt()
+ val buffers = ByteArray(bufferSize)
+
+ while (inputStream.read(buffers).also { read = it } != -1) {
+ outputStream.write(buffers, 0, read)
+ }
+
+ inputStream.close()
+ outputStream.close()
+ } catch (e: Exception) {
+ e.printStackTrace()
+ return null
+ }
+
+ return file.path
+ }
+
+ fun moveToIconifyHiddenDir(source: String, destination: String): Boolean {
+ return Shell.cmd(
+ "mkdir -p " + Resources.XPOSED_RESOURCE_TEMP_DIR,
+ "rm -f \"$destination\"",
+ "mv -f \"$source\" \"$destination\""
+ ).exec().isSuccess
+ }
+
+ fun launchFilePicker(
+ context: Context,
+ type: String?,
+ launcher: ActivityResultLauncher
+ ) {
+ if (!hasStoragePermission()) {
+ requestStoragePermission(context)
+ } else {
+ var fileType = "*/*"
+
+ if (type.isNullOrEmpty() || type == "all") {
+ fileType = "*/*"
+ } else if (type == "image") {
+ fileType = "image/*"
+ } else if (type == "font") {
+ fileType = "font/*"
+ } else if (type == "video") {
+ fileType = "video/*"
+ } else if (type == "audio") {
+ fileType = "audio/*"
+ } else if (type == "pdf") {
+ fileType = "application/pdf"
+ } else if (type == "text") {
+ fileType = "text/*"
+ } else if (type == "zip") {
+ fileType = "application/zip"
+ } else if (type == "apk") {
+ fileType = "application/vnd.android.package-archive"
+ }
+
+ launchFilePicker(launcher, fileType)
+ }
+ }
+
+ fun launchFilePicker(launcher: ActivityResultLauncher, type: String?) {
+ val chooseFile = Intent(Intent.ACTION_GET_CONTENT)
+ chooseFile.addCategory(Intent.CATEGORY_OPENABLE)
+ chooseFile.setType(type)
+ launcher.launch(chooseFile)
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/HapticUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/HapticUtils.kt
new file mode 100644
index 000000000..cee0c886d
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/HapticUtils.kt
@@ -0,0 +1,33 @@
+package com.drdisagree.iconify.utils
+
+import android.view.HapticFeedbackConstants
+import android.view.View
+import com.drdisagree.iconify.common.Preferences.VIBRATE_UI
+import com.drdisagree.iconify.config.RPrefs
+
+object HapticUtils {
+
+ enum class VibrationType {
+ Weak,
+ Strong
+ }
+
+ private fun View.vibrate(type: VibrationType) {
+ if (RPrefs.getBoolean(VIBRATE_UI, true)) {
+ when (type) {
+ VibrationType.Weak -> performHapticFeedback(HapticFeedbackConstants.CLOCK_TICK)
+ VibrationType.Strong -> performHapticFeedback(HapticFeedbackConstants.LONG_PRESS)
+ }
+ }
+ }
+
+ @JvmStatic
+ fun View.weakVibrate() {
+ vibrate(VibrationType.Weak)
+ }
+
+ @JvmStatic
+ fun View.strongVibrate() {
+ vibrate(VibrationType.Strong)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/MiscUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/MiscUtils.kt
new file mode 100644
index 000000000..03c23a61c
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/MiscUtils.kt
@@ -0,0 +1,41 @@
+package com.drdisagree.iconify.utils
+
+import android.content.Context
+import com.drdisagree.iconify.R
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
+
+object MiscUtils {
+
+ @JvmStatic
+ fun showAlertDialog(
+ context: Context,
+ restartSystemUI: Boolean = false,
+ restartDevice: Boolean = false,
+ switchTheme: Boolean = false,
+ rotateDevice: Boolean = false
+ ) {
+ val title = when {
+ restartSystemUI -> R.string.systemui_restart_required_title
+ restartDevice -> R.string.device_restart_required_title
+ switchTheme -> R.string.switch_theme_required_title
+ rotateDevice -> R.string.device_rotation_required_title
+ else -> R.string.systemui_restart_required_title
+ }
+ val message = when {
+ restartSystemUI -> R.string.systemui_restart_required_desc
+ restartDevice -> R.string.device_restart_required_desc
+ switchTheme -> R.string.switch_theme_required_desc
+ rotateDevice -> R.string.device_rotation_required_desc
+ else -> R.string.systemui_restart_required_desc
+ }
+
+ MaterialAlertDialogBuilder(context)
+ .setTitle(context.getString(title))
+ .setMessage(context.getString(message))
+ .setPositiveButton(android.R.string.ok) { dialog, _ ->
+ dialog.dismiss()
+ }
+ .setCancelable(true)
+ .show()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.kt
deleted file mode 100644
index 2fcede46a..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtil.kt
+++ /dev/null
@@ -1,236 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.content.Context
-import android.util.Log
-import com.drdisagree.iconify.BuildConfig
-import com.drdisagree.iconify.Iconify.Companion.appContext
-import com.drdisagree.iconify.R
-import com.drdisagree.iconify.common.Const
-import com.drdisagree.iconify.common.Const.SYSTEMUI_PACKAGE
-import com.drdisagree.iconify.common.Dynamic.skippedInstallation
-import com.drdisagree.iconify.common.Preferences.COLOR_ACCENT_PRIMARY
-import com.drdisagree.iconify.common.Preferences.COLOR_ACCENT_SECONDARY
-import com.drdisagree.iconify.common.Preferences.RESTART_SYSUI_AFTER_BOOT
-import com.drdisagree.iconify.common.References.ICONIFY_COLOR_ACCENT_PRIMARY
-import com.drdisagree.iconify.common.References.ICONIFY_COLOR_ACCENT_SECONDARY
-import com.drdisagree.iconify.common.Resources
-import com.drdisagree.iconify.config.Prefs
-import com.drdisagree.iconify.utils.helper.BackupRestore.backupFiles
-import com.drdisagree.iconify.utils.helper.BinaryInstaller.symLinkBinaries
-import com.drdisagree.iconify.utils.overlay.FabricatedUtil
-import com.drdisagree.iconify.utils.overlay.OverlayUtil
-import com.topjohnwu.superuser.Shell
-import net.lingala.zip4j.ZipFile
-import net.lingala.zip4j.model.ZipParameters
-import net.lingala.zip4j.model.enums.CompressionLevel
-import net.lingala.zip4j.model.enums.CompressionMethod
-import java.io.File
-
-object ModuleUtil {
-
- private val TAG = ModuleUtil::class.java.getSimpleName()
-
- @JvmStatic
- fun handleModule() {
- if (moduleExists()) {
- // Clean temporary directory
- Shell.cmd("rm -rf " + Resources.TEMP_DIR).exec()
-
- // Backup necessary files
- backupFiles()
- }
-
- installModule()
- }
-
- private fun installModule() {
- Log.d(TAG, "Magisk module does not exist, creating...")
-
- // Clean temporary directory
- Shell.cmd("mkdir -p " + Resources.TEMP_DIR).exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR).exec()
-
- Shell.cmd(
- "printf 'id=Iconify\n" +
- "name=Iconify\n" +
- "version=${BuildConfig.VERSION_NAME}\n" +
- "versionCode=${BuildConfig.VERSION_CODE}\n" +
- "author=@DrDisagree\n" +
- "description=Systemless module for Iconify. ${appContext.resources.getString(R.string.app_moto)}.\n" +
- "' > ${Resources.TEMP_MODULE_DIR}/module.prop\n".trimIndent()
- ).exec()
-
- Shell.cmd(
- "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
- "' > ${Resources.TEMP_MODULE_DIR}/post-fs-data.sh\n".trimIndent()
- ).exec()
-
- if (!skippedInstallation) {
- Shell.cmd(
- "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
- "while [ \"$(getprop sys.boot_completed | tr -d \"\\r\")\" != \"1\" ]\n" +
- "do\n" +
- " sleep 1\n" +
- "done\n" +
- "sleep 5\n\n" +
- "sh ${"$"}MODDIR/post-exec.sh\n\n" +
- "until [ -d /storage/emulated/0/Android ]; do\n" +
- " sleep 1\n" +
- "done\n" +
- "sleep 3\n\n" +
- "${
- if (Prefs.getBoolean(
- RESTART_SYSUI_AFTER_BOOT,
- false
- )
- ) "killall $SYSTEMUI_PACKAGE\n" else ""
- }sleep 6\n\n" +
- "handle_overlay() {\n" +
- " local overlay_name=\"\$1\"\n\n" +
- " local overlay=\$(cmd overlay list | grep -E \"^.x..${"$"}{overlay_name}.overlay\" | sed -E \"s/^.x..//\")\n" +
- " local disableMonet=\$(cmd overlay list | grep -E \"^.x..IconifyComponentDM.overlay\" | sed -E \"s/^.x..//\")\n\n" +
- " if ([ ! -z \"${"$"}{overlay}\" ] && [ -z \"${"$"}{disableMonet}\" ])\n" +
- " then\n" +
- " cmd overlay disable --user current \"${"$"}{overlay_name}.overlay\"\n" +
- " cmd overlay enable --user current \"${"$"}{overlay_name}.overlay\"\n" +
- " cmd overlay set-priority \"${"$"}{overlay_name}.overlay\" highest\n" +
- " fi\n" +
- "}\n\n" +
- "handle_overlay \"IconifyComponentQSPBD\"\n" +
- "handle_overlay \"IconifyComponentQSPBA\"\n\n" +
- "' > ${Resources.TEMP_MODULE_DIR}/service.sh".trimIndent()
- ).exec()
- } else {
- Shell.cmd(
- "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
- "while [ \"$(getprop sys.boot_completed | tr -d \"\\r\")\" != \"1\" ]\n" +
- "do\n" +
- " sleep 1\n" +
- "done\n" +
- "sleep 5\n\n" +
- "sh ${"$"}MODDIR/post-exec.sh\n" +
- "' > ${Resources.TEMP_MODULE_DIR}/service.sh".trimIndent()
- ).exec()
- }
-
- Shell.cmd("touch " + Resources.TEMP_MODULE_DIR + "/system.prop").exec()
- Shell.cmd("touch " + Resources.TEMP_MODULE_DIR + "/auto_mount").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system/product").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system/product/overlay").exec()
-
- createMETAINF()
- writePostExec()
- symLinkBinaries()
-
- Log.i(TAG, "Magisk module successfully created.")
- }
-
- private fun createMETAINF() {
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google").exec()
- Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android").exec()
- Shell.cmd(
- "printf '" + Const.MAGISK_UPDATE_BINARY + "' > " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android/update-binary"
- ).exec()
- Shell.cmd(
- "printf '#MAGISK' > " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android/updater-script"
- ).exec()
- }
-
- private fun writePostExec() {
- val postExec = StringBuilder()
- var primaryColorEnabled = false
- var secondaryColorEnabled = false
- val prefs = appContext.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
- val map = prefs.all
-
- for ((key, value) in map) {
- if (value is Boolean && value && key.startsWith("fabricated")) {
- val name = key.replace("fabricated", "")
- val commands = FabricatedUtil.buildCommands(
- Prefs.getString("FOCMDtarget$name")!!,
- Prefs.getString("FOCMDname$name")!!,
- Prefs.getString("FOCMDtype$name")!!,
- Prefs.getString("FOCMDresourceName$name")!!,
- Prefs.getString("FOCMDval$name")!!
- )
-
- postExec.append(commands[0]).append('\n').append(commands[1]).append('\n')
-
- if (name.contains(COLOR_ACCENT_PRIMARY)) {
- primaryColorEnabled = true
- } else if (name.contains(COLOR_ACCENT_SECONDARY)) {
- secondaryColorEnabled = true
- }
- }
- }
-
- if (!primaryColorEnabled && shouldUseDefaultColors() && !skippedInstallation) {
- postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentPrimary android:color/holo_blue_light 0x1c $ICONIFY_COLOR_ACCENT_PRIMARY\n")
- postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentPrimary\n")
- postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentPrimaryLight android:color/holo_green_light 0x1c $ICONIFY_COLOR_ACCENT_PRIMARY\n")
- postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentPrimaryLight\n")
- }
-
- if (!secondaryColorEnabled && shouldUseDefaultColors() && !skippedInstallation) {
- postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentSecondary android:color/holo_blue_dark 0x1c $ICONIFY_COLOR_ACCENT_SECONDARY\n")
- postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentSecondary\n")
- postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentSecondaryLight android:color/holo_green_dark 0x1c $ICONIFY_COLOR_ACCENT_SECONDARY\n")
- postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentSecondaryLight\n")
- }
-
- Shell.cmd("printf '" + postExec + "' > " + Resources.TEMP_MODULE_DIR + "/post-exec.sh")
- .exec()
- }
-
- private fun shouldUseDefaultColors(): Boolean {
- return OverlayUtil.isOverlayDisabled("IconifyComponentAMAC.overlay") && OverlayUtil.isOverlayDisabled(
- "IconifyComponentAMGC.overlay"
- ) && OverlayUtil.isOverlayDisabled("IconifyComponentME.overlay")
- }
-
- @JvmStatic
- fun moduleExists(): Boolean {
- return RootUtil.folderExists(Resources.OVERLAY_DIR)
- }
-
- @JvmStatic
- @Throws(Exception::class)
- fun createModule(sourceFolder: String, destinationFilePath: String): String {
- val input = File(sourceFolder)
- val output = File(destinationFilePath)
- val parameters = ZipParameters()
- parameters.isIncludeRootFolder = false
- parameters.isOverrideExistingFilesInZip = true
- parameters.compressionMethod = CompressionMethod.DEFLATE
- parameters.compressionLevel = CompressionLevel.NORMAL
- ZipFile(output).use { zipFile ->
- zipFile.addFolder(input, parameters)
- return zipFile.file.absolutePath
- }
- }
-
- @JvmStatic
- @Throws(Exception::class)
- fun flashModule(modulePath: String): Boolean {
- var result: Shell.Result? = null
- if (RootUtil.isMagiskInstalled) {
- result = Shell.cmd("magisk --install-module $modulePath").exec()
- } else if (RootUtil.isKSUInstalled) {
- result = Shell.cmd("/data/adb/ksud module install $modulePath").exec()
- } else if (RootUtil.isApatchInstalled) {
- result = Shell.cmd("apd module install $modulePath").exec()
- }
- if (result == null) {
- throw Exception("No supported root found")
- } else if (result.isSuccess) {
- Log.i(TAG, "Successfully flashed module")
- } else {
- Log.e(TAG, "Failed to flash module")
- throw Exception(java.lang.String.join("\n", result.out))
- }
- return !result.isSuccess
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtils.kt
new file mode 100644
index 000000000..0ce0cd49f
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/ModuleUtils.kt
@@ -0,0 +1,232 @@
+package com.drdisagree.iconify.utils
+
+import android.content.Context
+import android.util.Log
+import com.drdisagree.iconify.BuildConfig
+import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.R
+import com.drdisagree.iconify.common.Const
+import com.drdisagree.iconify.common.Const.SYSTEMUI_PACKAGE
+import com.drdisagree.iconify.common.Dynamic.skippedInstallation
+import com.drdisagree.iconify.common.Preferences.COLOR_ACCENT_PRIMARY
+import com.drdisagree.iconify.common.Preferences.COLOR_ACCENT_SECONDARY
+import com.drdisagree.iconify.common.Preferences.RESTART_SYSUI_AFTER_BOOT
+import com.drdisagree.iconify.common.References.ICONIFY_COLOR_ACCENT_PRIMARY
+import com.drdisagree.iconify.common.References.ICONIFY_COLOR_ACCENT_SECONDARY
+import com.drdisagree.iconify.common.Resources
+import com.drdisagree.iconify.config.RPrefs
+import com.drdisagree.iconify.utils.helper.BackupRestore.backupFiles
+import com.drdisagree.iconify.utils.helper.BinaryInstaller.symLinkBinaries
+import com.drdisagree.iconify.utils.overlay.FabricatedUtils
+import com.drdisagree.iconify.utils.overlay.OverlayUtils
+import com.topjohnwu.superuser.Shell
+import net.lingala.zip4j.ZipFile
+import net.lingala.zip4j.model.ZipParameters
+import net.lingala.zip4j.model.enums.CompressionLevel
+import net.lingala.zip4j.model.enums.CompressionMethod
+import java.io.File
+
+object ModuleUtils {
+
+ private val TAG = ModuleUtils::class.java.getSimpleName()
+
+ fun handleModule() {
+ if (moduleExists()) {
+ // Clean temporary directory
+ Shell.cmd("rm -rf " + Resources.TEMP_DIR).exec()
+
+ // Backup necessary files
+ backupFiles()
+ }
+
+ installModule()
+ }
+
+ private fun installModule() {
+ Log.d(TAG, "Magisk module does not exist, creating...")
+
+ // Clean temporary directory
+ Shell.cmd("mkdir -p " + Resources.TEMP_DIR).exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR).exec()
+
+ Shell.cmd(
+ "printf 'id=Iconify\n" +
+ "name=Iconify\n" +
+ "version=${BuildConfig.VERSION_NAME}\n" +
+ "versionCode=${BuildConfig.VERSION_CODE}\n" +
+ "author=@DrDisagree\n" +
+ "description=Systemless module for Iconify. ${appContext.resources.getString(R.string.app_moto)}.\n" +
+ "' > ${Resources.TEMP_MODULE_DIR}/module.prop\n".trimIndent()
+ ).exec()
+
+ Shell.cmd(
+ "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
+ "' > ${Resources.TEMP_MODULE_DIR}/post-fs-data.sh\n".trimIndent()
+ ).exec()
+
+ if (!skippedInstallation) {
+ Shell.cmd(
+ "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
+ "while [ \"$(getprop sys.boot_completed | tr -d \"\\r\")\" != \"1\" ]\n" +
+ "do\n" +
+ " sleep 1\n" +
+ "done\n" +
+ "sleep 5\n\n" +
+ "sh ${"$"}MODDIR/post-exec.sh\n\n" +
+ "until [ -d /storage/emulated/0/Android ]; do\n" +
+ " sleep 1\n" +
+ "done\n" +
+ "sleep 3\n\n" +
+ "${
+ if (RPrefs.getBoolean(
+ RESTART_SYSUI_AFTER_BOOT,
+ false
+ )
+ ) "killall $SYSTEMUI_PACKAGE\n" else ""
+ }sleep 6\n\n" +
+ "handle_overlay() {\n" +
+ " local overlay_name=\"\$1\"\n\n" +
+ " local overlay=\$(cmd overlay list | grep -E \"^.x..${"$"}{overlay_name}.overlay\" | sed -E \"s/^.x..//\")\n" +
+ " local disableMonet=\$(cmd overlay list | grep -E \"^.x..IconifyComponentDM.overlay\" | sed -E \"s/^.x..//\")\n\n" +
+ " if ([ ! -z \"${"$"}{overlay}\" ] && [ -z \"${"$"}{disableMonet}\" ])\n" +
+ " then\n" +
+ " cmd overlay disable --user current \"${"$"}{overlay_name}.overlay\"\n" +
+ " cmd overlay enable --user current \"${"$"}{overlay_name}.overlay\"\n" +
+ " cmd overlay set-priority \"${"$"}{overlay_name}.overlay\" highest\n" +
+ " fi\n" +
+ "}\n\n" +
+ "handle_overlay \"IconifyComponentQSPBD\"\n" +
+ "handle_overlay \"IconifyComponentQSPBA\"\n\n" +
+ "' > ${Resources.TEMP_MODULE_DIR}/service.sh".trimIndent()
+ ).exec()
+ } else {
+ Shell.cmd(
+ "printf 'MODDIR=${"$"}{0%%/*}\n\n" +
+ "while [ \"$(getprop sys.boot_completed | tr -d \"\\r\")\" != \"1\" ]\n" +
+ "do\n" +
+ " sleep 1\n" +
+ "done\n" +
+ "sleep 5\n\n" +
+ "sh ${"$"}MODDIR/post-exec.sh\n" +
+ "' > ${Resources.TEMP_MODULE_DIR}/service.sh".trimIndent()
+ ).exec()
+ }
+
+ Shell.cmd("touch " + Resources.TEMP_MODULE_DIR + "/system.prop").exec()
+ Shell.cmd("touch " + Resources.TEMP_MODULE_DIR + "/auto_mount").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system/product").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/system/product/overlay").exec()
+
+ createMETAINF()
+ writePostExec()
+ symLinkBinaries()
+
+ Log.i(TAG, "Magisk module successfully created.")
+ }
+
+ private fun createMETAINF() {
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google").exec()
+ Shell.cmd("mkdir -p " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android").exec()
+ Shell.cmd(
+ "printf '" + Const.MAGISK_UPDATE_BINARY + "' > " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android/update-binary"
+ ).exec()
+ Shell.cmd(
+ "printf '#MAGISK' > " + Resources.TEMP_MODULE_DIR + "/META-INF/com/google/android/updater-script"
+ ).exec()
+ }
+
+ private fun writePostExec() {
+ val postExec = StringBuilder()
+ var primaryColorEnabled = false
+ var secondaryColorEnabled = false
+ val prefs = appContext.getSharedPreferences(BuildConfig.APPLICATION_ID, Context.MODE_PRIVATE)
+ val map = prefs.all
+
+ for ((key, value) in map) {
+ if (value is Boolean && value && key.startsWith("fabricated")) {
+ val name = key.replace("fabricated", "")
+ val commands = FabricatedUtils.buildCommands(
+ RPrefs.getString("FOCMDtarget$name")!!,
+ RPrefs.getString("FOCMDname$name")!!,
+ RPrefs.getString("FOCMDtype$name")!!,
+ RPrefs.getString("FOCMDresourceName$name")!!,
+ RPrefs.getString("FOCMDval$name")!!
+ )
+
+ postExec.append(commands[0]).append('\n').append(commands[1]).append('\n')
+
+ if (name.contains(COLOR_ACCENT_PRIMARY)) {
+ primaryColorEnabled = true
+ } else if (name.contains(COLOR_ACCENT_SECONDARY)) {
+ secondaryColorEnabled = true
+ }
+ }
+ }
+
+ if (!primaryColorEnabled && shouldUseDefaultColors() && !skippedInstallation) {
+ postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentPrimary android:color/holo_blue_light 0x1c $ICONIFY_COLOR_ACCENT_PRIMARY\n")
+ postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentPrimary\n")
+ postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentPrimaryLight android:color/holo_green_light 0x1c $ICONIFY_COLOR_ACCENT_PRIMARY\n")
+ postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentPrimaryLight\n")
+ }
+
+ if (!secondaryColorEnabled && shouldUseDefaultColors() && !skippedInstallation) {
+ postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentSecondary android:color/holo_blue_dark 0x1c $ICONIFY_COLOR_ACCENT_SECONDARY\n")
+ postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentSecondary\n")
+ postExec.append("cmd overlay fabricate --target android --name IconifyComponentcolorAccentSecondaryLight android:color/holo_green_dark 0x1c $ICONIFY_COLOR_ACCENT_SECONDARY\n")
+ postExec.append("cmd overlay enable --user current com.android.shell:IconifyComponentcolorAccentSecondaryLight\n")
+ }
+
+ Shell.cmd("printf '" + postExec + "' > " + Resources.TEMP_MODULE_DIR + "/post-exec.sh")
+ .exec()
+ }
+
+ private fun shouldUseDefaultColors(): Boolean {
+ return OverlayUtils.isOverlayDisabled("IconifyComponentAMAC.overlay") && OverlayUtils.isOverlayDisabled(
+ "IconifyComponentAMGC.overlay"
+ ) && OverlayUtils.isOverlayDisabled("IconifyComponentME.overlay")
+ }
+
+ fun moduleExists(): Boolean {
+ return RootUtils.folderExists(Resources.OVERLAY_DIR)
+ }
+
+ @Throws(Exception::class)
+ fun createModule(sourceFolder: String, destinationFilePath: String): String {
+ val input = File(sourceFolder)
+ val output = File(destinationFilePath)
+ val parameters = ZipParameters()
+ parameters.isIncludeRootFolder = false
+ parameters.isOverrideExistingFilesInZip = true
+ parameters.compressionMethod = CompressionMethod.DEFLATE
+ parameters.compressionLevel = CompressionLevel.NORMAL
+ ZipFile(output).use { zipFile ->
+ zipFile.addFolder(input, parameters)
+ return zipFile.file.absolutePath
+ }
+ }
+
+ @Throws(Exception::class)
+ fun flashModule(modulePath: String): Boolean {
+ var result: Shell.Result? = null
+ if (RootUtils.isMagiskInstalled) {
+ result = Shell.cmd("magisk --install-module $modulePath").exec()
+ } else if (RootUtils.isKSUInstalled) {
+ result = Shell.cmd("/data/adb/ksud module install $modulePath").exec()
+ } else if (RootUtils.isApatchInstalled) {
+ result = Shell.cmd("apd module install $modulePath").exec()
+ }
+ if (result == null) {
+ throw Exception("No supported root found")
+ } else if (result.isSuccess) {
+ Log.i(TAG, "Successfully flashed module")
+ } else {
+ Log.e(TAG, "Failed to flash module")
+ throw Exception(java.lang.String.join("\n", result.out))
+ }
+ return !result.isSuccess
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/NetworkUtils.java b/app/src/main/java/com/drdisagree/iconify/utils/NetworkUtils.java
new file mode 100644
index 000000000..680e0db11
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/NetworkUtils.java
@@ -0,0 +1,159 @@
+package com.drdisagree.iconify.utils;
+
+/*
+ * Copyright (C) 2018 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+import android.util.Log;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+import javax.net.ssl.HttpsURLConnection;
+
+public class NetworkUtils {
+ private static final boolean DEBUG = false;
+ private static final String TAG = "NetworkUtils";
+
+ private static final int HTTP_READ_TIMEOUT = 60000;
+ private static final int HTTP_CONNECTION_TIMEOUT = 60000;
+
+ private static final ExecutorService executor = Executors.newSingleThreadExecutor();
+
+ public static void downloadUrlMemoryAsString(String url, DownloadCallback callback) {
+ executor.submit(() -> {
+ String result = downloadUrlMemoryAsString(url);
+ if (callback != null) {
+ callback.onDownloadComplete(result);
+ }
+ });
+ }
+
+ public static HttpsURLConnection setupHttpsRequest(String urlStr) {
+ URL url;
+ HttpsURLConnection urlConnection = null;
+ try {
+ url = new URL(urlStr);
+ urlConnection = (HttpsURLConnection) url.openConnection();
+ urlConnection.setConnectTimeout(HTTP_CONNECTION_TIMEOUT);
+ urlConnection.setReadTimeout(HTTP_READ_TIMEOUT);
+ urlConnection.setRequestMethod("GET");
+ urlConnection.setDoInput(true);
+ urlConnection.connect();
+ int code = urlConnection.getResponseCode();
+ if (code != HttpsURLConnection.HTTP_OK) {
+ Log.d(TAG, "response:" + code);
+ return null;
+ }
+ return urlConnection;
+ } catch (Exception e) {
+ Log.e(TAG, "Failed to connect to server", e);
+ return null;
+ }
+ }
+
+ public static boolean downloadUrlFile(String url, File f) {
+ if (DEBUG) Log.d(TAG, "download:" + url);
+
+ HttpsURLConnection urlConnection = null;
+
+ if (f.exists())
+ f.delete();
+
+ try {
+ urlConnection = setupHttpsRequest(url);
+ if (urlConnection == null) {
+ return false;
+ }
+ long len = urlConnection.getContentLength();
+ if ((len > 0) && (len < 4L * 1024L * 1024L * 1024L)) {
+ byte[] buffer = new byte[262144];
+
+ InputStream is = urlConnection.getInputStream();
+ FileOutputStream os = new FileOutputStream(f, false);
+ try {
+ int r;
+ while ((r = is.read(buffer)) > 0) {
+ os.write(buffer, 0, r);
+ }
+ } finally {
+ os.close();
+ }
+
+ return true;
+ }
+ return false;
+ } catch (Exception e) {
+ // Download failed for any number of reasons, timeouts, connection
+ // drops, etc. Just log it in debugging mode.
+ Log.e(TAG, "", e);
+ return false;
+ } finally {
+ if (urlConnection != null) {
+ urlConnection.disconnect();
+ }
+ }
+ }
+
+
+ public static String downloadUrlMemoryAsString(String url) {
+ if (DEBUG) Log.d(TAG, "download: " + url);
+
+ HttpsURLConnection urlConnection = null;
+ try {
+ urlConnection = setupHttpsRequest(url);
+ if (urlConnection == null) {
+ return null;
+ }
+
+ InputStream is = urlConnection.getInputStream();
+ ByteArrayOutputStream byteArray = new ByteArrayOutputStream();
+ int byteInt;
+
+ while ((byteInt = is.read()) >= 0) {
+ byteArray.write(byteInt);
+ }
+
+ byte[] bytes = byteArray.toByteArray();
+ if (bytes == null) {
+ return null;
+ }
+
+ return new String(bytes, StandardCharsets.UTF_8);
+ } catch (Exception e) {
+ // Download failed for any number of reasons, timeouts, connection
+ // drops, etc. Just log it in debugging mode.
+ Log.e(TAG, "", e);
+ return null;
+ } finally {
+ if (urlConnection != null) {
+ urlConnection.disconnect();
+ }
+ }
+ }
+
+ public interface DownloadCallback {
+ void onDownloadComplete(String result);
+ }
+
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/OmniJawsClient.kt b/app/src/main/java/com/drdisagree/iconify/utils/OmniJawsClient.kt
new file mode 100644
index 000000000..b4a013802
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/OmniJawsClient.kt
@@ -0,0 +1,416 @@
+package com.drdisagree.iconify.utils
+
+import android.annotation.SuppressLint
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.res.Resources
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.graphics.drawable.Drawable
+import android.net.Uri
+import android.os.Build
+import android.text.TextUtils
+import android.text.format.DateFormat
+import android.util.Log
+import com.drdisagree.iconify.BuildConfig
+import com.drdisagree.iconify.utils.weather.WeatherConfig
+import java.text.DecimalFormat
+import java.text.SimpleDateFormat
+import java.util.Date
+import java.util.Locale
+
+/*
+ * Copyright (C) 2021 The OmniROM Project
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ *
+ */
+
+class OmniJawsClient(private val mContext: Context) {
+
+ class WeatherInfo(private val mContext: Context) {
+ var city: String? = null
+ var windSpeed: String? = null
+ var windDirection: String? = null
+ var conditionCode: Int = 0
+ var temp: String? = null
+ var humidity: String? = null
+ var condition: String? = null
+ var timeStamp: Long = 0
+ var forecasts: List? = null
+ var tempUnits: String? = null
+ var windUnits: String? = null
+ var provider: String? = null
+ var pinWheel: String? = null
+ var iconPack: String? = null
+
+ override fun toString(): String {
+ return city + ":" + Date(timeStamp) + ": " + windSpeed + ":" + windDirection + ":" + conditionCode + ":" + temp + ":" + humidity + ":" + condition + ":" + tempUnits + ":" + windUnits + ": " + forecasts + ": " + iconPack
+ }
+
+ val lastUpdateTime: String
+ get() {
+ val hourFormat = if (DateFormat.is24HourFormat(mContext)) "HH" else "hh"
+ val sdf = SimpleDateFormat("$hourFormat:mm:ss", Locale.getDefault())
+ return sdf.format(Date(timeStamp))
+ }
+ }
+
+ class DayForecast {
+ var low: String? = null
+ var high: String? = null
+ var conditionCode: Int = 0
+ var condition: String? = null
+ var date: String? = null
+
+ override fun toString(): String {
+ return "[$low:$high:$conditionCode:$condition:$date]"
+ }
+ }
+
+ interface OmniJawsObserver {
+ fun weatherUpdated()
+ fun weatherError(errorReason: Int)
+ fun updateSettings() {}
+ }
+
+ private inner class WeatherUpdateReceiver : BroadcastReceiver() {
+ override fun onReceive(context: Context, intent: Intent) {
+ val action = intent.action
+ for (observer in mObserver) {
+ if (action == WEATHER_UPDATE) {
+ observer.weatherUpdated()
+ }
+ if (action == WEATHER_ERROR) {
+ val errorReason = intent.getIntExtra(EXTRA_ERROR, 0)
+ observer.weatherError(errorReason)
+ }
+ }
+ }
+ }
+
+ var weatherInfo: WeatherInfo? = null
+ private var mRes: Resources? = null
+ private var mPackageName: String? = null
+ private var mIconPrefix: String? = null
+ private var mSettingIconPackage: String? = null
+ private var mMetric = false
+ private val mObserver: MutableList = ArrayList()
+ private var mReceiver: WeatherUpdateReceiver? = null
+
+ fun queryWeather() {
+ try {
+ weatherInfo = null
+
+ var cursor = mContext.contentResolver.query(
+ WEATHER_URI, WEATHER_PROJECTION,
+ null, null, null
+ )
+
+ cursor?.use {
+ val count = it.count
+
+ if (count > 0) {
+ weatherInfo = WeatherInfo(mContext)
+ val forecastList: MutableList = ArrayList()
+ var i = 0
+
+ while (i < count) {
+ it.moveToPosition(i)
+
+ if (i == 0) {
+ weatherInfo?.apply {
+ city = it.getString(0)
+ windSpeed = getFormattedValue(it.getFloat(1))
+ weatherInfo!!.windDirection = it.getInt(2).toString() + "\u00b0"
+ weatherInfo!!.conditionCode = it.getInt(3)
+ weatherInfo!!.temp = getFormattedValue(it.getFloat(4))
+ weatherInfo!!.humidity = it.getString(5)
+ weatherInfo!!.condition = it.getString(6)
+ weatherInfo!!.timeStamp = it.getString(11).toLong()
+ weatherInfo!!.pinWheel = it.getString(13)
+ }
+ } else {
+ val day = DayForecast()
+ day.low = getFormattedValue(it.getFloat(7))
+ day.high = getFormattedValue(it.getFloat(8))
+ day.condition = it.getString(9)
+ day.conditionCode = it.getInt(10)
+ day.date = it.getString(12)
+ forecastList.add(day)
+ }
+ i++
+ }
+ weatherInfo!!.forecasts = forecastList
+ }
+ }
+
+ cursor = mContext.contentResolver.query(
+ SETTINGS_URI, SETTINGS_PROJECTION,
+ null, null, null
+ )
+
+ cursor?.use {
+ val count = it.count
+
+ if (count == 1) {
+ it.moveToPosition(0)
+ mMetric = it.getInt(1) == 0
+
+ weatherInfo?.apply {
+ tempUnits = temperatureUnit
+ windUnits = windUnit
+ provider = it.getString(2)
+ iconPack = it.getString(4)
+ }
+ }
+ }
+
+ updateSettings()
+ } catch (e: Exception) {
+ Log.e(TAG, "queryWeather", e)
+ }
+ }
+
+ private fun loadDefaultIconsPackage() {
+ mPackageName = ICON_PACKAGE_DEFAULT
+ mIconPrefix = ICON_PREFIX_DEFAULT
+ mSettingIconPackage = "$mPackageName.$mIconPrefix"
+
+ if (DEBUG) Log.d(
+ TAG,
+ "Load default icon pack $mSettingIconPackage $mPackageName $mIconPrefix"
+ )
+
+ try {
+ val packageManager = mContext.packageManager
+ mRes = packageManager.getResourcesForApplication(mPackageName!!)
+ } catch (e: Exception) {
+ Log.d(TAG, "loadDefaultIconsPackage", e)
+ mRes = null
+ }
+
+ if (mRes == null) {
+ Log.w(TAG, "No default package found")
+ }
+ }
+
+ @Suppress("deprecation")
+ private val defaultConditionImage: Drawable
+ @SuppressLint("DiscouragedApi", "UseCompatLoadingForDrawables")
+ get() {
+ val packageName = ICON_PACKAGE_DEFAULT
+ val iconPrefix = ICON_PREFIX_DEFAULT
+
+ try {
+ val packageManager = mContext.packageManager
+ val res = packageManager.getResourcesForApplication(packageName)
+ val resId = res.getIdentifier(iconPrefix + "_na", "drawable", packageName)
+ val d = mRes!!.getDrawable(resId)
+
+ if (d != null) {
+ return d
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "defaultConditionImage", e)
+ }
+
+ // absolute absolute fallback
+ Log.w(TAG, "No default package found")
+
+ return ColorDrawable(Color.RED)
+ }
+
+ private fun loadCustomIconPackage() {
+ if (DEBUG) Log.d(
+ TAG,
+ "Load custom icon pack $mSettingIconPackage"
+ )
+
+ val idx = mSettingIconPackage!!.lastIndexOf(".")
+ mPackageName = mSettingIconPackage!!.substring(0, idx)
+ mIconPrefix = mSettingIconPackage!!.substring(idx + 1)
+
+ if (DEBUG) Log.d(
+ TAG,
+ "Load custom icon pack $mPackageName $mIconPrefix"
+ )
+
+ try {
+ val packageManager = mContext.packageManager
+ mRes = packageManager.getResourcesForApplication(mPackageName!!)
+ } catch (e: Exception) {
+ Log.w(TAG, "Icon pack loading failed - loading default")
+ loadDefaultIconsPackage()
+ }
+ }
+
+ @Suppress("deprecation")
+ @SuppressLint("DiscouragedApi", "UseCompatLoadingForDrawables")
+ fun getWeatherConditionImage(conditionCode: Int): Drawable {
+ try {
+ var resId = mRes!!.getIdentifier(
+ mIconPrefix + "_" + conditionCode,
+ "drawable",
+ mPackageName
+ )
+ var d = mRes!!.getDrawable(resId)
+ if (d != null) {
+ return d
+ }
+
+ Log.w(
+ TAG,
+ "Failed to get condition image for $conditionCode use default"
+ )
+
+ resId = mRes!!.getIdentifier(mIconPrefix + "_na", "drawable", mPackageName)
+ d = mRes!!.getDrawable(resId)
+
+ if (d != null) {
+ return d
+ }
+ } catch (e: Exception) {
+ Log.e(TAG, "getWeatherConditionImage", e)
+ }
+ Log.w(
+ TAG,
+ "Failed to get condition image for $conditionCode"
+ )
+ return defaultConditionImage
+ }
+
+ val isOmniJawsEnabled: Boolean
+ get() = WeatherConfig.isEnabled(mContext)
+
+ private val temperatureUnit: String
+ get() = "\u00b0" + (if (mMetric) "C" else "F")
+
+ private val windUnit: String
+ get() = if (mMetric) "km/h" else "mph"
+
+ private fun updateSettings() {
+ val iconPack = if (weatherInfo != null) weatherInfo!!.iconPack else null
+ if (TextUtils.isEmpty(iconPack)) {
+ Log.d(TAG, "updateSettings No icon pack set, using default")
+ loadDefaultIconsPackage()
+ } else if (iconPack != mSettingIconPackage) {
+ Log.d(
+ TAG,
+ "updateSettings New icon pack set, loading $iconPack"
+ )
+ mSettingIconPackage = iconPack
+ loadCustomIconPackage()
+ }
+ }
+
+ @SuppressLint("UnspecifiedRegisterReceiverFlag")
+ fun addObserver(observer: OmniJawsObserver) {
+ if (mObserver.isEmpty()) {
+ if (mReceiver != null) {
+ try {
+ mContext.unregisterReceiver(mReceiver)
+ } catch (ignored: Exception) {
+ }
+ }
+ mReceiver = WeatherUpdateReceiver()
+ val filter = IntentFilter()
+ filter.addAction(WEATHER_UPDATE)
+ filter.addAction(WEATHER_ERROR)
+ if (DEBUG) Log.d(TAG, "registerReceiver")
+ if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+ mContext.registerReceiver(mReceiver, filter, Context.RECEIVER_EXPORTED)
+ } else {
+ mContext.registerReceiver(mReceiver, filter)
+ }
+ }
+ mObserver.add(observer)
+ }
+
+ fun removeObserver(observer: OmniJawsObserver) {
+ mObserver.remove(observer)
+ if (mObserver.isEmpty() && mReceiver != null) {
+ try {
+ if (DEBUG) Log.d(TAG, "unregisterReceiver")
+ mContext.unregisterReceiver(mReceiver)
+ } catch (ignored: Exception) {
+ }
+ mReceiver = null
+ }
+ }
+
+ companion object {
+ private const val TAG = "OmniJawsClient"
+ private val DEBUG = BuildConfig.DEBUG
+ private const val SERVICE_PACKAGE: String = BuildConfig.APPLICATION_ID
+ val WEATHER_URI
+ : Uri = Uri.parse("content://com.drdisagree.iconify.weatherprovider/weather")
+ val SETTINGS_URI
+ : Uri = Uri.parse("content://com.drdisagree.iconify.weatherprovider/settings")
+ val CONTROL_URI
+ : Uri = Uri.parse("content://com.drdisagree.iconify.weatherprovider/control")
+
+ private const val ICON_PACKAGE_DEFAULT = BuildConfig.APPLICATION_ID
+ private const val ICON_PREFIX_DEFAULT = "google"
+ private const val ICON_PREFIX_OUTLINE = "outline"
+ private const val EXTRA_ERROR = "error"
+ const val EXTRA_ERROR_NETWORK: Int = 0 // No Network
+ const val EXTRA_ERROR_LOCATION: Int = 1 // No Location Found
+ const val EXTRA_ERROR_DISABLED: Int = 2 // Disabled
+ const val EXTRA_ERROR_NO_PERMISSIONS: Int = 3 // No Permissions
+
+ val WEATHER_PROJECTION: Array = arrayOf(
+ "city",
+ "wind_speed",
+ "wind_direction",
+ "condition_code",
+ "temperature",
+ "humidity",
+ "condition",
+ "forecast_low",
+ "forecast_high",
+ "forecast_condition",
+ "forecast_condition_code",
+ "time_stamp",
+ "forecast_date",
+ "pin_wheel"
+ )
+
+ val SETTINGS_PROJECTION: Array = arrayOf(
+ "enabled",
+ "units",
+ "provider",
+ "setup",
+ "icon_pack"
+ )
+
+ private const val WEATHER_UPDATE = "$SERVICE_PACKAGE.WEATHER_UPDATE"
+ private const val WEATHER_ERROR = "$SERVICE_PACKAGE.WEATHER_ERROR"
+
+ private val sNoDigitsFormat = DecimalFormat("0")
+
+ private fun getFormattedValue(value: Float): String {
+ if (java.lang.Float.isNaN(value)) {
+ return "-"
+ }
+ var formatted = sNoDigitsFormat.format(value.toDouble())
+ if (formatted == "-0") {
+ formatted = "0"
+ }
+ return formatted
+ }
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/RootUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/RootUtil.kt
deleted file mode 100644
index 3cd197ea5..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/RootUtil.kt
+++ /dev/null
@@ -1,67 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import com.topjohnwu.superuser.Shell
-
-object RootUtil {
-
- @JvmStatic
- val isDeviceRooted: Boolean
- get() = java.lang.Boolean.TRUE == Shell.isAppGrantedRoot()
-
- @JvmStatic
- val isMagiskInstalled: Boolean
- get() = Shell.cmd("magisk -v").exec().isSuccess
-
- @JvmStatic
- val isKSUInstalled: Boolean
- get() = Shell.cmd("/data/adb/ksud -h").exec().isSuccess
-
- @JvmStatic
- val isApatchInstalled: Boolean
- get() = Shell.cmd("apd --help").exec().isSuccess
-
- fun moduleExists(moduleId: String): Boolean {
- return folderExists("/data/adb/modules/$moduleId")
- }
-
- @JvmStatic
- fun setPermissions(permission: Int, filename: String) {
- Shell.cmd("chmod $permission $filename").exec()
- }
-
- fun setPermissionsRecursively(permission: Int, folderName: String) {
- Shell.cmd("chmod -R $permission $folderName").exec()
- val perm = permission.toString()
-
- if (!Shell.cmd("stat -c '%a' $folderName").exec().out.contains(perm) || !Shell.cmd(
- "fl=$(find '$folderName' -type f -mindepth 1 -print -quit); stat -c '%a' \$fl"
- ).exec().out.contains(perm)
- ) Shell.cmd("for file in $folderName*; do chmod $permission \"\$file\"; done").exec()
- }
-
- fun fileExists(dir: String): Boolean {
- val lines = Shell.cmd("test -f $dir && echo '1'").exec().out
-
- for (line in lines) {
- if (line.contains("1")) return true
- }
-
- return false
- }
-
- @JvmStatic
- fun folderExists(dir: String): Boolean {
- val lines = Shell.cmd("test -d $dir && echo '1'").exec().out
-
- for (line in lines) {
- if (line.contains("1")) return true
- }
-
- return false
- }
-
- @JvmStatic
- fun deviceProperlyRooted(): Boolean {
- return isDeviceRooted && (isMagiskInstalled || isKSUInstalled || isApatchInstalled)
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/RootUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/RootUtils.kt
new file mode 100644
index 000000000..1f21c20d1
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/RootUtils.kt
@@ -0,0 +1,60 @@
+package com.drdisagree.iconify.utils
+
+import com.topjohnwu.superuser.Shell
+
+object RootUtils {
+
+ val isDeviceRooted: Boolean
+ get() = java.lang.Boolean.TRUE == Shell.isAppGrantedRoot()
+
+ val isMagiskInstalled: Boolean
+ get() = Shell.cmd("magisk -v").exec().isSuccess
+
+ val isKSUInstalled: Boolean
+ get() = Shell.cmd("/data/adb/ksud -h").exec().isSuccess
+
+ val isApatchInstalled: Boolean
+ get() = Shell.cmd("apd --help").exec().isSuccess
+
+ fun moduleExists(moduleId: String): Boolean {
+ return folderExists("/data/adb/modules/$moduleId")
+ }
+
+ fun setPermissions(permission: Int, filename: String) {
+ Shell.cmd("chmod $permission $filename").exec()
+ }
+
+ fun setPermissionsRecursively(permission: Int, folderName: String) {
+ Shell.cmd("chmod -R $permission $folderName").exec()
+ val perm = permission.toString()
+
+ if (!Shell.cmd("stat -c '%a' $folderName").exec().out.contains(perm) || !Shell.cmd(
+ "fl=$(find '$folderName' -type f -mindepth 1 -print -quit); stat -c '%a' \$fl"
+ ).exec().out.contains(perm)
+ ) Shell.cmd("for file in $folderName*; do chmod $permission \"\$file\"; done").exec()
+ }
+
+ fun fileExists(dir: String): Boolean {
+ val lines = Shell.cmd("test -f $dir && echo '1'").exec().out
+
+ for (line in lines) {
+ if (line.contains("1")) return true
+ }
+
+ return false
+ }
+
+ fun folderExists(dir: String): Boolean {
+ val lines = Shell.cmd("test -d $dir && echo '1'").exec().out
+
+ for (line in lines) {
+ if (line.contains("1")) return true
+ }
+
+ return false
+ }
+
+ fun deviceProperlyRooted(): Boolean {
+ return isDeviceRooted && (isMagiskInstalled || isKSUInstalled || isApatchInstalled)
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.kt
deleted file mode 100644
index d52d0268e..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/SystemUtil.kt
+++ /dev/null
@@ -1,279 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.Manifest
-import android.app.Activity
-import android.content.Context
-import android.content.Intent
-import android.content.res.Configuration
-import android.net.Uri
-import android.os.Environment
-import android.provider.Settings
-import android.view.WindowInsets
-import android.widget.Toast
-import androidx.core.app.ActivityCompat
-import com.drdisagree.iconify.BuildConfig
-import com.drdisagree.iconify.Iconify.Companion.appContext
-import com.drdisagree.iconify.R
-import com.drdisagree.iconify.common.Const.SYSTEMUI_PACKAGE
-import com.drdisagree.iconify.common.Preferences.BOOT_ID
-import com.drdisagree.iconify.common.Preferences.FORCE_RELOAD_OVERLAY_STATE
-import com.drdisagree.iconify.common.Preferences.FORCE_RELOAD_PACKAGE_NAME
-import com.drdisagree.iconify.common.Preferences.RESTART_SYSUI_BEHAVIOR_EXT
-import com.drdisagree.iconify.common.Preferences.VER_CODE
-import com.drdisagree.iconify.common.References.DEVICE_BOOT_ID_CMD
-import com.drdisagree.iconify.common.Resources
-import com.drdisagree.iconify.config.Prefs
-import com.drdisagree.iconify.config.Prefs.putString
-import com.drdisagree.iconify.config.RPrefs
-import com.drdisagree.iconify.xposed.utils.BootLoopProtector.LOAD_TIME_KEY_KEY
-import com.drdisagree.iconify.xposed.utils.BootLoopProtector.PACKAGE_STRIKE_KEY_KEY
-import com.topjohnwu.superuser.Shell
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.delay
-import kotlinx.coroutines.launch
-import java.util.Calendar
-
-object SystemUtil {
-
- private var darkSwitching = false
- private const val BLUR_CMD_0 =
- "resetprop ro.surface_flinger.supports_background_blur 1 && killall surfaceflinger"
- private const val BLUR_CMD_1 = "ro.sf.blurs_are_expensive=1"
- private const val BLUR_CMD_2 = "ro.surface_flinger.supports_background_blur=1"
- private const val BLUR_CMD_3 = "persist.sys.sf.disable_blurs=0"
- private const val BLUR_CMD_4 = "persist.sysui.disableBlur=false"
- private const val BLUR_CMD_5 = "ro.config.avoid_gfx_accel=false"
-
- @JvmStatic
- val isDarkMode: Boolean
- get() = appContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES == Configuration.UI_MODE_NIGHT_YES
-
- @JvmStatic
- fun restartSystemUI() {
- val loadTimeKey = String.format("%s%s", LOAD_TIME_KEY_KEY, SYSTEMUI_PACKAGE)
- val strikeKey = String.format("%s%s", PACKAGE_STRIKE_KEY_KEY, SYSTEMUI_PACKAGE)
- val currentTime = Calendar.getInstance().time.time
-
- RPrefs.putLong(loadTimeKey, currentTime)
- RPrefs.putInt(strikeKey, 0)
- Shell.cmd("killall $SYSTEMUI_PACKAGE").submit()
- }
-
- private fun forceReloadUI() {
- val state = RPrefs.getBoolean(FORCE_RELOAD_OVERLAY_STATE, false)
- val pkgName: String = FORCE_RELOAD_PACKAGE_NAME
-
- Shell.cmd(
- "cmd overlay " + (if (state) "disable" else "enable") + " --user current " + pkgName + "; cmd overlay " + (if (state) "enable" else "disable") + " --user current " + pkgName
- ).submit()
- }
-
- @JvmStatic
- fun handleSystemUIRestart() {
- val selectedBehavior = RPrefs.getInt(RESTART_SYSUI_BEHAVIOR_EXT, 0)
-
- when (selectedBehavior) {
- 0 -> {
- restartSystemUI()
- }
-
- 1 -> {
- forceReloadUI()
- }
-
- else -> {
- Toast.makeText(
- appContext,
- appContext.resources.getString(R.string.settings_systemui_restart_required),
- Toast.LENGTH_SHORT
- ).show()
- }
- }
- }
-
- @JvmStatic
- fun restartDevice() {
- Shell.cmd("am start -a android.intent.action.REBOOT").exec()
- }
-
- @JvmStatic
- fun disableBlur(force: Boolean) {
- Shell.cmd(
- if (!force) "mv " + Resources.MODULE_DIR +
- "/system.prop " +
- Resources.MODULE_DIR +
- "/system.txt; " +
- "grep -vE \"" +
- BLUR_CMD_1 + "|" +
- BLUR_CMD_2 + "|" +
- BLUR_CMD_3 + "|" +
- BLUR_CMD_4 + "|" +
- BLUR_CMD_5 + "\" " +
- Resources.MODULE_DIR +
- "/system.txt > " +
- Resources.MODULE_DIR +
- "/system.txt.tmp; " +
- "rm -rf " +
- Resources.MODULE_DIR +
- "/system.prop; " +
- "mv " + Resources.MODULE_DIR +
- "/system.txt.tmp " +
- Resources.MODULE_DIR +
- "/system.prop; " +
- "rm -rf " + Resources.MODULE_DIR +
- "/system.txt; " +
- "rm -rf " + Resources.MODULE_DIR +
- "/system.txt.tmp" else ":", // do nothing
- "grep -v \"ro.surface_flinger.supports_background_blur\" " +
- Resources.MODULE_DIR + "/service.sh > " +
- Resources.MODULE_DIR + "/service.sh.tmp && mv " +
- Resources.MODULE_DIR + "/service.sh.tmp " +
- Resources.MODULE_DIR + "/service.sh"
- ).submit()
- }
-
- @JvmStatic
- fun enableBlur(force: Boolean) {
- disableBlur(false)
- Shell.cmd(
- "echo \"$BLUR_CMD_1\n$BLUR_CMD_2\n$BLUR_CMD_3\n$BLUR_CMD_4\n$BLUR_CMD_5\"" +
- " >> ${Resources.MODULE_DIR}/system.prop",
- if (force) "sed '/*}/a " +
- BLUR_CMD_0 + "' " +
- Resources.MODULE_DIR +
- "/service.sh > " +
- Resources.MODULE_DIR +
- "/service.sh.tmp && mv " +
- Resources.MODULE_DIR +
- "/service.sh.tmp " +
- Resources.MODULE_DIR +
- "/service.sh" else ":" // do nothing
- ).submit()
- }
-
- @JvmStatic
- fun mountRW() {
- Shell.cmd("mount -o remount,rw /").exec()
-
- if (RootUtil.moduleExists("magisk_overlayfs")) {
- Shell.cmd("-mm -c magic_remount_rw").exec()
- } else if (RootUtil.moduleExists("overlayfs")) {
- Shell.cmd("/data/overlayfs/tmp/overlayrw -rw /system/product/overlay").exec()
- }
- }
-
- @JvmStatic
- fun mountRO() {
- Shell.cmd("mount -o remount,ro /").exec()
-
- if (RootUtil.moduleExists("magisk_overlayfs")) {
- Shell.cmd("-mm -c magic_remount_ro").exec()
- } else if (RootUtil.moduleExists("overlayfs")) {
- Shell.cmd("/data/overlayfs/tmp/overlayrw -ro /system/product/overlay").exec()
- }
- }
-
- /*
- * From AOSPMods
- * https://github.com/siavash79/AOSPMods/blob/canary/app/src/main/java/sh/siava/AOSPMods/utils/SystemUtils.java
- */
- @JvmStatic
- fun doubleToggleDarkMode() {
- val isDark = isDarkMode
-
- CoroutineScope(Dispatchers.Default).launch {
- try {
- while (darkSwitching) {
- delay(100)
- }
-
- darkSwitching = true
-
- Shell.cmd("cmd uimode night ${if (isDark) "no" else "yes"}").exec()
- delay(1000)
- Shell.cmd("cmd uimode night ${if (isDark) "yes" else "no"}").exec()
- delay(500)
-
- darkSwitching = false
- } catch (ignored: Exception) {
- }
- }
- }
-
- @JvmStatic
- fun isBlurEnabled(force: Boolean): Boolean {
- return Shell.cmd(
- "if grep -q \"ro.surface_flinger.supports_background_blur\" " +
- Resources.MODULE_DIR +
- (if (force) "/service.sh;" else "/system.prop;") +
- " then echo yes; else echo no; fi"
- ).exec().out[0] == "yes"
- }
-
- @JvmStatic
- val saveBootId: Unit // Save unique id of each boot
- get() {
- putString(BOOT_ID, Shell.cmd(DEVICE_BOOT_ID_CMD).exec().out.toString())
- }
-
- @JvmStatic
- fun saveVersionCode() {
- Prefs.putInt(VER_CODE, BuildConfig.VERSION_CODE)
- }
-
- @JvmStatic
- val savedVersionCode: Int
- get() = Prefs.getInt(VER_CODE, -1)
-
- @JvmStatic
- fun hasStoragePermission(): Boolean {
- return Environment.isExternalStorageManager() || Environment.isExternalStorageLegacy()
- }
-
- @JvmStatic
- fun requestStoragePermission(context: Context) {
- val intent = Intent()
- intent.setAction(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
- intent.setData(Uri.fromParts("package", BuildConfig.APPLICATION_ID, null))
-
- (context as Activity).startActivityForResult(intent, 0)
- ActivityCompat.requestPermissions(
- context, arrayOf(
- Manifest.permission.READ_EXTERNAL_STORAGE,
- Manifest.permission.WRITE_EXTERNAL_STORAGE,
- Manifest.permission.MANAGE_EXTERNAL_STORAGE
- ), 0
- )
- }
-
- @JvmStatic
- fun enableRestartSystemuiAfterBoot() {
- disableRestartSystemuiAfterBoot()
-
- Shell.cmd(
- "sed '/^sleep.6/i killall " + SYSTEMUI_PACKAGE + "' " + Resources.MODULE_DIR + "/service.sh > " + Resources.MODULE_DIR + "/service.sh.tmp && mv " + Resources.MODULE_DIR + "/service.sh.tmp " + Resources.MODULE_DIR + "/service.sh"
- ).submit()
- }
-
- @JvmStatic
- fun disableRestartSystemuiAfterBoot() {
- Shell.cmd(
- "grep -v \"killall " + SYSTEMUI_PACKAGE + "\" " + Resources.MODULE_DIR + "/service.sh > " + Resources.MODULE_DIR + "/service.sh.tmp && mv " + Resources.MODULE_DIR + "/service.sh.tmp " + Resources.MODULE_DIR + "/service.sh"
- ).submit()
- }
-
- fun getScreenWidth(activity: Activity): Int {
- val windowMetrics = activity.windowManager.currentWindowMetrics
- val insets = windowMetrics.getWindowInsets()
- .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
- return windowMetrics.bounds.width() - (insets.left + insets.right)
- }
-
- fun getScreenHeight(activity: Activity): Int {
- val windowMetrics = activity.windowManager.currentWindowMetrics
- val insets = windowMetrics.getWindowInsets()
- .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
- return windowMetrics.bounds.height() - (insets.top + insets.bottom)
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/SystemUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/SystemUtils.kt
new file mode 100644
index 000000000..b76c99b91
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/SystemUtils.kt
@@ -0,0 +1,286 @@
+package com.drdisagree.iconify.utils
+
+import android.Manifest
+import android.app.Activity
+import android.content.Context
+import android.content.Intent
+import android.content.res.Configuration
+import android.net.Uri
+import android.os.Build
+import android.os.Environment
+import android.provider.Settings
+import android.util.Log
+import android.view.WindowInsets
+import android.widget.Toast
+import androidx.core.app.ActivityCompat
+import com.drdisagree.iconify.BuildConfig
+import com.drdisagree.iconify.Iconify.Companion.appContext
+import com.drdisagree.iconify.R
+import com.drdisagree.iconify.common.Const.SYSTEMUI_PACKAGE
+import com.drdisagree.iconify.common.Preferences.BOOT_ID
+import com.drdisagree.iconify.common.Preferences.FORCE_RELOAD_OVERLAY_STATE
+import com.drdisagree.iconify.common.Preferences.FORCE_RELOAD_PACKAGE_NAME
+import com.drdisagree.iconify.common.Preferences.RESTART_SYSUI_BEHAVIOR_EXT
+import com.drdisagree.iconify.common.Preferences.VER_CODE
+import com.drdisagree.iconify.common.References.DEVICE_BOOT_ID_CMD
+import com.drdisagree.iconify.common.Resources
+import com.drdisagree.iconify.config.RPrefs
+import com.drdisagree.iconify.config.RPrefs.getString
+import com.drdisagree.iconify.config.RPrefs.putString
+import com.drdisagree.iconify.xposed.utils.BootLoopProtector.LOAD_TIME_KEY_KEY
+import com.drdisagree.iconify.xposed.utils.BootLoopProtector.PACKAGE_STRIKE_KEY_KEY
+import com.topjohnwu.superuser.Shell
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
+import java.text.SimpleDateFormat
+import java.util.Calendar
+import java.util.Locale
+
+object SystemUtils {
+
+ private var darkSwitching = false
+ private const val BLUR_CMD_0 =
+ "resetprop ro.surface_flinger.supports_background_blur 1 && killall surfaceflinger"
+ private const val BLUR_CMD_1 = "ro.sf.blurs_are_expensive=1"
+ private const val BLUR_CMD_2 = "ro.surface_flinger.supports_background_blur=1"
+ private const val BLUR_CMD_3 = "persist.sys.sf.disable_blurs=0"
+ private const val BLUR_CMD_4 = "persist.sysui.disableBlur=false"
+ private const val BLUR_CMD_5 = "ro.config.avoid_gfx_accel=false"
+
+ val isDarkMode: Boolean
+ get() = appContext.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_YES == Configuration.UI_MODE_NIGHT_YES
+
+ fun restartSystemUI() {
+ val loadTimeKey = String.format("%s%s", LOAD_TIME_KEY_KEY, SYSTEMUI_PACKAGE)
+ val strikeKey = String.format("%s%s", PACKAGE_STRIKE_KEY_KEY, SYSTEMUI_PACKAGE)
+ val currentTime = Calendar.getInstance().time.time
+
+ RPrefs.putLong(loadTimeKey, currentTime)
+ RPrefs.putInt(strikeKey, 0)
+ Shell.cmd("killall $SYSTEMUI_PACKAGE").submit()
+ }
+
+ private fun forceReloadUI() {
+ val state = RPrefs.getBoolean(FORCE_RELOAD_OVERLAY_STATE, false)
+ val pkgName: String = FORCE_RELOAD_PACKAGE_NAME
+
+ Shell.cmd(
+ "cmd overlay " + (if (state) "disable" else "enable") + " --user current " + pkgName + "; cmd overlay " + (if (state) "enable" else "disable") + " --user current " + pkgName
+ ).submit()
+ }
+
+ fun handleSystemUIRestart() {
+ val selectedBehavior = getString(RESTART_SYSUI_BEHAVIOR_EXT, "0")!!.toInt()
+
+ when (selectedBehavior) {
+ 0 -> {
+ restartSystemUI()
+ }
+
+ 1 -> {
+ forceReloadUI()
+ }
+
+ else -> {
+ Toast.makeText(
+ appContext,
+ appContext.resources.getString(R.string.settings_systemui_restart_required),
+ Toast.LENGTH_SHORT
+ ).show()
+ }
+ }
+ }
+
+ fun restartDevice() {
+ Shell.cmd("am start -a android.intent.action.REBOOT").exec()
+ }
+
+ fun disableBlur(force: Boolean) {
+ Shell.cmd(
+ if (!force) "mv " + Resources.MODULE_DIR +
+ "/system.prop " +
+ Resources.MODULE_DIR +
+ "/system.txt; " +
+ "grep -vE \"" +
+ BLUR_CMD_1 + "|" +
+ BLUR_CMD_2 + "|" +
+ BLUR_CMD_3 + "|" +
+ BLUR_CMD_4 + "|" +
+ BLUR_CMD_5 + "\" " +
+ Resources.MODULE_DIR +
+ "/system.txt > " +
+ Resources.MODULE_DIR +
+ "/system.txt.tmp; " +
+ "rm -rf " +
+ Resources.MODULE_DIR +
+ "/system.prop; " +
+ "mv " + Resources.MODULE_DIR +
+ "/system.txt.tmp " +
+ Resources.MODULE_DIR +
+ "/system.prop; " +
+ "rm -rf " + Resources.MODULE_DIR +
+ "/system.txt; " +
+ "rm -rf " + Resources.MODULE_DIR +
+ "/system.txt.tmp" else ":", // do nothing
+ "grep -v \"ro.surface_flinger.supports_background_blur\" " +
+ Resources.MODULE_DIR + "/service.sh > " +
+ Resources.MODULE_DIR + "/service.sh.tmp && mv " +
+ Resources.MODULE_DIR + "/service.sh.tmp " +
+ Resources.MODULE_DIR + "/service.sh"
+ ).submit()
+ }
+
+ fun enableBlur(force: Boolean) {
+ disableBlur(false)
+ Shell.cmd(
+ "echo \"$BLUR_CMD_1\n$BLUR_CMD_2\n$BLUR_CMD_3\n$BLUR_CMD_4\n$BLUR_CMD_5\"" +
+ " >> ${Resources.MODULE_DIR}/system.prop",
+ if (force) "sed '/*}/a " +
+ BLUR_CMD_0 + "' " +
+ Resources.MODULE_DIR +
+ "/service.sh > " +
+ Resources.MODULE_DIR +
+ "/service.sh.tmp && mv " +
+ Resources.MODULE_DIR +
+ "/service.sh.tmp " +
+ Resources.MODULE_DIR +
+ "/service.sh" else ":" // do nothing
+ ).submit()
+ }
+
+ fun mountRW() {
+ Shell.cmd("mount -o remount,rw /").exec()
+
+ if (RootUtils.moduleExists("magisk_overlayfs")) {
+ Shell.cmd("-mm -c magic_remount_rw").exec()
+ } else if (RootUtils.moduleExists("overlayfs")) {
+ Shell.cmd("/data/overlayfs/tmp/overlayrw -rw /system/product/overlay").exec()
+ }
+ }
+
+ fun mountRO() {
+ Shell.cmd("mount -o remount,ro /").exec()
+
+ if (RootUtils.moduleExists("magisk_overlayfs")) {
+ Shell.cmd("-mm -c magic_remount_ro").exec()
+ } else if (RootUtils.moduleExists("overlayfs")) {
+ Shell.cmd("/data/overlayfs/tmp/overlayrw -ro /system/product/overlay").exec()
+ }
+ }
+
+ /*
+ * From AOSPMods
+ * https://github.com/siavash79/AOSPMods/blob/canary/app/src/main/java/sh/siava/AOSPMods/utils/SystemUtils.java
+ */
+ fun doubleToggleDarkMode() {
+ val isDark = isDarkMode
+
+ CoroutineScope(Dispatchers.Default).launch {
+ try {
+ while (darkSwitching) {
+ delay(100)
+ }
+
+ darkSwitching = true
+
+ Shell.cmd("cmd uimode night ${if (isDark) "no" else "yes"}").exec()
+ delay(1000)
+ Shell.cmd("cmd uimode night ${if (isDark) "yes" else "no"}").exec()
+ delay(500)
+
+ darkSwitching = false
+ } catch (ignored: Exception) {
+ }
+ }
+ }
+
+ fun isBlurEnabled(force: Boolean): Boolean {
+ return Shell.cmd(
+ "if grep -q \"ro.surface_flinger.supports_background_blur\" " +
+ Resources.MODULE_DIR +
+ (if (force) "/service.sh;" else "/system.prop;") +
+ " then echo yes; else echo no; fi"
+ ).exec().out[0] == "yes"
+ }
+
+ val saveBootId: Unit // Save unique id of each boot
+ get() {
+ val bootId = Shell.cmd(DEVICE_BOOT_ID_CMD).exec().out.toString()
+ if (getString(BOOT_ID) != bootId) {
+ putString(BOOT_ID, bootId)
+ }
+ }
+
+ fun saveVersionCode() {
+ RPrefs.putInt(VER_CODE, BuildConfig.VERSION_CODE)
+ }
+
+ val savedVersionCode: Int
+ get() = RPrefs.getInt(VER_CODE, -1)
+
+ fun hasStoragePermission(): Boolean {
+ return Environment.isExternalStorageManager() || Environment.isExternalStorageLegacy()
+ }
+
+ fun requestStoragePermission(context: Context) {
+ val intent = Intent()
+ intent.setAction(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
+ intent.setData(Uri.fromParts("package", BuildConfig.APPLICATION_ID, null))
+
+ (context as Activity).startActivityForResult(intent, 0)
+ ActivityCompat.requestPermissions(
+ context, arrayOf(
+ Manifest.permission.READ_EXTERNAL_STORAGE,
+ Manifest.permission.WRITE_EXTERNAL_STORAGE,
+ Manifest.permission.MANAGE_EXTERNAL_STORAGE
+ ), 0
+ )
+ }
+
+ fun enableRestartSystemuiAfterBoot() {
+ disableRestartSystemuiAfterBoot()
+
+ Shell.cmd(
+ "sed '/^sleep.6/i killall " + SYSTEMUI_PACKAGE + "' " + Resources.MODULE_DIR + "/service.sh > " + Resources.MODULE_DIR + "/service.sh.tmp && mv " + Resources.MODULE_DIR + "/service.sh.tmp " + Resources.MODULE_DIR + "/service.sh"
+ ).submit()
+ }
+
+ fun disableRestartSystemuiAfterBoot() {
+ Shell.cmd(
+ "grep -v \"killall " + SYSTEMUI_PACKAGE + "\" " + Resources.MODULE_DIR + "/service.sh > " + Resources.MODULE_DIR + "/service.sh.tmp && mv " + Resources.MODULE_DIR + "/service.sh.tmp " + Resources.MODULE_DIR + "/service.sh"
+ ).submit()
+ }
+
+ fun isSecurityPatchBeforeJune2024(): Boolean {
+ val securityPatch = Build.VERSION.SECURITY_PATCH
+ val dateFormat = SimpleDateFormat("yyyy-MM-dd", Locale.US)
+
+ return try {
+ val securityPatchDate = dateFormat.parse(securityPatch)
+
+ val june2024 = Calendar.getInstance()
+ june2024.set(2024, Calendar.JUNE, 1)
+
+ (securityPatchDate != null && (securityPatchDate < june2024.time))
+ } catch (e: Exception) {
+ Log.e("SECURITY_PATCH_CHECK", "Error parsing security patch date", e)
+ false
+ }
+ }
+
+ fun getScreenWidth(activity: Activity): Int {
+ val windowMetrics = activity.windowManager.currentWindowMetrics
+ val insets = windowMetrics.windowInsets
+ .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+ return windowMetrics.bounds.width() - (insets.left + insets.right)
+ }
+
+ fun getScreenHeight(activity: Activity): Int {
+ val windowMetrics = activity.windowManager.currentWindowMetrics
+ val insets = windowMetrics.windowInsets
+ .getInsetsIgnoringVisibility(WindowInsets.Type.systemBars())
+ return windowMetrics.bounds.height() - (insets.top + insets.bottom)
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/TextUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/TextUtil.kt
deleted file mode 100644
index a5ca7aeaf..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/TextUtil.kt
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.view.View
-import android.view.ViewGroup
-import android.widget.TextView
-
-object TextUtil {
- fun convertTextViewsToTitleCase(view: View?) {
- if (view == null) return
-
- if (view is ViewGroup) {
- val childCount: Int = view.childCount
-
- for (i in 0 until childCount) {
- val child: View = view.getChildAt(i)
-
- if (child is ViewGroup) {
- convertTextViewsToTitleCase(child)
- } else if (child is TextView) {
- val originalText: String = child.getText().toString()
- val convertedText = convertToTitleCase(originalText)
- child.text = convertedText
- }
- }
- } else if (view is TextView) {
- val originalText: String = view.getText().toString()
- val convertedText = convertToTitleCase(originalText)
- view.text = convertedText
- }
- }
-
- private fun convertToTitleCase(input: String?): String? {
- if (input.isNullOrEmpty()) return input
-
- val result = StringBuilder()
- var capitalizeNext = true
-
- for (c in input.toCharArray()) {
- var char = c
-
- if (Character.isWhitespace(char)) {
- capitalizeNext = true
- } else if (Character.isLetter(char)) {
- if (capitalizeNext) {
- char = char.uppercaseChar()
- capitalizeNext = false
- }
- }
-
- result.append(char)
- }
- return result.toString()
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/TextUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/TextUtils.kt
new file mode 100644
index 000000000..a2c7ba78e
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/TextUtils.kt
@@ -0,0 +1,54 @@
+package com.drdisagree.iconify.utils
+
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+
+object TextUtils {
+ fun convertTextViewsToTitleCase(view: View?) {
+ if (view == null) return
+
+ if (view is ViewGroup) {
+ val childCount: Int = view.childCount
+
+ for (i in 0 until childCount) {
+ val child: View = view.getChildAt(i)
+
+ if (child is ViewGroup) {
+ convertTextViewsToTitleCase(child)
+ } else if (child is TextView) {
+ val originalText: String = child.getText().toString()
+ val convertedText = convertToTitleCase(originalText)
+ child.text = convertedText
+ }
+ }
+ } else if (view is TextView) {
+ val originalText: String = view.getText().toString()
+ val convertedText = convertToTitleCase(originalText)
+ view.text = convertedText
+ }
+ }
+
+ private fun convertToTitleCase(input: String?): String? {
+ if (input.isNullOrEmpty()) return input
+
+ val result = StringBuilder()
+ var capitalizeNext = true
+
+ for (c in input.toCharArray()) {
+ var char = c
+
+ if (Character.isWhitespace(char)) {
+ capitalizeNext = true
+ } else if (Character.isLetter(char)) {
+ if (capitalizeNext) {
+ char = char.uppercaseChar()
+ capitalizeNext = false
+ }
+ }
+
+ result.append(char)
+ }
+ return result.toString()
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtil.kt
deleted file mode 100644
index 339eca311..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtil.kt
+++ /dev/null
@@ -1,44 +0,0 @@
-package com.drdisagree.iconify.utils
-
-import android.app.WallpaperManager
-import android.content.Context
-import android.graphics.Bitmap
-import android.graphics.BitmapFactory
-import android.graphics.drawable.BitmapDrawable
-import java.io.ByteArrayOutputStream
-
-object WallpaperUtil {
-
- fun getCompressedWallpaper(context: Context?, quality: Int, which: Int): Bitmap? {
- return try {
- val wallpaperManager = WallpaperManager.getInstance(context)
- val wallpaperFile = wallpaperManager.getWallpaperFile(which)
-
- if (wallpaperFile == null) {
- val wallpaperDrawable = wallpaperManager.drawable
-
- if (wallpaperDrawable is BitmapDrawable) {
- val bitmap = wallpaperDrawable.bitmap
- compressBitmap(bitmap, quality)
- } else {
- Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
- }
- } else {
- val bitmap = BitmapFactory.decodeFileDescriptor(wallpaperFile.fileDescriptor)
- wallpaperFile.close()
- compressBitmap(bitmap, quality)
- }
- } catch (e: Exception) {
-// return Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
- null
- }
- }
-
- private fun compressBitmap(bitmap: Bitmap, quality: Int): Bitmap {
- val stream = ByteArrayOutputStream()
- bitmap.compress(Bitmap.CompressFormat.JPEG, quality, stream)
- val byteArray = stream.toByteArray()
-
- return BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtils.kt
new file mode 100644
index 000000000..c035df888
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/WallpaperUtils.kt
@@ -0,0 +1,44 @@
+package com.drdisagree.iconify.utils
+
+import android.app.WallpaperManager
+import android.content.Context
+import android.graphics.Bitmap
+import android.graphics.BitmapFactory
+import android.graphics.drawable.BitmapDrawable
+import java.io.ByteArrayOutputStream
+
+object WallpaperUtils {
+
+ fun getCompressedWallpaper(context: Context?, quality: Int, which: Int): Bitmap? {
+ return try {
+ val wallpaperManager = WallpaperManager.getInstance(context)
+ val wallpaperFile = wallpaperManager.getWallpaperFile(which)
+
+ if (wallpaperFile == null) {
+ val wallpaperDrawable = wallpaperManager.drawable
+
+ if (wallpaperDrawable is BitmapDrawable) {
+ val bitmap = wallpaperDrawable.bitmap
+ compressBitmap(bitmap, quality)
+ } else {
+ Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888)
+ }
+ } else {
+ val bitmap = BitmapFactory.decodeFileDescriptor(wallpaperFile.fileDescriptor)
+ wallpaperFile.close()
+ compressBitmap(bitmap, quality)
+ }
+ } catch (e: Exception) {
+// return Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888);
+ null
+ }
+ }
+
+ private fun compressBitmap(bitmap: Bitmap, quality: Int): Bitmap {
+ val stream = ByteArrayOutputStream()
+ bitmap.compress(Bitmap.CompressFormat.JPEG, quality, stream)
+ val byteArray = stream.toByteArray()
+
+ return BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtil.kt
deleted file mode 100644
index 776799202..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtil.kt
+++ /dev/null
@@ -1,201 +0,0 @@
-package com.drdisagree.iconify.utils.color
-
-import android.content.Context
-import com.drdisagree.iconify.R
-import com.drdisagree.iconify.utils.SystemUtil
-import com.drdisagree.iconify.utils.color.monet.hct.Hct
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeContent
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeExpressive
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeFidelity
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeFruitSalad
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeMonochrome
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeNeutral
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeRainbow
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeTonalSpot
-import com.drdisagree.iconify.utils.color.monet.scheme.SchemeVibrant
-
-object ColorSchemeUtil {
-
- private val tones = intArrayOf(100, 99, 95, 90, 80, 70, 60, 50, 40, 30, 20, 10, 0)
-
- @JvmStatic
- fun generateColorPalette(context: Context, style: String?, color: Int): List> {
- val palette: MutableList> = ArrayList()
- val systemAccent1: MutableList = ArrayList()
- val systemAccent2: MutableList = ArrayList()
- val systemAccent3: MutableList = ArrayList()
- val systemNeutral1: MutableList = ArrayList()
- val systemNeutral2: MutableList = ArrayList()
-
- when (style) {
- context.resources.getString(R.string.monet_neutral) -> {
- val schemeNeutral = SchemeNeutral(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeNeutral.primaryPalette.tone(tone))
- systemAccent2.add(schemeNeutral.secondaryPalette.tone(tone))
- systemAccent3.add(schemeNeutral.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeNeutral.neutralPalette.tone(tone))
- systemNeutral2.add(schemeNeutral.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_monochrome) -> {
- val schemeMonochrome =
- SchemeMonochrome(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeMonochrome.primaryPalette.tone(tone))
- systemAccent2.add(schemeMonochrome.secondaryPalette.tone(tone))
- systemAccent3.add(schemeMonochrome.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeMonochrome.neutralPalette.tone(tone))
- systemNeutral2.add(schemeMonochrome.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_tonalspot) -> {
- val schemeTonalSpot =
- SchemeTonalSpot(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeTonalSpot.primaryPalette.tone(tone))
- systemAccent2.add(schemeTonalSpot.secondaryPalette.tone(tone))
- systemAccent3.add(schemeTonalSpot.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeTonalSpot.neutralPalette.tone(tone))
- systemNeutral2.add(schemeTonalSpot.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_vibrant) -> {
- val schemeVibrant = SchemeVibrant(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeVibrant.primaryPalette.tone(tone))
- systemAccent2.add(schemeVibrant.secondaryPalette.tone(tone))
- systemAccent3.add(schemeVibrant.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeVibrant.neutralPalette.tone(tone))
- systemNeutral2.add(schemeVibrant.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_rainbow) -> {
- val schemeRainbow = SchemeRainbow(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeRainbow.primaryPalette.tone(tone))
- systemAccent2.add(schemeRainbow.secondaryPalette.tone(tone))
- systemAccent3.add(schemeRainbow.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeRainbow.neutralPalette.tone(tone))
- systemNeutral2.add(schemeRainbow.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_expressive) -> {
- val schemeExpressive =
- SchemeExpressive(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeExpressive.primaryPalette.tone(tone))
- systemAccent2.add(schemeExpressive.secondaryPalette.tone(tone))
- systemAccent3.add(schemeExpressive.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeExpressive.neutralPalette.tone(tone))
- systemNeutral2.add(schemeExpressive.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_fidelity) -> {
- val schemeFidelity =
- SchemeFidelity(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeFidelity.primaryPalette.tone(tone))
- systemAccent2.add(schemeFidelity.secondaryPalette.tone(tone))
- systemAccent3.add(schemeFidelity.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeFidelity.neutralPalette.tone(tone))
- systemNeutral2.add(schemeFidelity.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_content) -> {
- val schemeContent = SchemeContent(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeContent.primaryPalette.tone(tone))
- systemAccent2.add(schemeContent.secondaryPalette.tone(tone))
- systemAccent3.add(schemeContent.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeContent.neutralPalette.tone(tone))
- systemNeutral2.add(schemeContent.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
-
- context.resources.getString(R.string.monet_fruitsalad) -> {
- val schemeFruitSalad =
- SchemeFruitSalad(Hct.fromInt(color), SystemUtil.isDarkMode, 5.0)
-
- for (tone in tones) {
- systemAccent1.add(schemeFruitSalad.primaryPalette.tone(tone))
- systemAccent2.add(schemeFruitSalad.secondaryPalette.tone(tone))
- systemAccent3.add(schemeFruitSalad.tertiaryPalette.tone(tone))
- systemNeutral1.add(schemeFruitSalad.neutralPalette.tone(tone))
- systemNeutral2.add(schemeFruitSalad.neutralVariantPalette.tone(tone))
- }
-
- palette.add(systemAccent1)
- palette.add(systemAccent2)
- palette.add(systemAccent3)
- palette.add(systemNeutral1)
- palette.add(systemNeutral2)
- }
- }
-
- return palette
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtils.kt
new file mode 100644
index 000000000..c156d716e
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorSchemeUtils.kt
@@ -0,0 +1,200 @@
+package com.drdisagree.iconify.utils.color
+
+import android.content.Context
+import com.drdisagree.iconify.R
+import com.drdisagree.iconify.utils.SystemUtils
+import com.drdisagree.iconify.utils.color.monet.hct.Hct
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeContent
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeExpressive
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeFidelity
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeFruitSalad
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeMonochrome
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeNeutral
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeRainbow
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeTonalSpot
+import com.drdisagree.iconify.utils.color.monet.scheme.SchemeVibrant
+
+object ColorSchemeUtils {
+
+ private val tones = intArrayOf(100, 99, 95, 90, 80, 70, 60, 50, 40, 30, 20, 10, 0)
+
+ fun generateColorPalette(context: Context, style: String?, color: Int): List> {
+ val palette: MutableList> = ArrayList()
+ val systemAccent1: MutableList = ArrayList()
+ val systemAccent2: MutableList = ArrayList()
+ val systemAccent3: MutableList = ArrayList()
+ val systemNeutral1: MutableList = ArrayList()
+ val systemNeutral2: MutableList = ArrayList()
+
+ when (style) {
+ context.resources.getString(R.string.monet_neutral) -> {
+ val schemeNeutral = SchemeNeutral(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeNeutral.primaryPalette.tone(tone))
+ systemAccent2.add(schemeNeutral.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeNeutral.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeNeutral.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeNeutral.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_monochrome) -> {
+ val schemeMonochrome =
+ SchemeMonochrome(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeMonochrome.primaryPalette.tone(tone))
+ systemAccent2.add(schemeMonochrome.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeMonochrome.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeMonochrome.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeMonochrome.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_tonalspot) -> {
+ val schemeTonalSpot =
+ SchemeTonalSpot(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeTonalSpot.primaryPalette.tone(tone))
+ systemAccent2.add(schemeTonalSpot.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeTonalSpot.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeTonalSpot.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeTonalSpot.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_vibrant) -> {
+ val schemeVibrant = SchemeVibrant(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeVibrant.primaryPalette.tone(tone))
+ systemAccent2.add(schemeVibrant.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeVibrant.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeVibrant.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeVibrant.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_rainbow) -> {
+ val schemeRainbow = SchemeRainbow(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeRainbow.primaryPalette.tone(tone))
+ systemAccent2.add(schemeRainbow.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeRainbow.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeRainbow.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeRainbow.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_expressive) -> {
+ val schemeExpressive =
+ SchemeExpressive(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeExpressive.primaryPalette.tone(tone))
+ systemAccent2.add(schemeExpressive.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeExpressive.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeExpressive.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeExpressive.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_fidelity) -> {
+ val schemeFidelity =
+ SchemeFidelity(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeFidelity.primaryPalette.tone(tone))
+ systemAccent2.add(schemeFidelity.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeFidelity.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeFidelity.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeFidelity.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_content) -> {
+ val schemeContent = SchemeContent(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeContent.primaryPalette.tone(tone))
+ systemAccent2.add(schemeContent.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeContent.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeContent.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeContent.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+
+ context.resources.getString(R.string.monet_fruitsalad) -> {
+ val schemeFruitSalad =
+ SchemeFruitSalad(Hct.fromInt(color), SystemUtils.isDarkMode, 5.0)
+
+ for (tone in tones) {
+ systemAccent1.add(schemeFruitSalad.primaryPalette.tone(tone))
+ systemAccent2.add(schemeFruitSalad.secondaryPalette.tone(tone))
+ systemAccent3.add(schemeFruitSalad.tertiaryPalette.tone(tone))
+ systemNeutral1.add(schemeFruitSalad.neutralPalette.tone(tone))
+ systemNeutral2.add(schemeFruitSalad.neutralVariantPalette.tone(tone))
+ }
+
+ palette.add(systemAccent1)
+ palette.add(systemAccent2)
+ palette.add(systemAccent3)
+ palette.add(systemNeutral1)
+ palette.add(systemNeutral2)
+ }
+ }
+
+ return palette
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtil.kt b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtil.kt
deleted file mode 100644
index eeab0a506..000000000
--- a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtil.kt
+++ /dev/null
@@ -1,441 +0,0 @@
-package com.drdisagree.iconify.utils.color
-
-import android.content.Context
-import android.graphics.Color
-import android.util.TypedValue
-import androidx.annotation.AttrRes
-import androidx.annotation.ColorInt
-
-object ColorUtil {
-
- fun hsl(hue: Float, saturation: Float, lightness: Float): Int {
- return HSLColor.hslToColor(hue, saturation, lightness)
- }
-
- fun getHue(color: Int): Float {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
-
- return hsv[0]
- }
-
- fun setHue(color: Int, hue: Float): Int {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
- hsv[0] = hue
-
- return Color.HSVToColor(hsv)
- }
-
- fun getSaturation(color: Int): Float {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
-
- return hsv[1]
- }
-
- @JvmStatic
- fun setSaturation(color: Int, saturation: Float): Int {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
- hsv[1] += saturation
-
- return Color.HSVToColor(hsv)
- }
-
- fun getLightness(color: Int): Float {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
-
- return hsv[2]
- }
-
- @JvmStatic
- fun setLightness(color: Int, lightness: Float): Int {
- val r = Color.red(color)
- val g = Color.green(color)
- val b = Color.blue(color)
-
- val hsv = FloatArray(3)
- Color.RGBToHSV(r, g, b, hsv)
- hsv[2] += lightness
-
- return Color.HSVToColor(hsv)
- }
-
- @JvmStatic
- fun colorToHex(color: Int): String {
- val alpha = Color.alpha(color)
- val blue = Color.blue(color)
- val green = Color.green(color)
- val red = Color.red(color)
-
- return String.format("#%02X%02X%02X%02X", alpha, red, green, blue)
- }
-
- @JvmStatic
- fun colorToSpecialHex(color: Int): String {
- val blue = Color.blue(color)
- val green = Color.green(color)
- val red = Color.red(color)
-
- return String.format("0xff%02X%02X%02X", red, green, blue)
- }
-
- val systemTintList: FloatArray
- get() = floatArrayOf(
- 1.0f,
- 0.99f,
- 0.95f,
- 0.9f,
- 0.8f,
- 0.7f,
- 0.6f,
- 0.5f,
- 0.4f,
- 0.3f,
- 0.2f,
- 0.1f,
- 0.0f
- )
-
- @JvmStatic
- val colorNames: Array>
- get() {
- val accentTypes = arrayOf(
- "system_accent1",
- "system_accent2",
- "system_accent3",
- "system_neutral1",
- "system_neutral2"
- )
- val values = arrayOf(
- "0",
- "10",
- "50",
- "100",
- "200",
- "300",
- "400",
- "500",
- "600",
- "700",
- "800",
- "900",
- "1000"
- )
-
- val colorNames = Array(accentTypes.size) { arrayOfNulls(values.size) }
- for (i in accentTypes.indices) {
- for (j in values.indices) {
- colorNames[i][j] = accentTypes[i] + "_" + values[j]
- }
- }
-
- return colorNames
- }
-
- @JvmStatic
- fun getSystemColors(context: Context): Array {
- return arrayOf(
- intArrayOf(
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary100,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary99,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary95,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary90,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary80,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary70,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary60,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary50,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary40,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary30,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary20,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary10,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_primary0,
- context.theme
- )
- ), intArrayOf(
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary100,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary99,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary95,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary90,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary80,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary70,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary60,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary50,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary40,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary30,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary20,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary10,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_secondary0,
- context.theme
- )
- ), intArrayOf(
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary100,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary99,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary95,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary90,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary80,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary70,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary60,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary50,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary40,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary30,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary20,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary10,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_tertiary0,
- context.theme
- )
- ), intArrayOf(
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral100,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral99,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral95,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral90,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral80,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral70,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral60,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral50,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral40,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral30,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral20,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral10,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral0,
- context.theme
- )
- ), intArrayOf(
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant100,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant99,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant95,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant90,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant80,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant70,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant60,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant50,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant40,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant30,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant20,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant10,
- context.theme
- ),
- context.resources.getColor(
- com.google.android.material.R.color.material_dynamic_neutral_variant0,
- context.theme
- )
- )
- )
- }
-
- fun getColorResCompat(context: Context, @AttrRes id: Int): Int {
- val typedValue = TypedValue()
- val theme = context.theme
- theme.resolveAttribute(id, typedValue, false)
-
- val arr = context.obtainStyledAttributes(typedValue.data, intArrayOf(id))
- @ColorInt val color = arr.getColor(0, -1)
- arr.recycle()
-
- return color
- }
-}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtils.kt b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtils.kt
new file mode 100644
index 000000000..fb8ef9fa6
--- /dev/null
+++ b/app/src/main/java/com/drdisagree/iconify/utils/color/ColorUtils.kt
@@ -0,0 +1,435 @@
+package com.drdisagree.iconify.utils.color
+
+import android.content.Context
+import android.graphics.Color
+import android.util.TypedValue
+import androidx.annotation.AttrRes
+import androidx.annotation.ColorInt
+
+object ColorUtils {
+
+ fun hsl(hue: Float, saturation: Float, lightness: Float): Int {
+ return HSLColor.hslToColor(hue, saturation, lightness)
+ }
+
+ fun getHue(color: Int): Float {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+
+ return hsv[0]
+ }
+
+ fun setHue(color: Int, hue: Float): Int {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+ hsv[0] = hue
+
+ return Color.HSVToColor(hsv)
+ }
+
+ fun getSaturation(color: Int): Float {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+
+ return hsv[1]
+ }
+
+ fun setSaturation(color: Int, saturation: Float): Int {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+ hsv[1] += saturation
+
+ return Color.HSVToColor(hsv)
+ }
+
+ fun getLightness(color: Int): Float {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+
+ return hsv[2]
+ }
+
+ fun setLightness(color: Int, lightness: Float): Int {
+ val r = Color.red(color)
+ val g = Color.green(color)
+ val b = Color.blue(color)
+
+ val hsv = FloatArray(3)
+ Color.RGBToHSV(r, g, b, hsv)
+ hsv[2] += lightness
+
+ return Color.HSVToColor(hsv)
+ }
+
+ fun colorToHex(color: Int): String {
+ val alpha = Color.alpha(color)
+ val blue = Color.blue(color)
+ val green = Color.green(color)
+ val red = Color.red(color)
+
+ return String.format("#%02X%02X%02X%02X", alpha, red, green, blue)
+ }
+
+ fun colorToSpecialHex(color: Int): String {
+ val blue = Color.blue(color)
+ val green = Color.green(color)
+ val red = Color.red(color)
+
+ return String.format("0xff%02X%02X%02X", red, green, blue)
+ }
+
+ val systemTintList: FloatArray
+ get() = floatArrayOf(
+ 1.0f,
+ 0.99f,
+ 0.95f,
+ 0.9f,
+ 0.8f,
+ 0.7f,
+ 0.6f,
+ 0.5f,
+ 0.4f,
+ 0.3f,
+ 0.2f,
+ 0.1f,
+ 0.0f
+ )
+
+ val colorNames: Array>
+ get() {
+ val accentTypes = arrayOf(
+ "system_accent1",
+ "system_accent2",
+ "system_accent3",
+ "system_neutral1",
+ "system_neutral2"
+ )
+ val values = arrayOf(
+ "0",
+ "10",
+ "50",
+ "100",
+ "200",
+ "300",
+ "400",
+ "500",
+ "600",
+ "700",
+ "800",
+ "900",
+ "1000"
+ )
+
+ val colorNames = Array(accentTypes.size) { arrayOfNulls(values.size) }
+ for (i in accentTypes.indices) {
+ for (j in values.indices) {
+ colorNames[i][j] = accentTypes[i] + "_" + values[j]
+ }
+ }
+
+ return colorNames
+ }
+
+ fun getSystemColors(context: Context): Array {
+ return arrayOf(
+ intArrayOf(
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary100,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary99,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary95,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary90,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary80,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary70,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary60,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary50,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary40,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary30,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary20,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary10,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_primary0,
+ context.theme
+ )
+ ), intArrayOf(
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary100,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary99,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary95,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary90,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary80,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary70,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary60,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary50,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary40,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary30,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary20,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary10,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_secondary0,
+ context.theme
+ )
+ ), intArrayOf(
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary100,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary99,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary95,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary90,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary80,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary70,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary60,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary50,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary40,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary30,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary20,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary10,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_tertiary0,
+ context.theme
+ )
+ ), intArrayOf(
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral100,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral99,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral95,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral90,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral80,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral70,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral60,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral50,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral40,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral30,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral20,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral10,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral0,
+ context.theme
+ )
+ ), intArrayOf(
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant100,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant99,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant95,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant90,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant80,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant70,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant60,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant50,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant40,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant30,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant20,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant10,
+ context.theme
+ ),
+ context.resources.getColor(
+ com.google.android.material.R.color.material_dynamic_neutral_variant0,
+ context.theme
+ )
+ )
+ )
+ }
+
+ fun getColorResCompat(context: Context, @AttrRes id: Int): Int {
+ val typedValue = TypedValue()
+ val theme = context.theme
+ theme.resolveAttribute(id, typedValue, false)
+
+ val arr = context.obtainStyledAttributes(typedValue.data, intArrayOf(id))
+ @ColorInt val color = arr.getColor(0, -1)
+ arr.recycle()
+
+ return color
+ }
+}
diff --git a/app/src/main/java/com/drdisagree/iconify/utils/extension/TaskExecutor.kt b/app/src/main/java/com/drdisagree/iconify/utils/extension/TaskExecutor.kt
index a9a28b080..a13acc309 100644
--- a/app/src/main/java/com/drdisagree/iconify/utils/extension/TaskExecutor.kt
+++ b/app/src/main/java/com/drdisagree/iconify/utils/extension/TaskExecutor.kt
@@ -10,8 +10,8 @@ import kotlin.concurrent.Volatile
abstract class TaskExecutor {
- private val mHandler: Handler
- private val mExecutor: Executor
+ private val mHandler: Handler = Handler(Looper.getMainLooper())
+ private val mExecutor: Executor = Executors.newSingleThreadExecutor()
private val mCancelled: AtomicBoolean
private val preExecuteLatch: CountDownLatch
private val isCancelled: Boolean
@@ -22,8 +22,6 @@ abstract class TaskExecutor