Skip to content

Fix duplicate mod checkboxes, add i18n (ru, de) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MisterGatto merged 2 commits into from
Apr 8, 2026
Merged

Fix duplicate mod checkboxes, add i18n (ru, de) #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f72d6d1
Fix duplicate mod checkboxes when process survives between launches
HugeFrog24 Apr 8, 2026
bd6ec7d
Add i18n support with Russian and German translations
HugeFrog24 Apr 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
android:allowBackup="true"
android:allowNativeHeapPointerTagging="false"
android:dataExtractionRules="@xml/data_extraction_rules"
android:localeConfig="@xml/locales_config"
android:extractNativeLibs="true"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/icon"
Expand Down
1 change: 1 addition & 0 deletions app/src/main/cpp/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@ Java_git_artdeell_skymodloader_MainActivity_settle(
jboolean _hideCanvasMenu
) {
fsel_setup(env);
Canvas::userLibs.clear();
Canvas::MainActivity = clazz;
Canvas::CeserverEnabled = _ceserver_enabled;
Canvas::hideCanvasMenu = _hideCanvasMenu;
Expand Down
24 changes: 12 additions & 12 deletions app/src/main/java/git/artdeell/skymodloader/AboutDialogHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,16 +31,16 @@ public static void show(Activity activity) {

LinearLayout timeline = dialog.findViewById(R.id.about_timeline);

addChapter(activity, timeline, "The Origin", "Built from scratch by two developers who love Sky.", true);
addPerson(activity, timeline, "artdeell", "Author", "artdeell", "https://github.com/artdeell");
addPerson(activity, timeline, "lukas0x1", "Author · retired", "lukas0x1", "https://github.com/lukas0x1");
addChapter(activity, timeline, activity.getString(R.string.about_chapter_origin), activity.getString(R.string.about_chapter_origin_sub), true);
addPerson(activity, timeline, "artdeell", activity.getString(R.string.role_author), "artdeell", "https://github.com/artdeell");
addPerson(activity, timeline, "lukas0x1", activity.getString(R.string.role_author_retired), "lukas0x1", "https://github.com/lukas0x1");
endChapter(timeline);

addChapter(activity, timeline, "The Present", "Currently keeping Canvas alive.", true);
addPerson(activity, timeline, "MisterGatto", "Maintainer", "MisterGatto", "https://github.com/MisterGatto");
addChapter(activity, timeline, activity.getString(R.string.about_chapter_present), activity.getString(R.string.about_chapter_present_sub), true);
addPerson(activity, timeline, "MisterGatto", activity.getString(R.string.role_maintainer), "MisterGatto", "https://github.com/MisterGatto");
endChapter(timeline);

addChapter(activity, timeline, "The Team", "Everyone who made Canvas better.", true);
addChapter(activity, timeline, activity.getString(R.string.about_chapter_team), activity.getString(R.string.about_chapter_team_sub), true);
addPerson(activity, timeline, "RomanChamelo", null, "RomanChamelo", "https://github.com/RomanChamelo");
addPerson(activity, timeline, "Kiojeen", null, "Kiojeen", "https://github.com/Kiojeen");
addPerson(activity, timeline, "Gxosty", null, "Gxosty", "https://github.com/gxosty");
Expand All @@ -51,15 +51,15 @@ public static void show(Activity activity) {
addPerson(activity, timeline, "alvindimas05", null, "alvindimas05", "https://github.com/alvindimas05");
endChapter(timeline);

addChapter(activity, timeline, "The Art", "The faces behind the visuals.", true);
addPersonCustomLink(activity, timeline, "Сон~", "Banner artwork", "VK ›", "https://vk.com/son583");
addPersonCustomLink(activity, timeline, "Dysis", "App icon", "TG ›", "https://t.me/Eliatshaha");
addChapter(activity, timeline, activity.getString(R.string.about_chapter_art), activity.getString(R.string.about_chapter_art_sub), true);
addPersonCustomLink(activity, timeline, "Сон~", activity.getString(R.string.role_banner_artwork), "VK ›", "https://vk.com/son583");
addPersonCustomLink(activity, timeline, "Dysis", activity.getString(R.string.role_app_icon), "TG ›", "https://t.me/Eliatshaha");
endChapter(timeline);

addChapter(activity, timeline, "The Community", "Join thousands of players who use Canvas every day.", false);
addChapter(activity, timeline, activity.getString(R.string.about_chapter_community), activity.getString(R.string.about_chapter_community_sub), false);
addCommunityCard(activity, timeline, "Discord", "https://discord.gg/FrHP57VRPs", "https://discord.gg/FrHP57VRPs");
addCommunityCard(activity, timeline, "English Telegram", "t.me/skyautowax", "https://t.me/skyautowax");
addCommunityCard(activity, timeline, "Russian Telegram", "t.me/skyruswax", "https://t.me/s/ruautowax");
addCommunityCard(activity, timeline, activity.getString(R.string.community_english_telegram), "t.me/skyautowax", "https://t.me/skyautowax");
addCommunityCard(activity, timeline, activity.getString(R.string.community_russian_telegram), "t.me/skyruswax", "https://t.me/s/ruautowax");
endChapter(timeline);

dialog.findViewById(R.id.thatgamecompanyLink).setOnClickListener(v ->
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/git/artdeell/skymodloader/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ private void copyToClipboard(String stackTrace) {
ClipData clip = ClipData.newPlainText("Stack Trace", stackTrace);
clipboard.setPrimaryClip(clip);
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.TIRAMISU) {
Toast.makeText(this, "Stack trace copied to clipboard", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_stack_trace_copied, Toast.LENGTH_SHORT).show();
}
}

Expand Down
14 changes: 6 additions & 8 deletions app/src/main/java/git/artdeell/skymodloader/SettingsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,10 @@ public void afterTextChanged(Editable s) {
} else {
startService(logcatIntent);
}
Toast.makeText(this, "Logcat monitoring enabled", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_logcat_enabled, Toast.LENGTH_SHORT).show();
} else {
stopService(logcatIntent);
Toast.makeText(this, "Logcat monitoring disabled", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_logcat_disabled, Toast.LENGTH_SHORT).show();
}
});

