v2.2.2

Yanndroid · Yanndroid · commit cd1256bb4ebd · 2022-01-15T14:59:43.000+01:00
- sound tab crash fix
- single apk for oneui 3/4 themed
- dependency update
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,21 +24,12 @@ jobs:
          release_name: ${{ steps.values.outputs.name }}
          tag_name: ${{ steps.values.outputs.tag }}
          body: changelog
-     - name: Add OneUI 3 apk
+     - name: Add apk
        uses: actions/upload-release-asset@v1
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        with:
          upload_url: ${{ steps.create_release.outputs.upload_url }} 
-         asset_path: ./app/release-oneui3/release/hKtweaks.apk
-         asset_name: ${{ steps.values.outputs.apk }}_3.apk
-         asset_content_type: application/vnd.android.package-archive
-     - name: Add OneUI 4 apk
-       uses: actions/upload-release-asset@v1
-       env:
-         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-       with:
-         upload_url: ${{ steps.create_release.outputs.upload_url }} 
-         asset_path: ./app/release-oneui4/release/hKtweaks.apk
-         asset_name: ${{ steps.values.outputs.apk }}_4.apk
+         asset_path: ./app/release/app-release.apk
+         asset_name: ${{ steps.values.outputs.apk }}.apk
          asset_content_type: application/vnd.android.package-archive
diff --git a/README.md b/README.md
@@ -6,9 +6,8 @@ This is a OneUI-Themed version of Corsicanu's [hKtweaks](https://github.com/cors
 
 <img loading="lazy" src="readme-res/4.jpg" width="150"/> <img loading="lazy" src="readme-res/5.jpg" width="150"/> 
 
-## Downloads
-- [OneUI 3 version](https://github.com/Yanndroid/hKtweaks-OneUI/raw/master/app/release-oneui3/release/hKtweaks.apk)
-- [OneUI 4 version](https://github.com/Yanndroid/hKtweaks-OneUI/raw/master/app/release-oneui4/release/hKtweaks.apk)
+## Download
+[Download apk](https://github.com/Yanndroid/hKtweaks-OneUI/raw/master/app/release/app-release.apk)
 
 Future updates will be available in the app.
 
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId 'com.hades.hKtweaks'
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 221
-        versionName "2.2.1 - OneUI"
+        versionCode 222
+        versionName "2.2.2 - OneUI"
         vectorDrawables.useSupportLibrary = true
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -28,38 +28,14 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-
-    flavorDimensions "version"
-    productFlavors {
-        "release-oneui3" {
-            dimension "version"
-            buildConfigField "String", "firebase_apk", '"apk"'
-            versionName = android.defaultConfig.versionName + " 3"
-        }
-        "release-oneui4" {
-            dimension "version"
-            buildConfigField "String", "firebase_apk", '"apk4"'
-            versionName = android.defaultConfig.versionName + " 4"
-        }
-    }
-    sourceSets {
-        "release-oneui3" {
-            manifest.srcFile "src/main/AndroidManifest3.xml"
-        }
-        "release-oneui4" {
-            manifest.srcFile "src/main/AndroidManifest4.xml"
-        }
-    }
-
-    android.applicationVariants.all { final variant -> variant.outputs.all { outputFileName = "hKtweaks.apk" } }
 }
 
 repositories {
     maven { url "https://jitpack.io" }
 }
 
 dependencies {
-    implementation 'io.github.yanndroid:oneui:2.2.0'
+    implementation 'io.github.yanndroid:oneui:2.2.1'
     implementation 'org.cyanogenmod:platform.sdk:6.0'
     implementation 'com.github.bumptech.glide:glide:4.12.0'
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
diff --git a/app/release-oneui4/release/hKtweaks.apk b/app/release-oneui4/release/hKtweaks.apk
diff --git a/app/release-oneui4/release/output-metadata.json b/app/release-oneui4/release/output-metadata.json
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -5,14 +5,14 @@
     "kind": "Directory"
   },
   "applicationId": "com.hades.hKtweaks",
-  "variantName": "release-oneui3Release",
+  "variantName": "release",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 221,
-      "versionName": "2.2.1 - OneUI 3",
-      "outputFile": "hKtweaks.apk"
+      "versionCode": 222,
+      "versionName": "2.2.2 - OneUI",
+      "outputFile": "app-release.apk"
     }
   ]
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -34,10 +34,15 @@
         android:label="@string/app_name"
         android:requestLegacyExternalStorage="true"
         android:supportsRtl="true"
+        android:theme="@style/OneUITheme"
         tools:ignore="GoogleAppIndexingWarning"
         tools:targetApi="q">
-        <activity android:name=".activities.AboutActivity" />
-        <activity android:name=".activities.SplashActivity">
+        <activity
+            android:name=".activities.AboutActivity"
+            android:theme="@style/OneUIAboutTheme" />
+        <activity
+            android:name=".activities.SplashActivity"
+            android:theme="@style/OneUISplashTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/assets/update.json b/app/src/main/assets/update.json
@@ -1,7 +1,8 @@
 {
   "releaseNotes": [
     "Changelog - Yanndroid:",
-    "- dependencies update",
-    "- improvements & bug fixes"
+    "- sound tab crash fix",
+    "- single apk for oneui 3/4 themed",
+    "- dependency update"
   ]
 }
