Merge pull request #296 from Bnyro/icon

Change Icon Option in Settings

app/src/main/AndroidManifest.xml

@@ -28,8 +28,7 @@
             />
         <activity
             android:name=".SettingsActivity"
-            android:label="@string/settings"
+            android:label="@string/settings" />
-            android:parentActivityName=".MainActivity" />
         <activity
             android:name=".MainActivity"
             android:exported="true"
@@ -137,6 +136,126 @@
                 <data android:pathPrefix="/" />
             </intent-filter>
         </activity>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_gradient"
+            android:roundIcon="@mipmap/ic_gradient_round"
+            android:name=".IconGradient"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_fire"
+            android:roundIcon="@mipmap/ic_fire_round"
+            android:name=".IconFire"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_flame"
+            android:roundIcon="@mipmap/ic_flame_round"
+            android:name=".IconFlame"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_shaped"
+            android:roundIcon="@mipmap/ic_shaped_round"
+            android:name=".IconShaped"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_torch"
+            android:roundIcon="@mipmap/ic_torch_round"
+            android:name=".IconTorch"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_legacy"
+            android:roundIcon="@mipmap/ic_legacy_round"
+            android:name=".IconLegacy"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
+        <activity-alias
+            android:label="@string/app_name"
+            android:icon="@mipmap/ic_bird"
+            android:roundIcon="@mipmap/ic_bird_round"
+            android:name=".IconBird"
+            android:enabled="false"
+            android:targetActivity=".MainActivity"
+            android:supportsPictureInPicture="true"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
+            android:hardwareAccelerated="true"
+            android:exported="true">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity-alias>
+
         <service
             android:name=".DownloadService"
             android:enabled="true"

app/src/main/java/com/github/libretube/SettingsActivity.kt

@@ -253,10 +253,15 @@ class SettingsActivity :
                 true
             }
 
+            val iconChange = findPreference<ListPreference>("icon_change")
+            iconChange?.setOnPreferenceChangeListener { _, newValue ->
+                changeIcon(requireContext(), newValue.toString())
+                true
+            }
+
             val changeLanguage = findPreference<ListPreference>("language")
             changeLanguage?.setOnPreferenceChangeListener { _, _ ->
-                val refresh = Intent(context, MainActivity::class.java)
+                restartMainActivity(requireContext())
-                startActivity(refresh)
                 true
             }
 
@@ -379,8 +384,7 @@ class SettingsActivity :
         if (isCurrentViewMainSettings) {
             PreferenceManager.getDefaultSharedPreferences(this)
                 .unregisterOnSharedPreferenceChangeListener(this)
-            intent = Intent(this, MainActivity::class.java)
+            restartMainActivity(this)
-            startActivity(intent)
         } else {
             isCurrentViewMainSettings = true
             supportFragmentManager

app/src/main/java/com/github/libretube/ThemeChanger.kt

@@ -1,9 +1,12 @@
 package com.github.libretube
 
+import android.content.ComponentName
 import android.content.Context
+import android.content.Intent
+import android.content.pm.PackageManager
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.PreferenceManager
-import java.util.Locale
+import java.util.*
 
 fun updateAccentColor(context: Context) {
     val colorAccent =
@@ -53,3 +56,29 @@ fun updateLanguage(context: Context) {
         res.updateConfiguration(conf, dm)
     }
 }
+
+fun changeIcon(context: Context, newLogoActivityAlias: String) {
+    val activityAliases = context.resources.getStringArray(R.array.iconsValue)
+    // Disable Old Icon(s)
+    for (activityAlias in activityAliases) {
+        context.packageManager.setComponentEnabledSetting(
+            ComponentName(context.packageName, "com.github.libretube.$activityAlias"),
+            PackageManager.COMPONENT_ENABLED_STATE_DISABLED,
+            PackageManager.DONT_KILL_APP
+        )
+    }
+    // Enable New Icon
+    context.packageManager.setComponentEnabledSetting(
+        ComponentName(context.packageName, "com.github.libretube.$newLogoActivityAlias"),
+        PackageManager.COMPONENT_ENABLED_STATE_ENABLED,
+        PackageManager.DONT_KILL_APP
+    )
+}
+
+// Needed due to different MainActivity Aliases because of the app icons
+fun restartMainActivity(context: Context) {
+    val pm: PackageManager = context.packageManager
+    val intent = pm.getLaunchIntentForPackage(context.packageName)
+    intent?.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP)
+    context.startActivity(intent)
+}

app/src/main/res/mipmap-anydpi-v26/ic_bird.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_bird_background"/>
+    <foreground android:drawable="@mipmap/ic_bird_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_bird_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_bird_background"/>
+    <foreground android:drawable="@mipmap/ic_bird_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_fire.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_fire_background"/>
+    <foreground android:drawable="@mipmap/ic_fire_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_fire_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_fire_background"/>
+    <foreground android:drawable="@mipmap/ic_fire_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_flame.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_flame_background"/>
+    <foreground android:drawable="@mipmap/ic_flame_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_flame_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_flame_background"/>
+    <foreground android:drawable="@mipmap/ic_flame_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_gradient.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_gradient_background"/>
+    <foreground android:drawable="@mipmap/ic_gradient_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_gradient_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_gradient_background"/>
+    <foreground android:drawable="@mipmap/ic_gradient_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_legacy.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_legacy_background"/>
+    <foreground android:drawable="@mipmap/ic_legacy_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_legacy_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_legacy_background"/>
+    <foreground android:drawable="@mipmap/ic_legacy_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_shaped.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shaped_background"/>
+    <foreground android:drawable="@mipmap/ic_shaped_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_shaped_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_shaped_background"/>
+    <foreground android:drawable="@mipmap/ic_shaped_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_torch.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_torch_background"/>
+    <foreground android:drawable="@mipmap/ic_torch_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_torch_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_torch_background"/>
+    <foreground android:drawable="@mipmap/ic_torch_foreground"/>
+</adaptive-icon>