Merge pull request #300 from Mahmud0808/beta

Merge beta into stable

README.md

@@ -1,7 +1,7 @@
 <div align="center">
   <img src="https://raw.githubusercontent.com/Mahmud0808/Iconify/beta/.github/resources/banner.png" width="100%" alt="Banner">
 
-  # v6.5.0 is out!
+  # v6.5.1 is out!
 </div>
 <p align="center">
   <a href="https://github.com/Mahmud0808/Iconify/releases"><img src="https://img.shields.io/github/downloads/Mahmud0808/Iconify/total?color=%233DDC84&logo=android&logoColor=%23fff&style=for-the-badge" alt="Downloads"></a>
@@ -23,6 +23,8 @@ Furthermore, the open-source nature of Iconify encourages community contribution
 </p>
 <div align="center">
   <br>
+  <a href="https://www.buymeacoffee.com/DrDisagree"><img src="https://github.com/Mahmud0808/Iconify/blob/beta/.github/resources/bmc-button.png" width="30%" alt="Buy me a coffee" /></a>
+  <br><br>
   <img src="https://raw.githubusercontent.com/Mahmud0808/Iconify/beta/.github/resources/features.png" width="100%" alt="Features">
 </div>
 
@@ -106,7 +108,7 @@ You can help translate Iconify [on Crowdin](https://crowdin.com/project/iconify)
 - How do I request a new feature?
   - If you have a feature request, please go to the [Issues](https://github.com/Mahmud0808/Iconify/issues/new/choose) section. Create a new issue and choose the `Feature Request` template. Be sure to include comprehensive details about the desired feature, its potential benefits, and any other relevant information that can assist in understanding and evaluating the request.
 - Where can I make a donation?
-  - At present, I do not accept any form of donation. This project is purely a personal endeavor undertaken during my leisure time. Additionally, I prefer to maintain the freedom of releasing future updates without any obligations associated with accepting donations.
+  - The preferred and designated means for donating to the project's developer is via the "[Buy me a coffee](https://www.buymeacoffee.com/DrDisagree)" page.
 
 # ❤ Credits 
 
@@ -129,11 +131,12 @@ You can help translate Iconify [on Crowdin](https://crowdin.com/project/iconify)
 - French [@MXC48](https://github.com/MXC48)
 - Indonesian [@KaeruShi](https://github.com/KaeruShi)
 - Persian [@Faceless1999](https://github.com/Faceless1999)
+- Polish [@SK00RUPA](https://github.com/SK00RUPA)
 - Portuguese [@ElTifo](https://github.com/ElTifo)
 - Russian [@B1ays](https://github.com/B1ays)
 - Simplified Chinese [@Cccc-owo](https://github.com/Cccc-owo)
 - Spanish [@luckkmaxx](https://github.com/luckkmaxx)
-- Turkish [@serhat-demir](https://github.com/serhat-demir)
+- Turkish [@serhat-demir](https://github.com/serhat-demir), [@Emre](https://crowdin.com/profile/khapnols), [@WINZORT](https://crowdin.com/profile/linuxthegoat)
 - Vietnamese [@viettel1211](https://t.me/viettel1211)
 
 # 📝 Disclaimer

app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.drdisagree.iconify"
         minSdk 31
         targetSdk 34
-        versionCode 14
-        versionName "6.5.0"
+        versionCode 15
+        versionName "6.5.1"
         setProperty("archivesBaseName", "Iconify v" + versionName)
         buildConfigField "int", "MIN_SDK_VERSION", "$minSdkVersion.apiLevel"
 
@@ -61,21 +61,35 @@ android {
     }
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     kotlinOptions {
-        jvmTarget = '1.8'
+        jvmTarget = '17'
     }
 
     packagingOptions {
         jniLibs {
-            excludes += ['/META-INF/*', '/META-INF/versions/**', '/org/bouncycastle/**', '/kotlin/**', '/kotlinx/**']
+            excludes += ['/META-INF/*',
+                         '/META-INF/versions/**',
+                         '/org/bouncycastle/**',
+                         '/kotlin/**',
+                         '/kotlinx/**']
         }
+
         resources {
-            excludes += ['/META-INF/*', '/META-INF/versions/**', '/org/bouncycastle/**', '/kotlin/**', '/kotlinx/**', 'rebel.xml', '/*.txt', '/*.bin', '/*.json']
+            excludes += ['/META-INF/*',
+                         '/META-INF/versions/**',
+                         '/org/bouncycastle/**',
+                         '/kotlin/**',
+                         '/kotlinx/**',
+                         'rebel.xml',
+                         '/*.txt',
+                         '/*.bin',
+                         '/*.json']
         }
+
         jniLibs.useLegacyPackaging true
     }
 
@@ -94,7 +108,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.12.0'
 
     // Data Binding
-    implementation 'com.android.databinding:library:8.1.1'
+    implementation 'com.android.databinding:library:8.1.2'
 
     // Xposed API
     compileOnly files('libs/api-82.jar')
@@ -114,11 +128,10 @@ dependencies {
     implementation 'androidx.core:core-splashscreen:1.0.1'
 
     // Material Components
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
 
     // APK Signer
-    implementation 'org.bouncycastle:bc-fips:1.0.2.3'
-    implementation 'org.bouncycastle:bcpkix-fips:1.0.7'
+    implementation 'org.bouncycastle:bcpkix-jdk18on:1.76'
 
     // Zip Util
     implementation 'net.lingala.zip4j:zip4j:2.11.5'

app/src/main/AndroidManifest.xml

@@ -1,18 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
-    <!-- Re-apply customizations on boot (deprecated) -->
-    <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> -->
-    <!-- Access to the internet for checking for updates -->
-    <uses-permission android:name="android.permission.INTERNET" /> <!-- Schedule a job to check for updates -->
-    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- Notify about new iconify updates -->
-    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Access storage for compilation of APKs in .iconify folder -->
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Read storage to be able to see what the compilation created -->
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <!-- <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /> --> <!-- Re-apply customizations on boot (deprecated) -->
+    <uses-permission android:name="android.permission.INTERNET" /> <!-- Access to the internet for checking for updates -->
+    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" /> <!-- Schedule a job to check for updates -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" /> <!-- Notify about new iconify updates -->
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <!-- Access storage for compilation of APKs in .iconify folder -->
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <!-- Read storage to be able to see what the compilation created -->
     <uses-permission
         android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
-        tools:ignore="ScopedStorage" /> <!-- Checking for Installed Music Players -->
-    <queries>
+        tools:ignore="ScopedStorage" /> <!-- Manage storage to be able to see what the compilation created -->
+    <queries> <!-- Checking for Installed Music Players -->
         <package android:name="com.maxmpz.audioplayer" />
         <package android:name="code.name.monkey.retromusic" />
         <package android:name="com.awedea.nyx" />
@@ -197,7 +195,7 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity-alias> <!-- Custom App Icons -->
+        </activity-alias> <!-- Custom App Icon -->
         <activity-alias
             android:name=".SplashActivityRetro"
             android:enabled="false"
@@ -211,7 +209,7 @@
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-        </activity-alias>
+        </activity-alias> <!-- Custom App Icon -->
 
         <receiver
             android:name=".services.BootReceiver"
@@ -221,7 +219,7 @@
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
                 <action android:name="android.intent.action.QUICKBOOT_POWERON" />
             </intent-filter>
-        </receiver>
+        </receiver> <!-- Boot Receiver -->
         <!--
         @Deprecated
         <service
@@ -230,7 +228,6 @@
             android:exported="true"
             tools:ignore="ExportedService" />
         -->
-        <!-- Quick Settings Tiles -->
         <service
             android:name=".services.TileNotchBarKiller"
             android:exported="true"
@@ -244,7 +241,7 @@
             <meta-data
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
-        </service>
+        </service> <!-- Quick Settings Tile -->
         <service
             android:name=".services.TileMonetEngine"
             android:exported="true"
@@ -258,7 +255,7 @@
             <meta-data
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
-        </service>
+        </service> <!-- Quick Settings Tile -->
         <service
             android:name=".services.TilePitchBlack"
             android:exported="true"
@@ -272,7 +269,7 @@
             <meta-data
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
-        </service>
+        </service> <!-- Quick Settings Tile -->
         <service
             android:name=".services.TileRestartSystemUI"
             android:exported="true"
@@ -286,25 +283,25 @@
             <meta-data
                 android:name="android.service.quicksettings.TOGGLEABLE_TILE"
                 android:value="true" />
-        </service> <!-- xposed meta data -->
+        </service> <!-- Quick Settings Tile -->
         <meta-data
             android:name="xposedmodule"
-            android:value="true" />
+            android:value="true" /> <!-- xposed meta data -->
         <meta-data
             android:name="xposeddescription"
-            android:value="@string/app_moto" />
+            android:value="@string/app_moto" /> <!-- xposed meta data -->
         <meta-data
             android:name="xposedminversion"
-            android:value="82" />
+            android:value="82" /> <!-- xposed meta data -->
         <meta-data
             android:name="xposedscope"
-            android:resource="@array/module_scope" /> <!-- Remote Preferences Provider -->
+            android:resource="@array/module_scope" /> <!-- xposed meta data -->
         <provider
             android:name=".services.RemotePrefProvider"
             android:authorities="${applicationId}"
             android:directBootAware="true"
             android:exported="true"
-            tools:ignore="ExportedContentProvider" />
+            tools:ignore="ExportedContentProvider" /> <!-- Remote Preferences Provider -->
     </application>
 
 </manifest>

app/src/main/java/com/drdisagree/iconify/Iconify.java

@@ -12,10 +12,7 @@ public class Iconify extends Application {
     private static WeakReference<Context> contextReference;
 
     public static Context getAppContext() {
-        if (contextReference != null) {
-            return contextReference.get();
-        }
-        return null;
+        return contextReference.get();
     }
 
     public void onCreate() {

app/src/main/java/com/drdisagree/iconify/common/Preferences.java

@@ -57,10 +57,38 @@ public class Preferences {
     public static final String CUSTOM_BATTERY_STYLE = "xposed_custombatterystyle";
     public static final String CUSTOM_BATTERY_WIDTH = "xposed_custombatterywidth";
     public static final String CUSTOM_BATTERY_HEIGHT = "xposed_custombatteryheight";
-    public static final String CUSTOM_BATTERY_MARGIN = "xposed_custombatterymargin";
     public static final String HEADER_QQS_TOPMARGIN = "qqspanelTopMargin";
     public static final String HIDE_DATA_DISABLED_ICON = "xposed_hideDataDisabledIcon";
     public static final String DEPTH_WALLPAPER_SWITCH = "xposed_depthwallpaper";
+    public static final String UNZOOM_DEPTH_WALLPAPER = "xposed_unzoomdepthwallpaper";
+    public static final String CUSTOM_BATTERY_LAYOUT_REVERSE = "xposed_custombatterylayoutreverse";
+    public static final String CUSTOM_BATTERY_DIMENSION = "xposed_custombatterydimension";
+    public static final String CUSTOM_BATTERY_MARGIN_LEFT = "xposed_custombatterymarginleft";
+    public static final String CUSTOM_BATTERY_MARGIN_TOP = "xposed_custombatterymargintop";
+    public static final String CUSTOM_BATTERY_MARGIN_RIGHT = "xposed_custombatterymarginright";
+    public static final String CUSTOM_BATTERY_MARGIN_BOTTOM = "xposed_custombatterymarginbottom";
+    public static final String CUSTOM_BATTERY_PERIMETER_ALPHA = "xposed_custombatteryperimeteralpha";
+    public static final String CUSTOM_BATTERY_FILL_ALPHA = "xposed_custombatteryfilledalpha";
+    public static final String CUSTOM_BATTERY_RAINBOW_FILL_COLOR = "xposed_custombatteryrainbowfillcolor";
+    public static final String CUSTOM_BATTERY_BLEND_COLOR = "xposed_custombatteryblendcolor";
+    public static final String CUSTOM_BATTERY_CHARGING_COLOR = "xposed_custombatterychargingcolor";
+    public static final String CUSTOM_BATTERY_FILL_COLOR = "xposed_custombatteryfillcolor";
+    public static final String CUSTOM_BATTERY_FILL_GRAD_COLOR = "xposed_custombatteryfillgradcolor";
+    public static final String CUSTOM_BATTERY_POWERSAVE_INDICATOR_COLOR = "xposed_custombatterypowersaveindicatorcolor";
+    public static final String CUSTOM_BATTERY_POWERSAVE_FILL_COLOR = "xposed_custombatterypowersavefillcolor";
+    public static final String CUSTOM_BATTERY_SWAP_PERCENTAGE = "xposed_custombatteryswappercentage";
+    public static final String CUSTOM_BATTERY_CHARGING_ICON_SWITCH = "xposed_custombatterychargingiconswitch";
+    public static final String CUSTOM_BATTERY_CHARGING_ICON_STYLE = "xposed_custombatterychargingiconstyle";
+    public static final String CUSTOM_BATTERY_CHARGING_ICON_MARGIN_LEFT = "xposed_custombatterychargingiconmarginleft";
+    public static final String CUSTOM_BATTERY_CHARGING_ICON_MARGIN_RIGHT = "xposed_custombatterychargingiconmarginright";
+    public static final String CUSTOM_BATTERY_CHARGING_ICON_WIDTH_HEIGHT = "xposed_custombatterychargingiconwidthheight";
+    public static final String CUSTOM_BATTERY_HIDE_PERCENTAGE = "xposed_custombatteryhidepercentage";
+
+    // Xposed view tags
+    public static final String ICONIFY_HEADER_CLOCK_TAG = "iconify_header_clock";
+    public static final String ICONIFY_LOCKSCREEN_CLOCK_TAG = "iconify_lockscreen_clock";
+    public static final String ICONIFY_DEPTH_WALLPAPER_TAG = "iconify_depth_wallpaper";
+    public static final String ICONIFY_CHARGING_ICON_TAG = "iconify_charging_icon";
 
     // Battery styles
     public static final int BATTERY_STYLE_DEFAULT = 0;
@@ -83,6 +111,21 @@ public class Preferences {
     public static final int BATTERY_STYLE_LANDSCAPE_MIUI_PILL = 17;
     public static final int BATTERY_STYLE_LANDSCAPE_COLOROS = 18;
     public static final int BATTERY_STYLE_RLANDSCAPE_COLOROS = 19;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYA = 20;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYB = 21;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYC = 22;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYD = 23;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYE = 24;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYF = 25;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYG = 26;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYH = 27;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYI = 28;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYJ = 29;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYK = 30;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYL = 31;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYM = 32;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYN = 33;
+    public static final int BATTERY_STYLE_LANDSCAPE_BATTERYO = 34;
 
     // Preference keys
     public static final String STR_NULL = "null";

app/src/main/java/com/drdisagree/iconify/ui/activities/Credits.java

@@ -81,7 +81,10 @@ private InfoAdapter initTranslatorsList() {
         translators_list.add(new InfoModel(this, "Cccc_", getResources().getString(R.string.zh_cn_translation), "https://github.com/Cccc-owo", R.drawable.ic_user));
         translators_list.add(new InfoModel(this, "luckkmaxx", getResources().getString(R.string.es_translation), "https://github.com/luckkmaxx", R.drawable.ic_user));
         translators_list.add(new InfoModel(this, "Serhat Demir", getResources().getString(R.string.tr_translation), "https://github.com/serhat-demir", R.drawable.ic_user));
+        translators_list.add(new InfoModel(this, "Emre", getResources().getString(R.string.tr_translation), "https://crowdin.com/profile/khapnols", R.drawable.ic_user));
+        translators_list.add(new InfoModel(this, "WINZORT", getResources().getString(R.string.tr_translation), "https://crowdin.com/profile/linuxthegoat", R.drawable.ic_user));
         translators_list.add(new InfoModel(this, "Đức Trọng", getResources().getString(R.string.vi_translation), "https://t.me/viettel1211", R.drawable.ic_user));
+        translators_list.add(new InfoModel(this, "Jakub Skorłutowski", getResources().getString(R.string.pl_translation), "https://github.com/SK00RUPA", R.drawable.ic_user));
 
         return new InfoAdapter(this, translators_list);
     }

app/src/main/java/com/drdisagree/iconify/ui/activities/Experimental.java

@@ -3,6 +3,7 @@
 import static com.drdisagree.iconify.common.Const.SWITCH_ANIMATION_DELAY;
 import static com.drdisagree.iconify.common.Preferences.HEADER_IMAGE_OVERLAP;
 import static com.drdisagree.iconify.common.Preferences.HIDE_DATA_DISABLED_ICON;
+import static com.drdisagree.iconify.common.Preferences.UNZOOM_DEPTH_WALLPAPER;
 
 import android.annotation.SuppressLint;
 import android.os.Bundle;
@@ -37,6 +38,14 @@ protected void onCreate(Bundle savedInstanceState) {
         });
         binding.headerImageOverlapContainer.setOnClickListener(v -> binding.headerImageOverlap.toggle());
 
+        // Unzoom depth wallpaper
+        binding.unzoomDepthWallpaper.setChecked(RPrefs.getBoolean(UNZOOM_DEPTH_WALLPAPER, false));
+        binding.unzoomDepthWallpaper.setOnCheckedChangeListener((compoundButton, isChecked) -> {
+            RPrefs.putBoolean(UNZOOM_DEPTH_WALLPAPER, isChecked);
+            new Handler(Looper.getMainLooper()).postDelayed(SystemUtil::restartSystemUI, SWITCH_ANIMATION_DELAY);
+        });
+        binding.unzoomDepthWallpaperContainer.setOnClickListener(v -> binding.unzoomDepthWallpaper.toggle());
+
         // Hide data disabled icon
         binding.hideDataDisabledIcon.setChecked(RPrefs.getBoolean(HIDE_DATA_DISABLED_ICON, false));
         binding.hideDataDisabledIcon.setOnCheckedChangeListener((buttonView, isChecked) -> {