From 15610c8809fdca78171de7a7c7e8c5888f62c39e Mon Sep 17 00:00:00 2001 From: Diamond <33725716+DiamondMiner88@users.noreply.github.com> Date: Sun, 25 Sep 2022 13:06:11 -0700 Subject: [PATCH] feat: replace app icons (#25) * wip: patch app icons * chore: update deps * wrong axml version zt loves * Update app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt Co-authored-by: TymanWasTaken * guh hardcoding is just easier for now * guhhh stupit auto rename Co-authored-by: TymanWasTaken --- app/build.gradle.kts | 9 +++---- app/src/main/assets/icon2.png | Bin 3961 -> 0 bytes .../ic_logo_foreground.png} | Bin app/src/main/assets/icons/ic_logo_round.png | Bin 0 -> 4628 bytes app/src/main/assets/icons/ic_logo_square.png | Bin 0 -> 4571 bytes .../domain/manager/PreferencesManager.kt | 2 +- .../manager/ui/screen/SettingsScreen.kt | 4 +-- .../manager/ui/viewmodel/InstallViewModel.kt | 23 +++++++++++++++++- build.gradle.kts | 3 ++- 9 files changed, 31 insertions(+), 10 deletions(-) delete mode 100644 app/src/main/assets/icon2.png rename app/src/main/assets/{icon1.png => icons/ic_logo_foreground.png} (100%) create mode 100644 app/src/main/assets/icons/ic_logo_round.png create mode 100644 app/src/main/assets/icons/ic_logo_square.png diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 341d4c4..d00cbd2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -72,7 +72,7 @@ dependencies { // AndroidX implementation("androidx.core:core-ktx:1.9.0") implementation("androidx.core:core-splashscreen:1.0.0") - implementation("androidx.activity:activity-compose:1.6.0-rc02") + implementation("androidx.activity:activity-compose:1.6.0") implementation("androidx.paging:paging-compose:1.0.0-alpha16") // Compose @@ -80,7 +80,7 @@ dependencies { implementation("androidx.compose.ui:ui:$composeVersion") implementation("androidx.compose.ui:ui-tooling:$composeVersion") implementation("androidx.compose.material:material-icons-extended:$composeVersion") - implementation("androidx.compose.material3:material3:1.0.0-beta02") + implementation("androidx.compose.material3:material3:1.0.0-beta03") // accompanist dependencies val accompanistVersion = "0.26.3-beta" @@ -105,8 +105,7 @@ dependencies { implementation("org.bouncycastle:bcpkix-jdk15on:1.70") implementation("com.android:zipflinger:8.0.0-alpha01") // implementation("com.github.Aliucord:libzip:1.0.0") - @Suppress("GradleDependency") - implementation("de.upb.cs.swt:axml:2.1.1") // 2.1.3 is broken btw - implementation("com.android.tools.build:apksig:7.4.0-alpha10") + implementation("com.aliucord:axml:1.0.1") + implementation("com.android.tools.build:apksig:7.4.0-beta01") implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.0") } diff --git a/app/src/main/assets/icon2.png b/app/src/main/assets/icon2.png deleted file mode 100644 index 7d8a5dd6a818b51ea755a55730781ca2a2c5127f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3961 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 z zeV?0E7iRKm>`;?`K=nocpmW`YE050IIXEzOBtcO!Q(^fI^5M&#UMBa(i&8UpdbywL zY;PWQ%HBiyXb#R&kPd-uy}T@nUv4=kD}A8Rns~2$+{d;@v;M@x%gCHNRwC{_KaQItlKl1H} z>~b;n{jQHT2iL!RR;>&~#1xTH_2x5D^-6u+J@}1}D;qXV2g@kPqXu(4bEtVAPjxA! zw0X~UI=Oe{)4;3ob<v@0T7`fCOm@ zFow-ZG=|MQ*M3rjv(Xa(BxOy`21_6Y5AIL#>B0mnd)}37-)h n3xf6aan1mzpfO|J)(OR3@!oz4U&}~v`2k+;es0B!gSY+@vs+yZ literal 0 HcmV?d00001 diff --git a/app/src/main/assets/icons/ic_logo_square.png b/app/src/main/assets/icons/ic_logo_square.png new file mode 100644 index 0000000000000000000000000000000000000000..fc0090fdcfe9a729921f00568c64c904917b7b51 GIT binary patch literal 4571 zcmbVQ2{=@3`L%!m*vvTr4kP>sZE>3vBg zEf_^*$<|`2tQC=pWa~SmuD%!pR;1^xHHgR0ID9ORWElzQCW;)}oQAApRI)Oy< zBCCf61cGP|4g=%RKmyT^%mlp1J`}2<{LJlp@&JWoDDR|=hvNe=WM2w4j81k4vvDMb z`4RO<^2SDhK`06o5I|-UfY1PcDgza2D8DWj1&-IqFnM4d!t^tgH(gT*IOA;r42@0( zkm_(K5e`QHI(q6FNG&ZSTn#|L5pWn>8>WGPY9LW?EtG~1uyM$P+UO*2l)ah7hA!~U zP~Mlx3`D_TAt52^A)4wmx(`f4Pfrg9N5BvWD2RYEj!~I}P$-q5@Kb^rnL(se0+|#V z6gf4C43_)9F6u@NRPV6ad^AWTCYzUI<8kVO223k;_FuPY}JVPt=D z0GY~UfLM)R*g#(zlg99+{U4%#P5+YuFtm95FCBktOF+Oc6%3~NQP7Qzfc!0*;dm^N z46`RQXu)(M+59MIrox&xfhY`}OkmRJjx?J8&xNx6X)=J&P)7iJoG4ThErg-+8w1&l zz$6>WgR6#s!u6mCEl0R63a*3F)`fz1IQ$0`Pa{#hkNq1|LldP1N3C)G1_e`wL|_vB zE0{z?dDG|t1khnh0Ktb03#9tU1HZzE!qEI_bWky9o#yX!90p@cr+HKS!3l=FB^tn) zV~`qpNF)@YuCZ<|9*@FN8B79|NXD5N%7ejCr%*^J0+OVoOVmI@kq9^ustMQfhU)1O zb)f_#5j+VC%+ku7`&DOKlw@jPyYRM3Rr>!|NmLeT4Ao`4hlhz;>2gF^p9Ui^SDXx_{a0-bE?14iq= z<{b<)9=2AnKm36GtBdP%zZLgSIJjf14S#J_;LESgj!Xr2I6AnMiF-8_b8raw;mk}O zLtlQ#3%7Q3l6jb+sx8QB!I*O&GL@-YI9M3O)%Nm1uS%bHf7^TY3VVEcg=x}(7e$mq zr3?4VKX{dUkuf?{X`(Q62`;uvoZY?M@As(5$cL&Jk9?&9MmX}NQ+WY$@Gq&+swV@VuDcd- zPTt!4k{^PN^nyB!`+2MF&}oQDPh)AN+4jCLs0h=ZxT%fTTevaLgXq2Kyia-uz5kw5 zwe@>Ztl#I{5Mw*zh~ecHh;o-f7a?bCOuznK`rc(-S}r6fHTODM=t-=J{~cV44WN*@ zch~1oRwyw=9MGZ7$d$@_J-)6nIcTJ=1}_-8?$j zX>@5WA*eCsSpD6J4)&@Chh)InZvwZ_HYc^e97G>GO-%S(0=Efd;2fIv-~T z{l`eyeZui(d1`~`(2*-RO@aPN?O;fJ%o&LrP<2HfPD2L>%8t12 z+pGdl4}*U=H|FY}mRC3DEOSbs=buPRamqQO(p%Nizv$H%$;5P7B~=!5d|+`lA1Yeb zBxp}%yzP8mHS@^1_pu6O3rtn)mDZ%R{nAB~?1jscF(j9did81(p1NpYPG4T?&Bs4h zfY5!?T8qYnc|NzxoW(x|Y%RWTYZdhZAi{SY`KJB68cVVuuhxJIJ*UneL4B$z!E-havE{O7 ze!I4BQV$f;nC5e>>j^h{aq7jKfopWS(PNuO?`SziUH;sS3uCh-S{RVFmn4=Of=U`3 ziIwELQ5yB~bV<-#bcfAVDZZF5E^_d^bKbil4`AjgUQ?gWN%#JB?b@iH|^2LbUp*lD;%*L$qFjZPZx;dMNU4BA& zJ~PMFgN6^8U3%8<(6>LYp`H|#RY}KS8eT?zOSEkJkO6^3dZf+K<{5e-=ahBEIH^zX2oKrUnrz| zd*+}5P+Q{=?dPfQhsv4J3yLP@#>+mbdTk$MjbG;)MfpoY&OZQoRT-FV|4;feCzcD=2b&5C1Ij$hP zGR1M6Ev*!VGryD}F?41~(#SM^(H|71JLQ>`y<%{N_iA#1+AI)Paj@2-=Ifzen5=Qe zyI%dHgSF4cT!f^!h6DMNA1&;LKSnIIOkEW@)ma)Fm)9Xx*ZwKos#4U$!AS=10tiYm zecxDAjc+Mu;dVB+ENl-(rt}#WLHt5vM_z%0_PYvHC#JFjmy5)gvqaQ zfiq}N!>Z2KJMMNkE%WFFYwo8|wl5#sXM5aqk4I2z_7}m@#C|!uOS(m#?0z_KoAYJt3AChygg>BFGYZOeABywpL)2uTtqsSBerdg#!7!l zl$*RTv-^c85G2MzoNpnB+mYr=Iw<98pyoInAgo%`v`3w0$Sn7Y9d&n#$l~HvQ+;xI z?j-66=j=d&>B-LP0=Js)`V=nTI^Q0aHhi*Dx9OOD6<@jU2 za@T>XxQSI6^n7ok*gh-UVqP{u`a&W`Z7O3Jf;&EpKBY@T6zWRh@qmkrg_7=#qW6AI ziHP#Hnb1&F_nlbw<+?2W(!Gr4!Q%FQ24eYm`(KtPhI1Qxq3OkTrsb65{RR04te(B(`YW~$T@5V&hs^6^u6~{P}O5;>ayv6R6Z9e*wRD)XFs?Xa~4VqeZ zi+^I}+1)J}FRQK_oV3{=UcaTI$Lu>&32E}V-tE1?lv-F#Q!#JML`DfuVu&UH z;X3)FBZyufLU@YpfqHR_`C%pLwQgYNnkKn2c zzBdx{R7|@kY6@Pi+$Np=`Hz6VMsxr8Rxg)1{CT@$)n3+wh>mMy&Sat zcDGu_QKQh;!Icj(UqzGzo@h8$!|Rmn{vKoa@z3q?m@|`CEUs8HW+uNhDK)1F&dZKA zwJ0}8o_R6)%pG>ep}SNI-2{HJ6*i0O2TO9xjB_SLIhQzGtK#PnD$SN=coXkVrsV>I z$Pz#MdL@+o4lvfn^4NZcoExz*_S6ywO8|_}9aFcOP zZl;!IbX(nfZ~6(s7n#1foA9*CtB8&daW;_BmI;1$V#|c&jNSg_{2lZ8Z8CX7A%&T6 zv%Hn=S3q?7J8n5*AC9FmHf>p^e?HEn@xYRzQbLJ^ng>?{XHoSZy58k~7`eT3ZFs}f z~%>L z#bR~m1>A4LRg)i?GmRb=Tklc#c%3!92Mg3mm+W1RpHQF8DHNK>NiOP1?T|e8cArFx z9g91IFg<25iaN9JTwl3qepzh|bJ8kdIuBvzhia@Fv)_LpRTTJsN(E3o%I2IHxe&G$W{Fs& zVe=s)qdRdeFI?;*dY1I1M0d^cj%M#sOUhmhHL+iMJ=QYPjrKZOc0Zkkh-RBDeORTT z1Otx9*5^BCBn<7O-7UPR_E3~7Y@pEn0lHeqBURC5Zt)UM^^-;UzxLg~x7j~>=e3Uf qZ~E?^CAvQKH$D3A%;`^}HtjOHe`MgaNi+EOg#%}9V^)DaeDWVtc6Mk0 literal 0 HcmV?d00001 diff --git a/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt b/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt index 28ae2d0..da8345d 100644 --- a/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt +++ b/app/src/main/kotlin/com/aliucord/manager/domain/manager/PreferencesManager.kt @@ -8,7 +8,7 @@ import com.aliucord.manager.ui.theme.Theme class PreferencesManager(preferences: SharedPreferences) : BasePreferenceManager(preferences) { var theme by enumPreference("theme", Theme.SYSTEM) var dynamicColor by booleanPreference("dynamic_color", true) - var replaceBg by booleanPreference("replace_bg", true) + var replaceIcon by booleanPreference("replace_icon", true) var devMode by booleanPreference("dev_mode", false) var debuggable by booleanPreference("debuggable", false) var useDexFromStorage by booleanPreference("use_dex_from_storage", false) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt index 079f21b..1b22757 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/screen/SettingsScreen.kt @@ -92,9 +92,9 @@ fun SettingsScreen( GroupHeader(stringResource(R.string.advanced)) SwitchSetting( - checked = preferences.replaceBg, + checked = preferences.replaceIcon, title = { Text(stringResource(R.string.replace_bg)) }, - onCheckedChange = { preferences.replaceBg = it }, + onCheckedChange = { preferences.replaceIcon = it }, icon = { Icon(Icons.Default.AppShortcut, null) } ) diff --git a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt index 847ec00..cfc142c 100644 --- a/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt +++ b/app/src/main/kotlin/com/aliucord/manager/ui/viewmodel/InstallViewModel.kt @@ -16,7 +16,6 @@ import com.aliucord.manager.domain.repository.GithubRepository import com.aliucord.manager.installer.service.InstallService import com.aliucord.manager.installer.util.ManifestPatcher import com.aliucord.manager.installer.util.Signer -import com.aliucord.manager.network.service.GithubService import com.aliucord.manager.ui.screen.InstallData import com.android.zipflinger.* import kotlinx.coroutines.* @@ -195,6 +194,28 @@ class InstallViewModel( val apks = arrayOf(baseApkFile, libsApkFile, localeApkFile, xxhdpiApkFile) + if (preferences.replaceIcon) { + log += "Replacing App Icons... " + + ZipArchive(baseApkFile.toPath()).use { baseApk -> + val mipmaps = arrayOf("mipmap-xhdpi-v4", "mipmap-xxhdpi-v4", "mipmap-xxxhdpi-v4") + val icons = arrayOf("ic_logo_foreground.png", "ic_logo_square.png", "ic_logo_foreground.png") + + for (icon in icons) { + val newIcon = application.assets.open("icons/$icon") + .use { it.readBytes() } + + for (mipmap in mipmaps) { + val path = "res/$mipmap/$icon" + baseApk.delete(path) + baseApk.add(BytesSource(newIcon, path, Deflater.DEFAULT_COMPRESSION)) + } + } + } + + log += "Done\n" + } + log += "Patching manifest... " try { diff --git a/build.gradle.kts b/build.gradle.kts index 71ed25d..86c65bd 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -14,7 +14,8 @@ allprojects { repositories { google() mavenCentral() - maven(url = "https://jitpack.io") + maven("https://jitpack.io") + maven("https://maven.aliucord.com/snapshots") } }