Expand Down Expand Up @@ -171,9 +171,7 @@ private void resetBootloaderToOriginal() {
.putBoolean("use_custom_bootloader", false)
.putInt("bootloader_version", -1)
.apply();
Toast.makeText(this,
"Reset applied. Original version will be extracted at the next launch.",
Toast.LENGTH_LONG).show();
Toast.makeText(this, R.string.toast_bootloader_reset, Toast.LENGTH_LONG).show();
}

private void copyBootloaderFromUri(Uri uri) {
Expand All @@ -199,7 +197,7 @@ private void copyBootloaderFromUri(Uri uri) {

Log.i(TAG, "Custom libBootloader.so copied: " + dest.length() / 1024 + " KB");
runOnUiThread(() -> Toast.makeText(this,
"✓ Custom libBootloader.so applied!",
R.string.toast_bootloader_applied,
Toast.LENGTH_LONG).show());

} catch (Exception e) {
Expand All @@ -220,7 +218,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}

private void executeClearAppData() {
Toast.makeText(this, "Clearing data...", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_clearing_data, Toast.LENGTH_SHORT).show();
new Thread(() -> {
int deletedFiles = 0;
int deletedDirs = 0;
Expand Down Expand Up @@ -250,7 +248,7 @@ private void executeClearAppData() {

runOnUiThread(() -> {
Toast.makeText(this,
"Cleared " + totalFiles + " files, " + totalDirs + " dirs\nRestarting...",
getString(R.string.toast_cleared_data, totalFiles, totalDirs),
Toast.LENGTH_LONG).show();
new android.os.Handler().postDelayed(() -> {
Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/java/git/artdeell/skymodloader/elfmod/ModManagerActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,10 +212,10 @@ public void setLogcatEnabled(boolean flag) {
} else {
startService(logcatIntent);
}
Toast.makeText(this, "Logcat monitoring enabled", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_logcat_enabled, Toast.LENGTH_SHORT).show();
} else {
stopService(logcatIntent);
Toast.makeText(this, "Logcat monitoring disabled", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_logcat_disabled, Toast.LENGTH_SHORT).show();
}
}

Expand Down Expand Up @@ -427,7 +427,7 @@ private void clearAppDataSelective() {
}

runOnUiThread(() -> {
Toast.makeText(this, "Data cleared. Restarting...", Toast.LENGTH_SHORT).show();
Toast.makeText(this, R.string.toast_data_cleared_restarting, Toast.LENGTH_SHORT).show();
new android.os.Handler().postDelayed(() -> {
Intent intent = getPackageManager().getLaunchIntentForPackage(getPackageName());
if (intent != null) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/about_dialog.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
android:id="@+id/thatgamecompanyLink"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Sky is made by thatgamecompany"
android:text="@string/sky_attribution"
android:textSize="11sp"
android:alpha="0.3"
android:padding="8dp"
Expand All @@ -93,7 +93,7 @@
android:id="@+id/dialog_info_close"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Close"
android:text="@string/close"
android:textSize="15sp"
android:textStyle="bold"
android:gravity="center"
Expand Down
22 changes: 11 additions & 11 deletions app/src/main/res/layout/dialog_clear_data.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="⚠️ Clear App Data"
android:text="@string/clear_data_title"
android:textSize="17sp"
android:textStyle="bold"
android:textColor="#FF4444"
Expand All @@ -19,7 +19,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="PRESERVED"
android:text="@string/clear_data_preserved"
android:textSize="11sp"
android:textStyle="bold"
android:textAllCaps="true"
Expand All @@ -36,43 +36,43 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✓ mods/"
android:text="@string/clear_data_mods"
android:textSize="13sp"
android:layout_marginBottom="2dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✓ Accounts/"
android:text="@string/clear_data_accounts"
android:textSize="13sp"
android:layout_marginBottom="2dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✓ config/"
android:text="@string/clear_data_config"
android:textSize="13sp"
android:layout_marginBottom="2dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✓ AccountAuthInfo.bin"
android:text="@string/clear_data_auth"
android:textSize="13sp"
android:layout_marginBottom="2dp" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✓ shared_prefs/user.xml"
android:text="@string/clear_data_prefs"
android:textSize="13sp" />

</LinearLayout>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="DELETED"
android:text="@string/clear_data_deleted"
android:textSize="11sp"
android:textStyle="bold"
android:textAllCaps="true"
Expand All @@ -84,7 +84,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="✕ Everything else"
android:text="@string/clear_data_everything_else"
android:textSize="13sp"
android:textColor="#FF4444"
android:alpha="0.8"
Expand All @@ -100,7 +100,7 @@
android:id="@+id/dialog_clear_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Annulla"
android:text="@string/cancel"
android:textSize="14sp"
android:alpha="0.5"
android:padding="8dp"
Expand All @@ -112,7 +112,7 @@
android:id="@+id/dialog_clear_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Clear"
android:text="@string/clear"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="#FF4444"
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/res/layout/dialog_custom_bootloader.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Custom libBootloader.so"
android:text="@string/custom_bootloader_title"
android:textSize="17sp"
android:textStyle="bold"
android:layout_marginBottom="4dp" />
Expand Down Expand Up @@ -45,14 +45,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Pick file"
android:text="@string/pick_file"
android:textSize="15sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Choose a custom libBootloader.so file from the storage to replace the current bootloader"
android:text="@string/pick_file_description"
android:textSize="12sp"
android:alpha="0.5"
android:layout_marginTop="2dp" />
Expand Down Expand Up @@ -90,14 +90,14 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Reset to original"
android:text="@string/reset_to_original"
android:textSize="15sp"
android:textStyle="bold" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Delete the custom file and re-extract the original from Sky's APK"
android:text="@string/reset_to_original_description"
android:textSize="12sp"
android:alpha="0.5"
android:layout_marginTop="2dp" />
Expand All @@ -117,7 +117,7 @@
android:id="@+id/dialog_bootloader_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Cancel"
android:text="@string/cancel"
android:textSize="13sp"
android:alpha="0.4"
android:layout_gravity="end"
Expand Down
10 changes: 5 additions & 5 deletions app/src/main/res/layout/dialog_x.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginBottom="10dp"
android:text="TITLE"
android:text="@string/dialog_title_placeholder"
android:textSize="20sp"
android:textStyle="bold" />

Expand Down Expand Up @@ -66,7 +66,7 @@
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:text="DESCRIPTION"
android:text="@string/dialog_description_placeholder"
tools:text="Description" />

<LinearLayout
Expand Down Expand Up @@ -101,7 +101,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="10dp"
android:text="0%"
android:text="@string/dialog_progress_zero"
android:textSize="15sp" />

</LinearLayout>
Expand All @@ -119,7 +119,7 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/buttons_3"
android:text="Cancel"
android:text="@string/cancel"
android:textAllCaps="false"
android:textColor="@color/white" />

Expand All @@ -130,7 +130,7 @@
android:layout_margin="10dp"
android:layout_weight="1"
android:background="@drawable/buttons_2"
android:text="NATRUAL"
android:text="@string/dialog_button_natural"
android:textAllCaps="false"
android:textColor="@color/black" />

Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/layout/mod_manager.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Mod Manager"
android:text="@string/mod_manager"
android:textColor="@color/text"
android:alpha="0.55"
android:textSize="12sp" />
Expand Down Expand Up @@ -195,7 +195,7 @@
android:layout_marginBottom="7dp"
android:background="@drawable/buttons"
android:gravity="center"
android:text="GOOGLE PLAY STORE | GLOBAL VERSION\nPLAY"
android:text="@string/launch_google_play"
android:textSize="12sp"
android:maxLines="2" />

Expand All @@ -216,7 +216,7 @@
android:layout_height="54dp"
android:background="@drawable/buttons"
android:gravity="center"
android:text="APP GALLERY | HUAWEI VERSION\nPLAY"
android:text="@string/launch_huawei"
android:textSize="12sp"
android:maxLines="2" />

Expand Down
Loading
Loading