Skip to content
This repository was archived by the owner on May 4, 2023. It is now read-only.

Commit d602197

Browse files
DerGooglerDerGoogler
authored
Merge branch 'Fox2Code:master' into master
2 parents 5340d61 + 6daa941 commit d602197

File tree

8 files changed

+176
-11
lines changed

8 files changed

+176
-11
lines changed

‎.github/workflows/build-debug.yml‎

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Generate APK Debug
2+
3+
on:
4+
# Triggers the workflow on push or pull request events but only for default and protected branches
5+
push:
6+
branches:
7+
- master
8+
- debug
9+
pull_request:
10+
branches:
11+
- master
12+
- debug
13+
jobs:
14+
build:
15+
16+
runs-on: ubuntu-latest
17+
18+
steps:
19+
- uses: actions/checkout@v1
20+
21+
- name: Set Up JDK
22+
uses: actions/setup-java@v1
23+
with:
24+
java-version: 11
25+
26+
- name: Change wrapper permissions
27+
run: chmod +x ./gradlew
28+
29+
- name: Run tests
30+
run: ./gradlew test
31+
32+
# Create APK Debug
33+
- name: Build apk debug
34+
run: ./gradlew app:assembleDefaultDebug
35+
36+
- name: Build apk fdroid-debug
37+
run: ./gradlew app:assembleFdroidDebug
38+
39+
# Upload Artifact Build
40+
# Noted For Output [module-name]/build/outputs/apk
41+
- name: Upload apk debug
42+
uses: actions/upload-artifact@v3
43+
with:
44+
name: FoxMmm-debug
45+
path: app/build/outputs/apk/default/debug/app-default-debug.apk
46+
47+
- name: Upload apk fdroid-debug
48+
uses: actions/upload-artifact@v3
49+
with:
50+
name: FoxMmm-fdroid-debug
51+
path: app/build/outputs/apk/fdroid/debug/app-fdroid-debug.apk

‎app/build.gradle‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "com.fox2code.mmm"
1111
minSdk 21
1212
targetSdk 32
13-
versionCode 36
14-
versionName "0.4.1"
13+
versionCode 37
14+
versionName "0.4.2"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
@@ -66,6 +66,7 @@ android {
6666
}
6767
lint {
6868
disable 'MissingTranslation'
69+
disable 'TypographyEllipsis'
6970
}
7071
}
7172

‎app/src/main/java/com/fox2code/mmm/settings/SettingsActivity.java‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,8 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
113113
.withLicenseShown(true).withAboutMinimalDesign(false)
114114
.withUiListener(new OverScrollManager.LibsOverScroll());
115115
Preference update = findPreference("pref_update");
116-
update.setVisible(BuildConfig.DEBUG ||
117-
AppUpdateManager.getAppUpdateManager().peekHasUpdate());
116+
update.setVisible(BuildConfig.ENABLE_AUTO_UPDATER && (BuildConfig.DEBUG ||
117+
AppUpdateManager.getAppUpdateManager().peekHasUpdate()));
118118
update.setOnPreferenceClickListener(p -> {
119119
devModeStep = 0;
120120
IntentHelper.openUrl(p.getContext(),
@@ -144,6 +144,10 @@ public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
144144
openFragment(libsBuilder.supportFragment(), R.string.licenses);
145145
return true;
146146
});
147+
findPreference("pref_pkg_info").setSummary(
148+
BuildConfig.APPLICATION_ID + " v" +
149+
BuildConfig.VERSION_NAME + " (" +
150+
BuildConfig.VERSION_CODE + ")");
147151
}
148152

