From 8eb65196cb07a40823f315d6f2ee774c69ae9efc Mon Sep 17 00:00:00 2001 From: sadorowo Date: Wed, 20 Mar 2024 19:36:07 +0100 Subject: [PATCH] separate locales (avoid future conflicts) + rewrite github actions --- .github/workflows/android.yml | 35 ----- .github/workflows/deploy-store.yml | 79 ---------- .github/workflows/deploy-test.yml | 145 ------------------ .github/workflows/test.yml | 90 ----------- .../wulkanowy/ui/modules/more/MoreFragment.kt | 4 +- app/src/main/res/values-cs/mod_values.xml | 12 ++ .../main/res/values-cs/preferences_values.xml | 6 - app/src/main/res/values-da-rDK/mod_values.xml | 12 ++ app/src/main/res/values-da-rDK/strings.xml | 1 - app/src/main/res/values-de/mod_values.xml | 12 ++ .../main/res/values-de/preferences_values.xml | 5 - app/src/main/res/values-de/strings.xml | 1 - app/src/main/res/values-es-rES/mod_values.xml | 12 ++ app/src/main/res/values-es-rES/strings.xml | 1 - app/src/main/res/values-it-rIT/mod_values.xml | 12 ++ app/src/main/res/values-it-rIT/strings.xml | 1 - app/src/main/res/values-pl/mod_values.xml | 12 ++ .../main/res/values-pl/preferences_values.xml | 5 - app/src/main/res/values-pl/strings.xml | 1 - app/src/main/res/values-ru/mod_values.xml | 12 ++ .../main/res/values-ru/preferences_values.xml | 5 - app/src/main/res/values-ru/strings.xml | 1 - app/src/main/res/values-sk/mod_values.xml | 12 ++ .../main/res/values-sk/preferences_values.xml | 5 - app/src/main/res/values-uk/mod_values.xml | 12 ++ .../main/res/values-uk/preferences_values.xml | 5 - app/src/main/res/values-uk/strings.xml | 1 - app/src/main/res/values/arrays.xml | 28 ---- app/src/main/res/values/mod_values.xml | 46 ++++++ .../main/res/values/preferences_values.xml | 11 -- app/src/main/res/values/strings.xml | 4 - 31 files changed, 156 insertions(+), 432 deletions(-) delete mode 100644 .github/workflows/deploy-store.yml delete mode 100644 .github/workflows/deploy-test.yml delete mode 100644 .github/workflows/test.yml create mode 100644 app/src/main/res/values-cs/mod_values.xml create mode 100644 app/src/main/res/values-da-rDK/mod_values.xml create mode 100644 app/src/main/res/values-de/mod_values.xml create mode 100644 app/src/main/res/values-es-rES/mod_values.xml create mode 100644 app/src/main/res/values-it-rIT/mod_values.xml create mode 100644 app/src/main/res/values-pl/mod_values.xml create mode 100644 app/src/main/res/values-ru/mod_values.xml create mode 100644 app/src/main/res/values-sk/mod_values.xml create mode 100644 app/src/main/res/values-uk/mod_values.xml delete mode 100644 app/src/main/res/values/arrays.xml create mode 100644 app/src/main/res/values/mod_values.xml diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml index 0e27952a..4a0881d7 100644 --- a/.github/workflows/android.yml +++ b/.github/workflows/android.yml @@ -4,9 +4,6 @@ env: # The name of the main module repository main_project_module: app - # The name of the Play Store - playstore_name: Frogobox ID - on: push: branches: @@ -41,45 +38,13 @@ jobs: - name: Change wrapper permissions run: chmod +x ./gradlew - # Run Tests Build - - name: Run gradle tests - run: ./gradlew test - - # Run Build Project - - name: Build gradle project - run: ./gradlew build - - # Create APK Debug - - name: Build apk debug project (APK) - ${{ env.main_project_module }} module - run: ./gradlew assembleDebug - # Create APK Release - name: Build apk release project (APK) - ${{ env.main_project_module }} module run: ./gradlew assemble - # Create Bundle AAB Release - # Noted for main module build [main_project_module]:bundleRelease - - name: Build app bundle release (AAB) - ${{ env.main_project_module }} module - run: ./gradlew ${{ env.main_project_module }}:bundleRelease - - # Upload Artifact Build - # Noted For Output [main_project_module]/build/outputs/apk/debug/ - - name: Upload APK Debug - ${{ env.repository_name }} - uses: actions/upload-artifact@v3 - with: - name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) debug generated - path: ${{ env.main_project_module }}/build/outputs/apk/debug/ - # Noted For Output [main_project_module]/build/outputs/apk/release/ - name: Upload APK Release - ${{ env.repository_name }} uses: actions/upload-artifact@v3 with: name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - APK(s) release generated path: ${{ env.main_project_module }}/build/outputs/apk/release/ - - # Noted For Output [main_project_module]/build/outputs/bundle/release/ - - name: Upload AAB (App Bundle) Release - ${{ env.repository_name }} - uses: actions/upload-artifact@v3 - with: - name: ${{ env.date_today }} - ${{ env.playstore_name }} - ${{ env.repository_name }} - App bundle(s) AAB release generated - path: ${{ env.main_project_module }}/build/outputs/bundle/release/ \ No newline at end of file diff --git a/.github/workflows/deploy-store.yml b/.github/workflows/deploy-store.yml deleted file mode 100644 index 0195f3e5..00000000 --- a/.github/workflows/deploy-store.yml +++ /dev/null @@ -1,79 +0,0 @@ -name: Deploy release - -on: - release: - types: [ created ] - -jobs: - - deploy-google-play: - name: Google Play - runs-on: ubuntu-latest - timeout-minutes: 10 - environment: google-play - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 17 - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }} - - name: Decrypt keys - env: - ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }} - SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }} - run: | - gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/google-services.json.gpg - gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg - - name: Upload apk to google play - env: - PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} - PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} - PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} - ANDROID_PUBLISHER_CREDENTIALS: ${{ secrets.ANDROID_PUBLISHER_CREDENTIALS }} - ADMOB_PROJECT_ID: ${{ secrets.ADMOB_PROJECT_ID }} - SINGLE_SUPPORT_AD_ID: ${{ secrets.SINGLE_SUPPORT_AD_ID }} - DASHBOARD_TILE_AD_ID: ${{ secrets.DASHBOARD_TILE_AD_ID }} - SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }} - run: ./gradlew publishPlayReleaseApps --stacktrace; - - deploy-app-gallery: - name: AppGallery - runs-on: ubuntu-latest - timeout-minutes: 10 - environment: app-gallery - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 17 - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }} - - name: Decrypt keys - env: - ENCRYPT_KEY: ${{ secrets.ENCRYPT_KEY }} - SERVICES_ENCRYPT_KEY: ${{ secrets.SERVICES_ENCRYPT_KEY }} - run: | - gpg --yes --batch --passphrase=$SERVICES_ENCRYPT_KEY ./app/src/release/agconnect-services.json.gpg - gpg --yes --batch --passphrase=$ENCRYPT_KEY ./app/upload-key.jks.gpg - - name: Prepare credentials - env: - AGC_CREDENTIALS: ${{ secrets.AGC_CREDENTIALS }} - run: echo $AGC_CREDENTIALS > ./app/src/release/agconnect-credentials.json - - name: Build and publish HMS version - env: - PLAY_STORE_PASSWORD: ${{ secrets.PLAY_STORE_PASSWORD }} - PLAY_KEY_ALIAS: ${{ secrets.PLAY_KEY_ALIAS }} - PLAY_KEY_PASSWORD: ${{ secrets.PLAY_KEY_PASSWORD }} - SET_BUILD_TIMESTAMP: ${{ secrets.SET_BUILD_TIMESTAMP }} - run: ./gradlew bundleHmsRelease --stacktrace && ./gradlew publishHuaweiAppGalleryHmsRelease --stacktrace diff --git a/.github/workflows/deploy-test.yml b/.github/workflows/deploy-test.yml deleted file mode 100644 index 42c1f8e7..00000000 --- a/.github/workflows/deploy-test.yml +++ /dev/null @@ -1,145 +0,0 @@ -name: Deploy DEV - -on: - push: -# branches: [ develop ] - branches: [ '!*' ] - pull_request_target: -# branches: [ develop ] - branches: [ '!*' ] - - workflow_dispatch: - -jobs: - - deploy-appcenter: - name: App Center - runs-on: ubuntu-latest - timeout-minutes: 10 - environment: app-center - steps: - - uses: actions/checkout@v3 - - uses: actions/setup-java@v3 - with: - distribution: 'zulu' - java-version: 17 - - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*') }} - - name: Set run number with offset - env: - BUILD_NUMBER_OFFSET: ${{ secrets.BUILD_NUMBER_OFFSET }} - run: echo "RUN_NUMBER=$((GITHUB_RUN_NUMBER+BUILD_NUMBER_OFFSET))" >> $GITHUB_ENV - - name: Prepare build configuration - run: | - sed -i -e "s#applicationIdSuffix \".dev\"#applicationIdSuffix \".${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/build.gradle - sed -i -e "s#.dev\"#.${GITHUB_HEAD_REF//[-.\/]/_}\"#" app/google-services.json - sed -i -e '/versionNameSuffix/d' app/build.gradle - - name: Add signing config - run: | - cat >> app/build.gradle <> $GITHUB_ENV - - name: Add signing config - run: | - cat >> app/build.gradle <(R.layout.fragment_more), val selectedItemsState = grades.map { grade -> hiddenGrades.any { it == grade } } MaterialAlertDialogBuilder(requireContext()) - .setTitle(R.string.pref_hidden_settings_bad_grades_title) + .setTitle(R.string.pref_hidden_settings_hide_grades_title) .setMultiChoiceItems(grades, selectedItemsState.toBooleanArray()) { _, _, _ -> } .setPositiveButton(android.R.string.ok) { dialog, _ -> val selectedState = (dialog as AlertDialog).listView.checkedItemPositions @@ -163,7 +163,7 @@ class MoreFragment : BaseFragment(R.layout.fragment_more), presenter.onHiddenSettingsSelected(selectedValues, inputAttendancePercentage) } .setNegativeButton(android.R.string.cancel) { _, _ -> } - .setNeutralButton(R.string.pref_hidden_settings_bad_grades_title) { _, _ -> showGradeDialog() } + .setNeutralButton(R.string.pref_hidden_settings_hide_grades_title) { _, _ -> showGradeDialog() } .show() } diff --git a/app/src/main/res/values-cs/mod_values.xml b/app/src/main/res/values-cs/mod_values.xml new file mode 100644 index 00000000..02b35b92 --- /dev/null +++ b/app/src/main/res/values-cs/mod_values.xml @@ -0,0 +1,12 @@ + + + Skrytá nastavení + Procento docházky + Skrýt známky + + + Špatná účast + Poznámky + Falešná účast + + diff --git a/app/src/main/res/values-cs/preferences_values.xml b/app/src/main/res/values-cs/preferences_values.xml index 50055d75..5e488e40 100644 --- a/app/src/main/res/values-cs/preferences_values.xml +++ b/app/src/main/res/values-cs/preferences_values.xml @@ -67,10 +67,4 @@ Zkoušky Setkání - - - Špatná účast - Poznámky - Falešná účast - diff --git a/app/src/main/res/values-da-rDK/mod_values.xml b/app/src/main/res/values-da-rDK/mod_values.xml new file mode 100644 index 00000000..1d61d6c8 --- /dev/null +++ b/app/src/main/res/values-da-rDK/mod_values.xml @@ -0,0 +1,12 @@ + + + Hidden settings + Attendance percentage + Hide grades + + + Bad attendance + Notes + Fake attendance + + diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 476dfe07..51275063 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -687,7 +687,6 @@ Grades Dashboard Tiles visibility - Hidden settings Attendance Timetable Grades diff --git a/app/src/main/res/values-de/mod_values.xml b/app/src/main/res/values-de/mod_values.xml new file mode 100644 index 00000000..5a9728c3 --- /dev/null +++ b/app/src/main/res/values-de/mod_values.xml @@ -0,0 +1,12 @@ + + + Geheime Einstellungen + Prozentuale Erwartung + Hide Grades + + + Schlechte Anwesenheit + Notizen + Vorgetäuschte 100-prozentige Anwesenheit + + diff --git a/app/src/main/res/values-de/preferences_values.xml b/app/src/main/res/values-de/preferences_values.xml index f76f206f..0170acfa 100644 --- a/app/src/main/res/values-de/preferences_values.xml +++ b/app/src/main/res/values-de/preferences_values.xml @@ -67,9 +67,4 @@ Prüfungen Sitzungen - - Schlechte Anwesenheit - Notizen - Vorgetäuschte 100-prozentige Anwesenheit - diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index af87fd92..7bc5aa99 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -710,7 +710,6 @@ Noten Dashboard Sichtbarkeit der Kacheln - Geheime Einstellungen Schulbesuch Stundenplan Noten diff --git a/app/src/main/res/values-es-rES/mod_values.xml b/app/src/main/res/values-es-rES/mod_values.xml new file mode 100644 index 00000000..1d61d6c8 --- /dev/null +++ b/app/src/main/res/values-es-rES/mod_values.xml @@ -0,0 +1,12 @@ + + + Hidden settings + Attendance percentage + Hide grades + + + Bad attendance + Notes + Fake attendance + + diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 476dfe07..51275063 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -687,7 +687,6 @@ Grades Dashboard Tiles visibility - Hidden settings Attendance Timetable Grades diff --git a/app/src/main/res/values-it-rIT/mod_values.xml b/app/src/main/res/values-it-rIT/mod_values.xml new file mode 100644 index 00000000..1d61d6c8 --- /dev/null +++ b/app/src/main/res/values-it-rIT/mod_values.xml @@ -0,0 +1,12 @@ + + + Hidden settings + Attendance percentage + Hide grades + + + Bad attendance + Notes + Fake attendance + + diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index 476dfe07..51275063 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -687,7 +687,6 @@ Grades Dashboard Tiles visibility - Hidden settings Attendance Timetable Grades diff --git a/app/src/main/res/values-pl/mod_values.xml b/app/src/main/res/values-pl/mod_values.xml new file mode 100644 index 00000000..b2fc8e65 --- /dev/null +++ b/app/src/main/res/values-pl/mod_values.xml @@ -0,0 +1,12 @@ + + + Sekretne ustawienia + Procent frekwencji + Ukryj oceny + + + Słaba frekwencja + Uwagi + Fałszywa frekwencja + + diff --git a/app/src/main/res/values-pl/preferences_values.xml b/app/src/main/res/values-pl/preferences_values.xml index 4528b7d1..4df60b51 100644 --- a/app/src/main/res/values-pl/preferences_values.xml +++ b/app/src/main/res/values-pl/preferences_values.xml @@ -67,9 +67,4 @@ Sprawdziany Zebrania - - Słaba frekwencja - Uwagi - Fałszywa frekwencja - diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index af9ce0c2..d1d603b6 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -804,7 +804,6 @@ Oceny Start Widoczność kafelków - Sekretne ustawienia Frekwencja Plan lekcji Oceny diff --git a/app/src/main/res/values-ru/mod_values.xml b/app/src/main/res/values-ru/mod_values.xml new file mode 100644 index 00000000..98474259 --- /dev/null +++ b/app/src/main/res/values-ru/mod_values.xml @@ -0,0 +1,12 @@ + + + Секретные настройки + Процент посещаемости + Скрыть оценки + + + Плохая посещаемость + Примечания + Фейковая посещаемость + + diff --git a/app/src/main/res/values-ru/preferences_values.xml b/app/src/main/res/values-ru/preferences_values.xml index 3bc4b7de..8d4bd8d7 100644 --- a/app/src/main/res/values-ru/preferences_values.xml +++ b/app/src/main/res/values-ru/preferences_values.xml @@ -67,9 +67,4 @@ Тесты Встречи - - Плохая посещаемость - Примечания - Фейковая посещаемость - diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index cf849eec..0e7e0e1d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -804,7 +804,6 @@ Оценки Главная Видимость плиток - Секретные настройки Посещаемость Расписание Оценки diff --git a/app/src/main/res/values-sk/mod_values.xml b/app/src/main/res/values-sk/mod_values.xml new file mode 100644 index 00000000..402ae178 --- /dev/null +++ b/app/src/main/res/values-sk/mod_values.xml @@ -0,0 +1,12 @@ + + + Skryté nastavenia + Percento dochádzky + Skryť známky + + + Zlá účasť + Poznámky + Falošná účasť + + diff --git a/app/src/main/res/values-sk/preferences_values.xml b/app/src/main/res/values-sk/preferences_values.xml index 655981d2..d78dd92d 100644 --- a/app/src/main/res/values-sk/preferences_values.xml +++ b/app/src/main/res/values-sk/preferences_values.xml @@ -67,9 +67,4 @@ Skúšky Stretnutie - - Zlá účasť - Poznámky - Falošná účasť - diff --git a/app/src/main/res/values-uk/mod_values.xml b/app/src/main/res/values-uk/mod_values.xml new file mode 100644 index 00000000..1e34afbc --- /dev/null +++ b/app/src/main/res/values-uk/mod_values.xml @@ -0,0 +1,12 @@ + + + Секретні налаштування + Відсоток відвідуваності + Приховати оцінки + + + Погана відвідуваність + Примітки + Фальшива явка + + diff --git a/app/src/main/res/values-uk/preferences_values.xml b/app/src/main/res/values-uk/preferences_values.xml index 07ee97e3..c32eedb9 100644 --- a/app/src/main/res/values-uk/preferences_values.xml +++ b/app/src/main/res/values-uk/preferences_values.xml @@ -67,9 +67,4 @@ Тести Зустрічі - - Погана відвідуваність - Примітки - Фальшива явка - diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 84c7a684..2d8ac1f4 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -804,7 +804,6 @@ Оцінки Головна Видимість плиток - Секретні налаштування Відвідуваність Розклад Оцінки diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml deleted file mode 100644 index dae941a4..00000000 --- a/app/src/main/res/values/arrays.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - 1 - 1+ - 2- - 2 - 2+ - 3- - 3 - 3+ - 4- - 4 - 4+ - 5- - 5 - 5+ - 6 - 6- - - - 1 - 1+ - 2- - 2 - 2+ - - diff --git a/app/src/main/res/values/mod_values.xml b/app/src/main/res/values/mod_values.xml new file mode 100644 index 00000000..4b2f1cec --- /dev/null +++ b/app/src/main/res/values/mod_values.xml @@ -0,0 +1,46 @@ + + + Hidden settings + Attendance percentage + attendance_percentage + Hide grades + + + Bad attendance + Notes + Fake attendance + + + BAD_ATTENDANCE + NOTES + ATTENDANCE + + + + 1 + 1+ + 2- + 2 + 2+ + 3- + 3 + 3+ + 4- + 4 + 4+ + 5- + 5 + 5+ + 6 + 6- + nb + 0 + + + 1 + 1+ + 2- + 2 + 2+ + + diff --git a/app/src/main/res/values/preferences_values.xml b/app/src/main/res/values/preferences_values.xml index 10862593..b588ea5e 100644 --- a/app/src/main/res/values/preferences_values.xml +++ b/app/src/main/res/values/preferences_values.xml @@ -174,15 +174,4 @@ EXAMS CONFERENCES - - - Bad attendance - Notes - Fake attendance - - - BAD_ATTENDANCE - NOTES - ATTENDANCE - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 6b02414c..56cf94f0 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -791,7 +791,6 @@ Grades Dashboard Tiles visibility - Hidden settings Attendance Timetable Grades @@ -879,9 +878,6 @@ Feature disabled by your school Feature not available. Login in a mode other than Mobile API This field is required - Attendance percentage - attendance_percentage - Bad grades Mute