Skip to content

Commit

Permalink
2.1.0
Browse files Browse the repository at this point in the history 
Add <a href="https://github.com/AbdurazaaqMohammed/AntiSplit-M/pull/98#issuecomment-2395248297">Vietnamese translation</a> by @Orecahaha
Clean up unused dependencies and images
Improve searchbar buttons in installed apps list and unify across all themes
Add border to dialog in black theme for clarity
Allow searching by package name in installed apps list
Add version name to filename when picking from installed apps

Co-Authored-By: Orecahaha <[email protected]>
  • Loading branch information
@AbdurazaaqMohammed @Orecahaha
AbdurazaaqMohammed and Orecahaha committed Oct 7, 2024
1 parent 491ca99 commit 13b7873
Show file tree
Hide file tree
Showing 28 changed files with 292 additions and 315 deletions.
7 changes: 2 additions & 5 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ android {
minSdk = 21
targetSdk = 35
versionCode = 38
versionName = "2.0.9"
versionName = "2.1.0"
}

buildTypes {
Expand All @@ -36,9 +36,6 @@ android {
implementation("org.apache.commons:commons-compress:1.24.0")
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.2")
implementation("androidx.appcompat:appcompat:1.7.0")
implementation("androidx.core:core-ktx:1.13.1")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
implementation("androidx.coordinatorlayout:coordinatorlayout:1.2.0")
implementation("com.google.android.material:material:1.12.0")
}
}
}
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
android:theme="@style/Theme.Material3.DayNight.NoActionBar"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:largeHeap="true">
<activity
Expand Down
Binary file removed app/src/main/ic_launcher-playstore.png
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/AppListArrayAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ protected FilterResults performFiltering(CharSequence constraint) {
List<AppInfo> filteredItems = new ArrayList<>();
String filterPattern = constraint.toString().toLowerCase().trim();
for (AppInfo appInfo : originalAppInfoList) {
if (appInfo.name.toLowerCase().contains(filterPattern)) {
if (appInfo.name.toLowerCase().contains(filterPattern) || appInfo.packageName.toLowerCase().contains(filterPattern)) {
filteredItems.add(appInfo);
}
}
Expand Down
141 changes: 55 additions & 86 deletions app/src/main/java/com/abdurazaaqmohammed/AntiSplit/main/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import android.content.res.Configuration;
import android.content.res.Resources;
import android.database.Cursor;
import android.graphics.Color;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Build;
Expand All @@ -36,12 +37,14 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.view.Window;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.CompoundButton;
import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.ListView;
import android.widget.PopupMenu;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.Toast;
Expand All @@ -53,7 +56,6 @@
import androidx.annotation.NonNull;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.view.WindowCompat;
import androidx.core.widget.NestedScrollView;

Expand Down Expand Up @@ -125,21 +127,19 @@ protected void onCreate(Bundle savedInstanceState) {
SharedPreferences settings = getSharedPreferences("set", Context.MODE_PRIVATE);
boolean dark = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES;
setTheme(theme = settings.getInt("theme", dark
? com.google.android.material.R.style.Theme_Material3_Dark_NoActionBar : com.google.android.material.R.style.Theme_Material3_Light_NoActionBar));
? com.google.android.material.R.style.Theme_Material3_Dark_NoActionBar : com.google.android.material.R.style.Theme_Material3_Light_NoActionBar));

DeviceSpecsUtil = new DeviceSpecsUtil(this);

setContentView(R.layout.activity_main);
if(theme == R.style.Theme_MyApp_Black) findViewById(R.id.main).setBackgroundColor(Color.BLACK);
scrollView = findViewById(R.id.scrollView);
logField = findViewById(R.id.logField);
suffix = settings.getString("suffix", "_antisplit");
lang = settings.getString("lang", "en");
if(Objects.equals(lang, Locale.getDefault().getLanguage())) rss = getResources();
else updateLang(LocaleHelper.setLocale(MainActivity.this, lang).getResources(), null);
getWindow().addFlags(FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
int transparent = rss.getColor(android.R.color.transparent);
getWindow().setNavigationBarColor(transparent);
getWindow().setStatusBarColor(transparent);
if (!LegacyUtils.supportsWriteExternalStorage) {
EdgeToEdge.enable(this);
getWindow().setStatusBarContrastEnforced(true);
Expand Down Expand Up @@ -198,11 +198,10 @@ protected void onCreate(Bundle savedInstanceState) {
});
EditText searchBar = dialogView.findViewById(R.id.search_bar);

boolean black = theme == R.style.Theme_MyApp_Black;
View clearButton = dialogView.findViewById(R.id.clear_button);
clearButton.setVisibility(black ? View.VISIBLE : View.GONE);
if(black) clearButton.setOnClickListener(v -> searchBar.setText(""));
else dialogView.<TextInputLayout>findViewById(R.id.tilly).setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);
// if(theme == R.style.Theme_MyApp_Black)
clearButton.setOnClickListener(v -> searchBar.setText(""));
// else dialogView.<TextInputLayout>findViewById(R.id.tilly).setEndIconMode(TextInputLayout.END_ICON_CLEAR_TEXT);

searchBar.addTextChangedListener(new TextWatcher() {
@Override
Expand All @@ -212,6 +211,7 @@ public void beforeTextChanged(CharSequence s, int start, int count, int after) {

@Override
public void onTextChanged(CharSequence s, int start, int before, int count) {
clearButton.setVisibility(TextUtils.isEmpty(s) ? View.GONE : View.VISIBLE);
adapter.getFilter().filter(s);
}

Expand Down Expand Up @@ -244,7 +244,7 @@ public void afterTextChanged(Editable s) {
});

ad.setView(dialogView);
runOnUiThread(ad::show);
styleAlertDialog(ad);
});

findViewById(R.id.settingsButton).setOnClickListener(v -> {
Expand Down Expand Up @@ -329,27 +329,18 @@ public void afterTextChanged(Editable s) {

showDialogSwitch.setChecked(showDialog);
showDialogSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
showDialog = isChecked;
if(isChecked) {
selectSplitsForDevice = false;
selectSplitsAutomaticallySwitch.setChecked(false);
}
if(showDialog = isChecked) selectSplitsAutomaticallySwitch.setChecked(selectSplitsForDevice = false);
});

selectSplitsAutomaticallySwitch.setChecked(selectSplitsForDevice);
selectSplitsAutomaticallySwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
selectSplitsForDevice = isChecked;
if(isChecked) {
showDialog = false;
showDialogSwitch.setChecked(false);
}
if(selectSplitsForDevice = isChecked) showDialogSwitch.setChecked(showDialog = false);
});