149153
private void openFragment(Fragment fragment, @StringRes int title) {

‎app/src/main/res/values-pl/strings.xml‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources>
22
<string name="app_name">Fox - Menedżer modułów Magisk</string>
3-
<string name="app_name_short">Moduły Magisk</string>
3+
<string name="app_name_short">FoxMmm</string>
44
<string name="fail_root_magisk">Nie udało się uzyskać dostępu do Root lub Magisk</string>
55
<string name="loading">Wczytywanie…</string>
66
<string name="updatable">Aktualizowalne</string>
@@ -14,21 +14,21 @@
1414
<string name="app_update_available">Dostępna nowa wersja aplikacji</string>
1515
<string name="app_update">Aktualizuj</string>
1616
<string name="no_desc_found">Nie znaleziono opisu.</string>
17-
<string name="download_module">Pobierz moduł</string>
18-
<string name="install_module">Zainstaluj moduł</string>
19-
<string name="update_module">Aktualizuj moduł</string>
17+
<string name="download_module">Pobierz</string>
18+
<string name="install_module">Zainstaluj</string>
19+
<string name="update_module">Aktualizuj</string>
2020
<string name="changelog">Dziennik zmian</string>
21-
<string name="website">Strona WWW</string>
21+
<string name="website">Strona domowa</string>
2222
<string name="support">Wsparcie</string>
23-
<string name="donate">Wspomóż nas</string>
23+
<string name="donate">Przekaż darowiznę</string>
2424
<string name="submit_modules">Prześlij moduł</string>
2525
<string name="require_android_6">Wymaga Androida 6.0+</string>
2626

2727
<!-- Module section translation -->
2828
<string name="module_last_update">Ostatnia aktualizacja:</string>
2929
<string name="module_repo">Repozytorium:</string>
3030
<string name="module_by">autorstwa</string>
31-
<string name="module_downloads">Pliki do pobrania:</string>
31+
<string name="module_downloads">Pobrano:</string>
3232
<string name="module_stars">Gwiazdki:</string>
3333

3434
<!-- Preference Titles -->
@@ -93,4 +93,5 @@
9393
<string name="enable_blur_pref">Włącz rozmycie</string>
9494
<string name="repo_enabled">Repozytorium włączone</string>
9595
<string name="repo_disabled">Repozytorium wyłączone</string>
96+
<string name="androidacy_repo_info">Repo Androidacy korzysta z reklam i trackerów.</string>
9697
</resources>

‎app/src/main/res/values-ru/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,4 +93,5 @@
9393
<string name="enable_blur_pref">Включить эффект размытия</string>
9494
<string name="repo_enabled">Репо включен</string>
9595
<string name="repo_disabled">Репо отключен</string>
96+
<string name="androidacy_repo_info">Репо Androidacy использует рекламу и трекеры.</string>
9697
</resources>

‎app/src/main/res/values-tr/arrays.xml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<resources>
2+
<string-array name="theme_values_names">
3+
<item>Sistem</item>
4+
<item>Koyu</item>
5+
<item>Açık</item>
6+
</string-array>
7+
</resources>

‎app/src/main/res/values-tr/strings.xml‎

Lines changed: 95 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,95 @@
1+
<resources>
2+
<string name="app_name">Fox\'un Magisk Modül Yöneticisi</string>
3+
<string name="app_name_short">Fox\'un Mmy</string>
4+
<string name="fail_root_magisk">Kök ya da Magisk\'e erişim sağlanamadı.</string>
5+
<string name="loading">Yükleniyor...</string>
6+
<string name="updatable">Güncellenebilir</string>
7+
<string name="installed">Yüklendi</string>
8+
<string name="online_repo">Çevrimiçi Repo</string>
9+
<string name="showcase_mode">Uygulama kilit modunda</string>
10+
<string name="failed_download">Dosya indirilemedi.</string>
11+
<string name="slow_modules">Modüllerin açılışı çok uzun sürdü, bazı modülleri devre dışı bırakmayı düşünün</string>
12+
<string name="fail_internet">İnternete bağlanılamadı</string>
13+
<string name="title_activity_settings">AyarlarEtkinliği</string>
14+
<string name="app_update_available">Uygulama güncellemesi mevcut</string>
15+
<string name="app_update">Güncelle</string>
16+
<string name="no_desc_found">Açıklama bulunamadı.</string>
17+
<string name="download_module">Modül indir</string>
18+
<string name="install_module">Modül yükle</string>
19+
<string name="update_module">Modülü güncelle</string>
20+
<string name="changelog">Değişiklik günlüğü</string>
21+
<string name="website">Web sitesi</string>
22+
<string name="support">Destek</string>
23+
<string name="donate">Bağış yap</string>
24+
<string name="submit_modules">Bir modül gönder</string>
25+
<string name="require_android_6">Android 6.0+ gerekli</string>
26+
27+
<!-- Module section translation -->
28+
<string name="module_last_update">Son güncelleme:</string>
29+
<string name="module_repo">Repo:</string>
30+
<string name="module_by">tarafından</string>
31+
<string name="module_downloads">İndirmeler:</string>
32+
<string name="module_stars">Yıldızlar:</string>
33+
34+
<!-- Preference Titles -->
35+
<!-- Note: Lockdown mode used to be called showcase mode -->
36+
<string name="manage_repos_pref">Repoları yönet</string>
37+
<string name="showcase_mode_pref">Kilit modu</string>
38+
<string name="showcase_mode_desc">Kilit modu yöneticinin modüller üzerinde işlem yapmayı önler</string>
39+
<string name="pref_category_settings">Ayarlar</string>
40+
<string name="pref_category_info">Bilgi</string>
41+
<string name="show_licenses">Lisansları göster</string>
42+
<string name="licenses">Lisanslar</string>
43+
<string name="show_incompatible_pref">Desteklenmeyen modülleri göster</string>
44+
<string name="show_incompatible_desc">Metaveri\'ye bağlı olarak cihazınızla uyumlu olmayan modülleri gösterir</string>
45+
<string name="magisk_outdated">Magisk güncel değil!</string>
46+
<string name="pref_category_repos">Repolar</string>
47+
<string name="repo_main_desc">Magisk Modülleri barındıran repository</string>
48+
<string name="repo_main_alt">Daha az kısıtlamalara sahip bir Magisk-Modules-Repo\'ya alternatifi.</string>
49+
<string name="master_delete">Modül dosyalarını sil?</string>
50+
<string name="master_delete_no">Dosyaları sakla</string>
51+
<string name="master_delete_yes">Dosyaları sil</string>
52+
<string name="master_delete_fail">Modül dosyaları silinemedi</string>
53+
<string name="theme_pref">Tema</string>
54+
<string name="theme_mode_pref">Tema modu</string>
55+
<string name="module_id_prefix">Modül id: </string>
56+
<string name="install_from_storage">Depolamadan modül yükle</string>
57+
<string name="invalid_format">Seçilmiş modül geçersiz biçimde</string>
58+
<string name="local_install_title">Yerel yükleme</string>
59+
<string name="source_code">Kaynak kodu</string>
60+
<string name="magisk_builtin_module">Magisk yerleşik modülü</string>
61+
<string name="substratum_builtin_module">Substratum yerleşik modülü</string>
62+
<string name="force_dark_terminal_title">Terminal koyu modunu zorla</string>
63+
<string name="file_picker_failure">Şimdiki dosya seçicisi dosyaya erişemedi</string>
64+
<string name="remote_install_title">Uzaktan yükleme</string>
65+
<string name="file_picker_wierd">Dosya seçicisi standart olmayan bir yanıtı geri getirdi</string>
66+
<string name="use_magisk_install_command_pref">Magisk modül yükleme komutu kullan</string>
67+
<string name="use_magisk_install_command_desc">
68+
Test sırasında modül yükleme hata teşhis aracında sorunlar meydana geldi,
69+
bu yüzden o seçeneği geliştirici modunun arkasına gizledim, bunu etkinleştirmenizde sorumluluk size aittir!
70+
</string>
71+
<string name="dev_mode_enabled">Geliştirici modu etkin</string>
72+
<string name="force_english_pref">İngilizce dilini zorla</string>
73+
<string name="disable_low_quality_module_filter_pref">Düşük kalite modül filtresini devre dışı bırak</string>
74+
<string name="disable_low_quality_module_filter_desc">
75+
Bazı modüller metaveri\'lerini düzgün bir şekilde bildirmiyor, görsel hatalara neden oluyor,
76+
ve/veya modül kalitesini zayıf gösteriyor, devre dışı bırakmada sorumluluk size aittir!
77+
</string>
78+
<string name="dns_over_https_pref">Https üzerinden dns</string>
79+
<string name="dns_over_https_desc">
80+
Bazı durumlarda bağlantı sorunlarını düzeltebilir.
81+
(WebView için geçerli değildir)
82+
</string>
83+
<string name="disable_extensions_pref">Eklentileri devre dışı bırak</string>
84+
<string name="disable_extensions_desc">
85+
Fox\'un Mmy eklentilerini devre dışı bırakır; bu, modüllerin terminal eklentilerini kullanmasını önler; Eğer modül Fox\'un Mmy eklentilerini kötüye kullanırsa yararlıdır.
86+
</string>
87+
<string name="wrap_text_pref">Metni kaydır</string>
88+
<string name="wrap_text_desc">
89+
Tüm metni aynı satıra koymak yerine metni yeni bir satıra kaydırır.
90+
</string>
91+
<string name="enable_blur_pref">Bulanıklığı etkinleştir</string>
92+
<string name="repo_enabled">Repo etkin</string>
93+
<string name="repo_disabled">Repo devre dışı</string>
94+
<string name="androidacy_repo_info">Androidacy repo, reklam ve takipçiler kullanır.</string>
95+
</resources>

‎app/src/main/res/xml/root_preferences.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,5 +110,10 @@
110110
app:icon="@drawable/ic_baseline_info_24"
111111
app:title="@string/show_licenses"
112112
app:singleLineTitle="false" />
113+
<Preference
114+
app:key="pref_pkg_info"
115+
app:enabled="false"
116+
app:summary="@string/loading"
117+
app:singleLineTitle="false" />
113118
</PreferenceCategory>
114119
</PreferenceScreen>

0 commit comments

Comments
 (0)