diff --git a/app/src/main/java/com/hades/hKtweaks/activities/AboutActivity.java b/app/src/main/java/com/hades/hKtweaks/activities/AboutActivity.java
@@ -18,6 +18,7 @@ public class AboutActivity extends BaseActivity {
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
+        mUseAltTheme = true;
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
 
diff --git a/app/src/main/java/com/hades/hKtweaks/activities/BaseActivity.java b/app/src/main/java/com/hades/hKtweaks/activities/BaseActivity.java
@@ -21,6 +21,7 @@
 
 import android.content.Context;
 import android.content.ContextWrapper;
+import android.content.SharedPreferences;
 import android.content.res.Configuration;
 import android.content.res.Resources;
 import android.os.Build;
@@ -31,8 +32,10 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.AppCompatDelegate;
 
+import com.hades.hKtweaks.BuildConfig;
 import com.hades.hKtweaks.R;
 import com.hades.hKtweaks.utils.AppSettings;
+import com.hades.hKtweaks.utils.tools.Buildprop;
 
 import java.util.Locale;
 
@@ -44,6 +47,10 @@
  * Created by willi on 14.04.16.
  */
 public abstract class BaseActivity extends AppCompatActivity {
+    private static String SP_NAME = BuildConfig.APPLICATION_ID + "_preferences";
+    private SharedPreferences sp;
+    public boolean mUseAltTheme;
+    public boolean mUseOUI4Theme;
 
     public static ContextWrapper wrap(Context context, Locale newLocale) {
         Resources res = context.getResources();
@@ -72,6 +79,14 @@ public static ContextWrapper wrap(Context context, Locale newLocale) {
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+        sp = getSharedPreferences(SP_NAME, Context.MODE_PRIVATE);
+        boolean deviceIsOUI4 = Buildprop.getProps().containsValue("ro.build.version.sep") && Integer.parseInt(Buildprop.getProps().get("ro.build.version.sep")) >= 130000;
+        mUseOUI4Theme = sp.getBoolean("use_oui4_theme", deviceIsOUI4);
+
+        int normalTheme = mUseOUI4Theme ? R.style.OneUI4Theme : R.style.OneUI3Theme;
+        int altTheme = mUseOUI4Theme ? R.style.OneUI4AboutTheme : R.style.OneUI3AboutTheme;
+
+        setTheme(mUseAltTheme ? altTheme : normalTheme);
         new ThemeUtil(this);
         super.onCreate(savedInstanceState);
     }
diff --git a/app/src/main/java/com/hades/hKtweaks/activities/SplashActivity.java b/app/src/main/java/com/hades/hKtweaks/activities/SplashActivity.java
@@ -128,6 +128,7 @@ public class SplashActivity extends BaseActivity {
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
+        mUseAltTheme = true;
         super.onCreate(savedInstanceState);
 
         setContentView(R.layout.activity_splash);
diff --git a/app/src/main/java/com/hades/hKtweaks/fragments/other/SettingsFragment.java b/app/src/main/java/com/hades/hKtweaks/fragments/other/SettingsFragment.java
@@ -44,6 +44,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.hades.hKtweaks.R;
+import com.hades.hKtweaks.activities.BaseActivity;
 import com.hades.hKtweaks.activities.NavigationActivity;
 import com.hades.hKtweaks.activities.SplashActivity;
 import com.hades.hKtweaks.services.boot.ApplyOnBootService;
@@ -77,6 +78,7 @@ public class SettingsFragment extends PreferenceFragment implements
 
     private static final String KEY_RESET_DATA = "reset_data";
     private static final String KEY_FORCE_ENGLISH = "forceenglish";
+    private static final String KEY_OUI4_THEME = "use_oui4_theme";
     private static final String KEY_APPLY_ON_BOOT_TEST = "applyonboottest";
     private static final String KEY_DEBUGGING_CATEGORY = "debugging_category";
     private static final String KEY_LOGCAT = "logcat";
@@ -121,6 +123,8 @@ public void onResume() {
     public void onCreatePreferences(Bundle bundle, String s) {
         addPreferencesFromResource(R.xml.settings);
 
+        findPreference(KEY_OUI4_THEME).setOnPreferenceChangeListener(this);
+
         SwitchPreference forceEnglish = (SwitchPreference) findPreference(KEY_FORCE_ENGLISH);
         if (Resources.getSystem().getConfiguration().locale.getLanguage().startsWith("en")) {
             getPreferenceScreen().removePreference(forceEnglish);
@@ -214,6 +218,10 @@ private void initThemeColorPicker() {
     public boolean onPreferenceChange(Preference preference, Object o) {
         String key = preference.getKey();
         switch (key) {
+            case KEY_OUI4_THEME:
+                if ((boolean) o != ((BaseActivity) getActivity()).mUseOUI4Theme)
+                    getActivity().recreate();
+                return true;
             case KEY_FORCE_ENGLISH:
                 getActivity().finish();
                 Intent intent = new Intent(getActivity(), SplashActivity.class);
diff --git a/app/src/main/java/com/hades/hKtweaks/fragments/tools/BuildpropFragment.java b/app/src/main/java/com/hades/hKtweaks/fragments/tools/BuildpropFragment.java
@@ -173,9 +173,10 @@ protected void load(List<RecyclerViewItem> items) {
 
         if (mProps == null) return;
         String[] titles = mProps.keySet().toArray(new String[mProps.size()]);
+        String[] values = mProps.values().toArray(new String[mProps.size()]);
         for (int i = 0; i < mProps.size(); i++) {
             final String title = titles[i];
-            final String value = mProps.values().toArray(new String[mProps.size()])[i];
+            final String value = values[i];
             if (mSearchText != null && !title.contains(mSearchText) && !value.contains(mSearchText)) {
                 continue;
             }
diff --git a/app/src/main/java/com/hades/hKtweaks/utils/Updater.java b/app/src/main/java/com/hades/hKtweaks/utils/Updater.java
@@ -20,7 +20,6 @@
 import com.google.firebase.database.DatabaseReference;
 import com.google.firebase.database.FirebaseDatabase;
 import com.google.firebase.database.ValueEventListener;
-import com.hades.hKtweaks.BuildConfig;
 import com.hades.hKtweaks.R;
 
 import java.io.File;
@@ -81,7 +80,7 @@ public void onDataChange(@NonNull DataSnapshot snapshot) {
                         hashMap.put(child.getKey(), child.getValue().toString());
                     }
 
-                    updateChecker.updateAvailable(Integer.parseInt(hashMap.get(context.getString(R.string.firebase_versionCode))) > context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode, hashMap.get(BuildConfig.firebase_apk), hashMap.get(context.getString(R.string.firebase_versionName)));
+                    updateChecker.updateAvailable(Integer.parseInt(hashMap.get(context.getString(R.string.firebase_versionCode))) > context.getPackageManager().getPackageInfo(context.getPackageName(), 0).versionCode, hashMap.get(context.getString(R.string.firebase_apk)), hashMap.get(context.getString(R.string.firebase_versionName)));
 
                     if (hashMap.get(context.getString(R.string.firebase_github)) != null) {
                         updateChecker.githubAvailable(hashMap.get(context.getString(R.string.firebase_github)));
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1170,6 +1170,7 @@
     <string name="light_theme">Light</string>
     <string name="dark_theme">Dark</string>
     <string name="system_default">System default</string>
+    <string name="use_oui4_theme">Use OneUI 4 theme</string>
     <string name="theme_color_summary">Change the app color.</string>
 
     <string name="primary_color">Primary color</string>
@@ -1224,6 +1225,7 @@
     <string name="firebase_versionCode" translatable="false">versionCode</string>
     <string name="firebase_github" translatable="false">github</string>
     <string name="firebase_versionName" translatable="false">versionName</string>
+    <string name="firebase_apk" translatable="false">apk</string>
     <string name="github" translatable="false">Github</string>
 
     <!-- APP Updater -->
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -14,6 +14,9 @@
         <SwitchPreference
             android:key="dark_mode_auto"
             android:title="@string/system_default" />
+        <SwitchPreference
+            android:key="use_oui4_theme"
+            android:title="@string/use_oui4_theme" />
         <ColorPickerPreference
             android:key="theme_color"
             android:summary="@string/theme_color_summary"

Original file line number	Diff line number	Diff line change
`@@ -5,14 +5,14 @@`
`5`	`5`	`"kind": "Directory"`
`6`	`6`	`},`
`7`	`7`	`"applicationId": "com.hades.hKtweaks",`
`8`		`- "variantName": "release-oneui3Release",`
	`8`	`+ "variantName": "release",`
`9`	`9`	`"elements": [`
`10`	`10`	`{`
`11`	`11`	`"type": "SINGLE",`
`12`	`12`	`"filters": [],`
`13`		`- "versionCode": 221,`
`14`		`- "versionName": "2.2.1 - OneUI 3",`
`15`		`- "outputFile": "hKtweaks.apk"`
	`13`	`+ "versionCode": 222,`
	`14`	`+ "versionName": "2.2.2 - OneUI",`
	`15`	`+ "outputFile": "app-release.apk"`
`16`	`16`	`}`
`17`	`17`	`]`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,8 @@`
`1`	`1`	`{`
`2`	`2`	`"releaseNotes": [`
`3`	`3`	`"Changelog - Yanndroid:",`
`4`		`- "- dependencies update",`
`5`		`- "- improvements & bug fixes"`
	`4`	`+ "- sound tab crash fix",`
	`5`	`+ "- single apk for oneui 3/4 themed",`
	`6`	`+ "- dependency update"`
`6`	`7`	`]`
`7`	`8`	`}`