CompoundButton askSwitch = settingsDialog.findViewById(R.id.ask);
askSwitch.setChecked(ask);
askSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
ask = isChecked;
if(!isChecked) checkStoragePerm();
if(!(ask = isChecked)) checkStoragePerm();
});

settingsDialog.findViewById(R.id.langPicker).setOnClickListener(v2 -> {
Expand All @@ -360,7 +351,7 @@ public void afterTextChanged(Editable s) {
updateLang(LocaleHelper.setLocale(this, lang = langs[which]).getResources(), settingsDialog);
dialog.dismiss();
}).create();
runOnUiThread(ad::show);
styleAlertDialog(ad);
ad.getListView().setAdapter(new ArrayAdapter<>(this, android.R.layout.select_dialog_singlechoice, display));
for (int i = 0; i < langs.length; i++) {
if (Objects.equals(lang, langs[i])) {
Expand All @@ -375,8 +366,8 @@ public void afterTextChanged(Editable s) {
title.setPadding(size,size,size,size);
title.setTextSize(size);
title.setGravity(Gravity.CENTER);
runOnUiThread(new MaterialAlertDialogBuilder(this).setCustomTitle(title).setView(settingsDialog)
.setPositiveButton(rss.getString(R.string.close), (dialog, which) -> dialog.dismiss()).create()::show);
styleAlertDialog(new MaterialAlertDialogBuilder(this).setCustomTitle(title).setView(settingsDialog)
.setPositiveButton(rss.getString(R.string.close), (dialog, which) -> dialog.dismiss()).create());
});

findViewById(R.id.decodeButton).setOnClickListener(v -> startActivityForResult(new Intent(Intent.ACTION_OPEN_DOCUMENT)
Expand All @@ -399,8 +390,7 @@ public void afterTextChanged(Editable s) {
if (uris != null) {
final Uri uri = uris.get(0);
String path = uri.getPath();
urisAreSplitApks = TextUtils.isEmpty(path) || !path.endsWith(".apk");
if(urisAreSplitApks) splitAPKUri = uri;
if(urisAreSplitApks = TextUtils.isEmpty(path) || !path.endsWith(".apk")) splitAPKUri = uri;
else selectDirToSaveAPKOrSaveNow();
}
}
Expand All @@ -410,6 +400,20 @@ public void afterTextChanged(Editable s) {
}
}

public void styleAlertDialog(AlertDialog ad) {
if(theme == R.style.Theme_MyApp_Black) {
Window w = ad.getWindow();
if(w != null) {
// final android.view.WindowManager.LayoutParams params = w.getAttributes();
w.setBackgroundDrawableResource(R.drawable.dialog_border);
//w.setAttributes(params);
//This aint working
// w.setLayout(params.width, params.height);
}
}
runOnUiThread(ad::show);
}

@Override
public void onConfigurationChanged(@NonNull Configuration newConfig) {
super.onConfigurationChanged(newConfig);
Expand All @@ -420,57 +424,11 @@ public void onConfigurationChanged(@NonNull Configuration newConfig) {
recreate();
} else if (currentNightMode == Configuration.UI_MODE_NIGHT_NO) {
setTheme(theme = com.google.android.material.R.style.Theme_Material3_Light_NoActionBar);

recreate();
}
}
}

// private void setupSwipe(FloatingActionButton fab) {
// LinearLayout fabs = findViewById(R.id.fabs);
// fab.setOnTouchListener(new View.OnTouchListener() {
// float dy = 0f;
// boolean isSwiped = false;
// boolean up = true;
//
// @Override
// public boolean onTouch(View v31, MotionEvent event) {
// switch (event.getAction()) {
// case MotionEvent.ACTION_DOWN:
// dy = event.getRawY();
// isSwiped = false;
// return false;
//
// case MotionEvent.ACTION_MOVE:
// float movement = event.getRawY() - dy;
// if (Math.abs(movement) > 10) {
// fabs.setTranslationY(v31.getTranslationY() + movement);
// dy = event.getRawY();
// isSwiped = true;
// return true;
// }
// return false;
//
// case MotionEvent.ACTION_UP:
// if (isSwiped) {
// if(up) {
// fabs.animate().translationY((float) (fabs.getHeight() * 0.9)).setDuration(300).start();
// up = false;
// } else fabs.animate().translationY(0f).setDuration(300).start();
// return true;
// } else {
// up = true;
// fabs.animate().translationY(0f).setDuration(300).start();
// }
// return false;
//
// default:
// return false;
// }
// }
// });
// }

public static Resources rss;

private void updateLang(Resources res, ScrollView settingsDialog) {
Expand Down Expand Up @@ -510,10 +468,9 @@ private void checkStoragePerm() {
}

public static boolean doesNotHaveStoragePerm(Context context) {
if (Build.VERSION.SDK_INT < 23) return false;
return LegacyUtils.supportsWriteExternalStorage ?
return Build.VERSION.SDK_INT > 22 && (LegacyUtils.supportsWriteExternalStorage ?
context.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_DENIED :
!Environment.isExternalStorageManager();
!Environment.isExternalStorageManager());
}

@Override
Expand Down Expand Up @@ -924,7 +881,7 @@ public void showApkSelectionDialog() {
checkedItems[i] = false;
}

runOnUiThread(new MaterialAlertDialogBuilder(this).setTitle(rss.getString(R.string.select_splits)).setMultiChoiceItems(apkNames, checkedItems, (dialog, which, isChecked) -> {
styleAlertDialog(new MaterialAlertDialogBuilder(this).setTitle(rss.getString(R.string.select_splits)).setMultiChoiceItems(apkNames, checkedItems, (dialog, which, isChecked) -> {
switch (which) {
case 0:
// "Select All" option
Expand Down Expand Up @@ -1006,7 +963,7 @@ public void showApkSelectionDialog() {
splitsToUse = splits;
selectDirToSaveAPKOrSaveNow();
}
}).setNegativeButton("Cancel", null).create()::show);
}).setNegativeButton("Cancel", null).create());
} catch (IOException e) {
showError(e);
}
Expand Down Expand Up @@ -1055,7 +1012,7 @@ private void showError(Exception e) {

((TextView) dialogView.findViewById(R.id.errorD)).setText(stackTrace);

AlertDialog alertDialog = new MaterialAlertDialogBuilder(this)
styleAlertDialog(new MaterialAlertDialogBuilder(this)
.setTitle(mainErr)
.setView(dialogView)
.setPositiveButton(rss.getString(R.string.copy_log), (dialog, which) -> {
Expand All @@ -1067,8 +1024,7 @@ private void showError(Exception e) {
dialog.dismiss();
})
.setNeutralButton(rss.getString(R.string.cancel), (dialog, which) -> dialog.dismiss())
.create();
alertDialog.show();
.create());
ScrollView scrollView = dialogView.findViewById(R.id.errorView);

ViewGroup.LayoutParams params = scrollView.getLayoutParams();
Expand Down Expand Up @@ -1112,11 +1068,24 @@ public static String getOriginalFileName(Context context, Uri uri) {

@SuppressLint("InlinedApi")
private void selectDirToSaveAPKOrSaveNow() {
if (ask) startActivityForResult(new Intent(Intent.ACTION_CREATE_DOCUMENT)
.addCategory(Intent.CATEGORY_OPENABLE)
.setType("application/vnd.android.package-archive")
.putExtra(Intent.EXTRA_TITLE, TextUtils.isEmpty(pkgName) ? (urisAreSplitApks ? getOriginalFileName(this, splitAPKUri) : getNameFromNonSplitApks()) : pkgName + suffix), 2);
else {
if (ask) {
String filename;
if(TextUtils.isEmpty(pkgName)) filename = (urisAreSplitApks ? getOriginalFileName(this, splitAPKUri) : getNameFromNonSplitApks());
else {
String versionName;
try {
versionName = " v" + getPackageManager().getPackageInfo(pkgName, 0).versionName;
} catch (Exception ignored) {
versionName = "";
}
filename = pkgName + versionName + suffix;
}

startActivityForResult(new Intent(Intent.ACTION_CREATE_DOCUMENT)
.addCategory(Intent.CATEGORY_OPENABLE)
.setType("application/vnd.android.package-archive")
.putExtra(Intent.EXTRA_TITLE, filename), 2);
} else {
checkStoragePerm();
try {
if(splitAPKUri == null) process(Uri.fromFile(new File(getAntisplitMFolder(), "output.apk")));
Expand Down
30 changes: 0 additions & 30 deletions app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View file

This file was deleted.

7 changes: 7 additions & 0 deletions app/src/main/res/drawable/dialog_border.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@android:color/black"/>
<stroke
android:width="2dp"
android:color="?attr/colorPrimary"/>
<corners android:radius="24dp"/>
</shape>
Loading

0 comments on commit 13b7873

Please sign in to comment.