* Decompile and recreate Soul Browser v1.4.85 with APK CI builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix CI build: include bundled google.jks and remove PR trigger The apktool build failed in CI because app/unknown/.../google.jks was excluded by the *.jks gitignore rule. Whitelist app-bundled JKS files and commit the missing resource. Also remove the redundant pull_request workflow trigger. Co-authored-by: KaKi87 <KaKi87@pm.me> * Change package ID to com.github.kaki87.soulbrowser Rename the application ID so the rebuilt APK can be installed alongside the original Soul Browser from Google Play. - Update AndroidManifest package, permissions, providers, and actions - Update R class references in smali (com/github/kaki87/soulbrowser/R) - Update shortcuts.xml targetPackage - Rename app label to "Soul Rebuild" for easy identification Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install compatibility: remove split APK metadata and bundle native libs The rebuilt APK still declared requiredSplitTypes and Play Store split metadata, causing Android to reject standalone installs as incompatible. - Remove requiredSplitTypes and split-related manifest meta-data - Merge native libs from all ABI splits with uncompressed storage - Page-align before signing for extractNativeLibs=false - Add .so to apktool doNotCompress list Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix install failure: use apksigner v2/v3 and bundle arm64 native libs Target SDK 36 requires APK Signature Scheme v2+, but jarsigner only produces v1 signatures, causing Android to reject the install. - Sign with apksigner (v1+v2+v3) instead of jarsigner - Add arm64-v8a native libraries from universal Soul Browser 1.4.79 - Set extractNativeLibs=true for reliable sideload installs - Commit stable debug keystore for consistent signatures across builds Co-authored-by: KaKi87 <KaKi87@pm.me> * Add committed debug keystore for consistent APK signatures Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix startup crash: use original classes2.dex desugar libraries Apktool recompiles smali_classes2 into a broken classes2.dex, causing ClassNotFoundException for j$.com.android.tools.r8.a at ML Kit init. Inject the original classes2.dex (Java 8+ desugar libs) after apktool build instead of using the recompiled version. Co-authored-by: KaKi87 <KaKi87@pm.me> * Fix missing drawable resources from density split APKs The base APK is an app bundle module; density-specific drawables like seek_thumb_nor_b live in config.xhdpi.apk and were missing after rebuild, causing Resources$NotFoundException at runtime. - Merge non-9-patch resources from split APKs before apktool build - Sync public.xml IDs from R smali only when backing files exist - Add 713 density-specific resource IDs to public.xml Co-authored-by: KaKi87 <KaKi87@pm.me> --------- Co-authored-by: Cursor Agent <cursoragent@cursor.com>
124 lines
4 KiB
Java
124 lines
4 KiB
Java
package com.google.android.material.drawable;
|
|
|
|
import android.content.res.ColorStateList;
|
|
import android.graphics.Outline;
|
|
import android.graphics.Path;
|
|
import android.graphics.PorterDuff;
|
|
import android.graphics.drawable.ColorDrawable;
|
|
import android.graphics.drawable.ColorStateListDrawable;
|
|
import android.graphics.drawable.Drawable;
|
|
import android.graphics.drawable.LayerDrawable;
|
|
import android.os.Build;
|
|
import androidx.annotation.DoNotInline;
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.RequiresApi;
|
|
import androidx.annotation.RestrictTo;
|
|
import java.util.Arrays;
|
|
|
|
@RestrictTo
|
|
/* loaded from: classes3.dex */
|
|
public final class DrawableUtils {
|
|
|
|
/* loaded from: classes3.dex */
|
|
public static class OutlineCompatL {
|
|
@DoNotInline
|
|
public static void a(@NonNull Outline outline, @NonNull Path path) {
|
|
outline.setConvexPath(path);
|
|
}
|
|
}
|
|
|
|
@RequiresApi
|
|
/* loaded from: classes3.dex */
|
|
public static class OutlineCompatR {
|
|
@DoNotInline
|
|
public static void a(@NonNull Outline outline, @NonNull Path path) {
|
|
outline.setPath(path);
|
|
}
|
|
}
|
|
|
|
public static Drawable a(Drawable drawable, Drawable drawable2, int i, int i2) {
|
|
if (drawable == null) {
|
|
return drawable2;
|
|
}
|
|
if (drawable2 == null) {
|
|
return drawable;
|
|
}
|
|
if (i == -1 && (i = drawable2.getIntrinsicWidth()) == -1) {
|
|
i = drawable.getIntrinsicWidth();
|
|
}
|
|
if (i2 == -1 && (i2 = drawable2.getIntrinsicHeight()) == -1) {
|
|
i2 = drawable.getIntrinsicHeight();
|
|
}
|
|
if (i > drawable.getIntrinsicWidth() || i2 > drawable.getIntrinsicHeight()) {
|
|
float f = i / i2;
|
|
if (f >= drawable.getIntrinsicWidth() / drawable.getIntrinsicHeight()) {
|
|
int intrinsicWidth = drawable.getIntrinsicWidth();
|
|
i2 = (int) (intrinsicWidth / f);
|
|
i = intrinsicWidth;
|
|
} else {
|
|
i2 = drawable.getIntrinsicHeight();
|
|
i = (int) (f * i2);
|
|
}
|
|
}
|
|
LayerDrawable layerDrawable = new LayerDrawable(new Drawable[]{drawable, drawable2});
|
|
layerDrawable.setLayerSize(1, i, i2);
|
|
layerDrawable.setLayerGravity(1, 17);
|
|
return layerDrawable;
|
|
}
|
|
|
|
public static Drawable b(Drawable drawable, ColorStateList colorStateList, PorterDuff.Mode mode) {
|
|
if (drawable == null) {
|
|
return null;
|
|
}
|
|
if (colorStateList != null) {
|
|
drawable = drawable.mutate();
|
|
if (mode != null) {
|
|
drawable.setTintMode(mode);
|
|
}
|
|
}
|
|
return drawable;
|
|
}
|
|
|
|
public static int[] c(int[] iArr) {
|
|
for (int i = 0; i < iArr.length; i++) {
|
|
int i2 = iArr[i];
|
|
if (i2 == 16842912) {
|
|
return iArr;
|
|
}
|
|
if (i2 == 0) {
|
|
int[] iArr2 = (int[]) iArr.clone();
|
|
iArr2[i] = 16842912;
|
|
return iArr2;
|
|
}
|
|
}
|
|
int[] copyOf = Arrays.copyOf(iArr, iArr.length + 1);
|
|
copyOf[iArr.length] = 16842912;
|
|
return copyOf;
|
|
}
|
|
|
|
public static ColorStateList d(Drawable drawable) {
|
|
if (drawable instanceof ColorDrawable) {
|
|
return ColorStateList.valueOf(((ColorDrawable) drawable).getColor());
|
|
}
|
|
if (Build.VERSION.SDK_INT >= 29 && (drawable instanceof ColorStateListDrawable)) {
|
|
return ((ColorStateListDrawable) drawable).getColorStateList();
|
|
}
|
|
return null;
|
|
}
|
|
|
|
public static void e(Outline outline, Path path) {
|
|
int i = Build.VERSION.SDK_INT;
|
|
if (i >= 30) {
|
|
OutlineCompatR.a(outline, path);
|
|
return;
|
|
}
|
|
if (i >= 29) {
|
|
try {
|
|
OutlineCompatL.a(outline, path);
|
|
} catch (IllegalArgumentException unused) {
|
|
}
|
|
} else if (path.isConvex()) {
|
|
OutlineCompatL.a(outline, path);
|
|
}
|
|
}
|
|
}
|