TheArchive/Magisk
1
0
Fork 0
mirror of https://github.com/topjohnwu/Magisk.git synced 2025-02-21 10:48:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add monochrome adaptive icon support

Browse Source 
Close #6867
This commit is contained in:
topjohnwu 2023-04-10 19:29:13 -07:00
parent b7799b53d9
commit e9b76b6aa5
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.kt
View File

@ -4,6 +4,7 @@ import android.content.Context
import android.content.Intent import android.content.Intent
import android.content.pm.ShortcutInfo import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager import android.content.pm.ShortcutManager
import android.graphics.drawable.Icon
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import androidx.core.content.getSystemService import androidx.core.content.getSystemService
@ -13,6 +14,7 @@ import androidx.core.graphics.drawable.IconCompat
import com.topjohnwu.magisk.R import com.topjohnwu.magisk.R
import com.topjohnwu.magisk.core.Const import com.topjohnwu.magisk.core.Const
import com.topjohnwu.magisk.core.Info import com.topjohnwu.magisk.core.Info
import com.topjohnwu.magisk.core.isRunningAsStub
import com.topjohnwu.magisk.core.ktx.getBitmap import com.topjohnwu.magisk.core.ktx.getBitmap
object Shortcuts { object Shortcuts {
@ -29,20 +31,22 @@ object Shortcuts {
val info = ShortcutInfoCompat.Builder(context, Const.Nav.HOME) val info = ShortcutInfoCompat.Builder(context, Const.Nav.HOME)
.setShortLabel(context.getString(R.string.magisk)) .setShortLabel(context.getString(R.string.magisk))
.setIntent(intent) .setIntent(intent)
.setIcon(context.getIconCompat(R.drawable.ic_launcher)) .setIcon(IconCompat.createFromIcon(context, context.getIcon(R.drawable.ic_launcher)))
.build() .build()
ShortcutManagerCompat.requestPinShortcut(context, info, null) ShortcutManagerCompat.requestPinShortcut(context, info, null)
} }
private fun Context.getIconCompat(id: Int): IconCompat { private fun Context.getIcon(id: Int): Icon {
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) return if (isRunningAsStub) {
IconCompat.createWithAdaptiveBitmap(getBitmap(id)) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O)
else Icon.createWithAdaptiveBitmap(getBitmap(id))
IconCompat.createWithBitmap(getBitmap(id)) else
Icon.createWithBitmap(getBitmap(id))
} else {
Icon.createWithResource(this, id)
}
} }
private fun Context.getIcon(id: Int) = getIconCompat(id).toIcon(this)
@RequiresApi(api = 25) @RequiresApi(api = 25)
private fun getShortCuts(context: Context): List<ShortcutInfo> { private fun getShortCuts(context: Context): List<ShortcutInfo> {
val intent = context.packageManager.getLaunchIntentForPackage(context.packageName) val intent = context.packageManager.getLaunchIntentForPackage(context.packageName)

3
app/src/main/res/drawable-v26/ic_launcher.xml
View File

@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/> <background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_magisk_padded" /> <foreground android:drawable="@drawable/ic_magisk_padded" />
</adaptive-icon> <monochrome android:drawable="@drawable/ic_magisk_padded" />
</adaptive-icon>

7
app/src/main/res/drawable-v26/sc_extension.xml
View File

@ -6,4 +6,9 @@
android:drawable="@drawable/ic_extension" android:drawable="@drawable/ic_extension"
android:inset="30%" /> android:inset="30%" />
</foreground> </foreground>
</adaptive-icon> <monochrome>
<inset
android:drawable="@drawable/ic_extension"
android:inset="30%" />
</monochrome>
</adaptive-icon>

7
app/src/main/res/drawable-v26/sc_superuser.xml
View File

@ -6,4 +6,9 @@
android:drawable="@drawable/ic_superuser" android:drawable="@drawable/ic_superuser"
android:inset="30%" /> android:inset="30%" />
</foreground> </foreground>
</adaptive-icon> <monochrome>
<inset
android:drawable="@drawable/ic_superuser"
android:inset="30%" />
</monochrome>
</adaptive-icon>