From a5efbcef7c864b6fa44bf31571c66782abcdc5d0 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Mon, 19 Feb 2024 21:28:29 +0100 Subject: [PATCH 01/15] SDK VanillaIceCream Preview MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit New dependencies changes: • Update androidx.compose.ui:ui-tooling to 1.6.1 • Update androidx.navigation:navigation-fragment-(ktx) & ui-(ktx) to 2.7.7 • Update com.android.tools.build:gradle to 8.4.0-alpha10 • Update com.google.firebase:firebase-bom to 32.7.2 • Update com.google.firebase:firebase-messaging(-ktx) to 23.4.1 • Update com.google.firebase:firebase-analytics(-ktx) to 21.5.1 • Update com.google.gms:google-services to 4.4.1 Others Changes: • Update versionCode to 392001 (3.9.2) • Update compileSdkPreview to VanillaIceCream • Update buildToolsVersion to 35.0.0-rc1 • Update Gradle to 8.6 Signed-off-by: PahaAkos --- .github/workflows/buildCi.yml | 14 +++++++------- .github/workflows/buildPro.yml | 12 ++++++------ .github/workflows/buildRelease.yml | 10 +++++----- .github/workflows/deployToGoogle.yml | 16 ++++++++-------- .github/workflows/pullRequest.yml | 10 +++++----- .idea/misc.xml | 1 - app/build.gradle.kts | 6 +++--- gradle/libs.versions.toml | 20 ++++++++++---------- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 9 files changed, 46 insertions(+), 47 deletions(-) diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index e6996661..2bb39b66 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -22,20 +22,20 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Get Commit Message id: commitMessage run: IN="${{ github.event.head_commit.message }}" && echo "message=${IN%%$'\n'*}" >> $GITHUB_OUTPUT - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: java-version: 20 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -45,7 +45,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -66,7 +66,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleDebug @@ -85,7 +85,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 34.0.0 + buildToolsVersion: "35.0.0 rc1" - name: Delete old APK run: rm app/build/outputs/apk/debug/app-debug.apk @@ -94,7 +94,7 @@ jobs: run: mv app/build/outputs/apk/debug/app-debug-signed.apk app/build/outputs/apk/debug/app-debug.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index a630b0c0..43d4fb91 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -18,13 +18,13 @@ jobs: run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}" - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: java-version: 20 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -34,7 +34,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -47,7 +47,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assemblePro @@ -74,7 +74,7 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: 33.0.0 + buildToolsVersion: '35.0.0-rc1' - name: List files run: ls app/build/outputs/apk/pro @@ -83,7 +83,7 @@ jobs: run: mv app/build/outputs/apk/pro/app-pro-unsigned-signed.apk app/build/outputs/apk/pro/app-pro.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Release Artifact path: app/build/outputs/apk/pro/app-pro.apk diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 1a34c782..2d676846 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -24,14 +24,14 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Get Commit Message id: commitMessage run: IN="${{ github.event.head_commit.message }}" && echo "::set-output name=message::${IN%%$'\n'*}" - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: java-version: 20 distribution: temurin @@ -63,7 +63,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleRelease @@ -89,7 +89,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: 34.0.0 + buildToolsVersion: '35.0.0-rc1' - name: List files run: ls app/build/outputs/apk/release @@ -98,7 +98,7 @@ jobs: run: mv app/build/outputs/apk/release/app-release-unsigned-signed.apk app/build/outputs/apk/release/app-release.apk - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Release Artifact path: app/build/outputs/apk/release/app-release.apk diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml index 32cfd4f0..d5008e13 100644 --- a/.github/workflows/deployToGoogle.yml +++ b/.github/workflows/deployToGoogle.yml @@ -25,16 +25,16 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: java-version: 20 distribution: temurin - name: Cache Gradle dependencies - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ~/.gradle/caches @@ -44,7 +44,7 @@ jobs: restore-keys: ${{ runner.os }}-gradle- - name: Cache build cache - uses: actions/cache@v4.0.0 + uses: actions/cache@v4 with: path: | ${{ github.workspace }}/.ccache @@ -60,7 +60,7 @@ jobs: - name: Build Bundle id: buildBundle - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: bundleRelease @@ -75,10 +75,10 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - BUILD_TOOLS_VERSION: 33.0.0 + buildToolsVersion: '35.0.0-rc1' - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Artifact path: app/build/outputs/bundle/release/app-release.aab @@ -90,7 +90,7 @@ jobs: run: echo '${{ secrets.SERVICE_ACCOUNT_JSON }}' > service_account.json - name: Deploy to Production - uses: r0adkll/upload-google-play@v1.1.2 + uses: r0adkll/upload-google-play@v1.1.3 with: serviceAccountJson: service_account.json packageName: de.dertyp7214.rboardthememanager diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index 63a7913b..8dc4e187 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -23,10 +23,10 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26b + ndk-version: r26c - name: Setup JDK - uses: actions/setup-java@v4.0.0 + uses: actions/setup-java@v4 with: java-version: 20 distribution: temurin @@ -58,7 +58,7 @@ jobs: - name: Build apk id: buildAllApks - uses: gradle/gradle-build-action@v3.0.0 + uses: gradle/gradle-build-action@v3 with: gradle-version: wrapper arguments: assembleDebug @@ -73,13 +73,13 @@ jobs: echo "::set-output name=json::$content" - name: Upload Artifact - uses: actions/upload-artifact@v4.3.0 + uses: actions/upload-artifact@v4 with: name: Debug Artifact path: app/build/outputs/apk/debug/app-debug.apk - name: Check if release already exists - uses: mukunku/tag-exists-action@v1.5.0 + uses: mukunku/tag-exists-action@v1.6.0 id: checkTag env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/.idea/misc.xml b/.idea/misc.xml index 0a13859b..8e9caf3a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,4 +1,3 @@ - - \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts index c288f557..69705ccd 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -25,7 +25,7 @@ android { applicationId = "de.dertyp7214.rboardthememanager" minSdk = 31 targetSdk = 34 - versionCode = 392007 + versionCode = 392008 versionName = "3.9.2" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/res/drawable/ic_md3.xml b/app/src/main/res/drawable/ic_md3.xml new file mode 100644 index 00000000..47a54186 --- /dev/null +++ b/app/src/main/res/drawable/ic_md3.xml @@ -0,0 +1,18 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/raw/flags.json b/app/src/main/res/raw/flags.json index 7580ba86..2c6ecd04 100644 --- a/app/src/main/res/raw/flags.json +++ b/app/src/main/res/raw/flags.json @@ -1,5 +1,5 @@ { - "time": "1705418202551", + "time": "1714154132813", "flags": [ { "key": "general", @@ -12,7 +12,7 @@ { "key": "emoji_compat_app_whitelist", "title": "emoji_compat_app_whitelist", - "summary": "", + "summary": "emoji_compat_app_whitelist_details", "icon": "ic_emoji_compat", "defaultValue": false, "type": "BOOLEAN", @@ -79,7 +79,7 @@ { "key": "enable_sharing", "title": "enable_sharing", - "summary": "", + "summary": "enable_sharing_details", "icon": "ic_share", "defaultValue": false, "type": "BOOLEAN", @@ -100,7 +100,7 @@ { "key": "enable_email_provider_completion", "title": "enable_email_provider_completion", - "summary": "", + "summary": "enable_email_provider_completion_details", "icon": "ic_email", "defaultValue": false, "type": "BOOLEAN", @@ -119,7 +119,7 @@ { "key": "enable_key_border", "title": "enable_key_border", - "summary": "", + "summary": "enable_key_border_details", "icon": "ic_key_border", "defaultValue": false, "type": "BOOLEAN", @@ -128,7 +128,7 @@ { "key": "enable_secondary_symbols", "title": "enable_secondary_symbols", - "summary": "", + "summary": "enable_secondary_symbols_details", "icon": "ic_numeric", "defaultValue": false, "type": "BOOLEAN", @@ -137,7 +137,7 @@ { "key": "show_language_switch_key", "title": "show_language_switch_key", - "summary": "", + "summary": "show_language_switch_key_details", "icon": "ic_globe", "defaultValue": false, "type": "BOOLEAN", @@ -146,7 +146,7 @@ { "key": "show_suggestions", "title": "show_suggestions", - "summary": "", + "summary": "show_suggestions_details", "icon": "ic_alphabetical", "defaultValue": false, "type": "BOOLEAN", @@ -155,7 +155,7 @@ { "key": "keyboard_redesign_google_sans", "title": "keyboard_redesign_google_sans", - "summary": "", + "summary": "keyboard_redesign_google_sans_details", "icon": "ic_g_sans", "defaultValue": false, "type": "BOOLEAN", @@ -165,7 +165,7 @@ { "key": "branding", "title": "show_branding_on_space", - "summary": "show_branding_on_space", + "summary": "show_branding_on_space_details", "icon": "ic_google_logo", "defaultValue": false, "type": "BOOLEAN", @@ -230,6 +230,15 @@ } ] }, + { + "key": "material3_theme", + "title": "material3_theme", + "summary": "material3_theme_details", + "icon": "ic_md3", + "defaultValue": false, + "type": "BOOLEAN", + "file": "FLAGS" + }, { "key": "monet", "title": "monet", @@ -287,7 +296,7 @@ },{ "key": "silk", "title": "silk", - "summary": "silk_details", + "summary": "silk_popup_details", "icon": "ic_silk_popup", "defaultValue": false, "type": "BOOLEAN", @@ -319,7 +328,7 @@ { "key": "pill_shaped_key", "title": "pill_shaped_key", - "summary": "", + "summary": "pill_shaped_key_details", "icon": "ic_pill", "defaultValue": false, "type": "BOOLEAN", @@ -338,7 +347,7 @@ { "key": "enable_clipboard_screenshot_paste", "title": "enable_clipboard_screenshot_paste", - "summary": "", + "summary": "enable_clipboard_screenshot_paste_details", "icon": "ic_screenshot", "defaultValue": false, "type": "BOOLEAN", @@ -357,7 +366,7 @@ { "key": "enable_auto_float_keyboard_in_multi_window", "title": "enable_auto_float_keyboard_in_multi_window", - "summary": "", + "summary": "enable_auto_float_keyboard_in_multi_window_details", "icon": "ic_float", "defaultValue": false, "type": "BOOLEAN", @@ -386,7 +395,7 @@ { "key": "keyboard_redesign_forbid_key_shadows", "title": "keyboard_redesign_forbid_key_shadows", - "summary": "", + "summary": "keyboard_redesign_forbid_key_shadows_details", "icon": "ic_box_shadow", "defaultValue": false, "type": "BOOLEAN", diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 1c809d89..a860e3c3 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -55,7 +55,7 @@ Témák kicsomagolása Szeretné törölni ezeket a témákat? Előre telepített témák megjelenítése - Emoji kompatibilis javítás + Emoji Kompatibilis Javítás Gboard Zászlók Témák Rendszertéma megjelenítése @@ -63,11 +63,11 @@ Google ikon Megosztás Ikon Navigációs sáv szín - E-mail szolgáltató + E-mail Szolgáltató Popup v2 - Billentyű szegély - Másodlagos szimbólumok - Javaslatok megjelenítése + Billentyű Szegély + Másodlagos Szimbólumok + Javaslatok Megjelenítése Összes zászló megjelenítése Összes jelenleg beállított zászlót megjelenítése Minden zászló @@ -81,8 +81,8 @@ Általános Márkajelzés megjelenítése a szóközön Automatikus lebegő billentyűzet több ablakban - Pirula alakú billentyű - Vágólap képernyőkép beillesztése + Pirula Alakú Billentyű + Vágólap Képernyőkép Beillesztése Lens engedélyezése Márkajelzés A márkaintervallum másodperceinek megjelenítése @@ -163,7 +163,7 @@ Törli a zászlókat, és kényszeríti a Gboard bezárását. Zászlók javítva Zászlók másolva - Próbáljon meg a beállításokhoz menni, és kattintson a \\\"Zászlók javítása\\\" gombra. + Próbáljon meg a beállításokhoz menni, és kattintson a \"Zászlók javítása\" gombra. Úgy tűnik, hogy a zászlók sérültek Rendezés Dátum Szerint A zászlók alkalmazásához csak nyomja meg a vissza gombot @@ -264,7 +264,7 @@ Naplók oldal megnyitása Zászlók másolása \"flag_override.xml\"]]> - Alkalmazás Stílusa + Alkalmazás stílusa IME Teszt Rboard IME Teszt Új zászlókat találtunk. @@ -291,4 +291,20 @@ Téma Értékek Érték előtag Téma Váltó + Material3 Téma + Külön gomb megjelnítése a nyelvek közötti váltáshoz + Gépelés közben megjeleníti a javaslatsávot + Google márkajelzés megjelenítése a szóközön + Material3 Rendszer automatikus Sötét/világos billentyűzet téma + Pirula Alakú Billentyű Használata + Képernyőképek hozzáadása a Gboard vágólapjához a könnyebb beillesztés érdekében + Tiltott árnyék eltávolítása a kulcsról + Automatikus lebegő billentyűzet több ablakban + Megosztás Ikon Megjelenítése + Billentyű Szegély Használata + Másodlagos Szimbólumok Használata + A billentyűzet újratervezése Google Sans használatával + Selyem Popup Használata + Emoji Kompatibilis Javítás Használata + E-mail Szolgáltató Használata diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8c2b7118..302ad94c 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,7 +56,7 @@ Unpacking themes Do you want to delete these themes? Show preinstalled themes - Emoji compat fix + Emoji Compat Fix Gboard Flags Themes Show system theme @@ -64,11 +64,11 @@ Google icon Share Icon Navbar color - Email provider + Email Provider Popup v2 - Key border - Secondary symbols - Show suggestions + Key Border + Secondary Symbols + Show Suggestions Show all flags Shows all currently set flags All flags @@ -81,9 +81,10 @@ Android 12 General Show branding on space + Show Google branding on space Auto float Keyboard in multi window - Pill shaped key - Clipboard screenshot paste + Pill Shaped Key + Clipboard Screenshot Paste Enable lens Branding Show branding interval seconds @@ -291,4 +292,19 @@ Theme Values Value Prefix Theme Changer + Material3 Theme + Material3 System auto Dark/light keyboard theme + Show dedicated key to switch languages + Display suggestion strip while typing + Using Pill Shaped Key + Add screenshots to your Gboard clipboard for easier pasting + Remove a forbid shadow from the key + Automatic floating keyboard in multiple windows + Show Sharing Icon + Using Key Border + Using Secondary Symbols + Using Silk Popup + Using Keyboard Redesign Google Sans + Using Emoji Compat Fix + Using Email Provider \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts index a02f43c8..b652987c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ plugins { dependencies { classpath(libs.gradle) //noinspection DifferentKotlinGradleVersion - classpath(kotlin("gradle-plugin", version = "1.9.23")) + classpath(kotlin("gradle-plugin", version = "1.9.24")) classpath(libs.google.services) } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cc56b94f..d376d0db 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -4,46 +4,46 @@ de-PRDownloader = "v0.6.0" google-core = "2.1.0" google-core-ktx = "2.1.0" junit-junit = "4.13.2" -kotlinReflect = "1.9.23" +kotlinReflect = "1.9.24" ksp = "4.16.0" libsuVersion = "5.2.2" insetter = "0.6.1" -kotlin-stdlib = "1.9.23" -appcompat = "1.7.0-alpha03" +kotlin-stdlib = "1.9.24" +appcompat = "1.7.0-beta01" constraintlayout = "2.2.0-alpha13" preference-ktx = "1.2.1" activity-ktx = "1.9.0" -fragment-ktx = "1.6.2" +fragment-ktx = "1.7.0" lifecycle-viewmodel-ktx = "2.7.0" browser = "1.8.0" glide = "4.16.0" flagkit = "1.0.2" -firebase-bom = "32.8.1" -firebase-messaging-ktx = "23.4.1" -firebase-analytics-ktx = "21.6.2" +firebase-bom = "33.0.0" +firebase-messaging-ktx = "24.0.0" +firebase-analytics-ktx = "22.0.0" legacy-support-v4 = "1.0.0" navigation-fragment-ktx = "2.7.7" navigation-ui-ktx = "2.7.7" commons-text = "1.12.0" -core-ktx = "1.13.0" -core = "1.13.0" -material = "1.11.0" +core-ktx = "1.13.1" +core = "1.13.1" +material = "1.12.0" espresso-core = "3.5.1" android-shell = "1.0.0" -firebase-analytics = "21.6.2" -firebase-messaging = "23.4.1" +firebase-analytics = "22.0.0" +firebase-messaging = "24.0.0" gson = "2.10.1" protobufDynamic = "1.0.1" simple-item-decoration = "1.0.0" balloon = "1.6.4" -kspPlugin = "1.9.23-1.0.20" +kspPlugin = "1.9.24-1.0.20" dotsIndicator = "5.0" googleServices = "4.4.1" -gradle = "8.5.0-alpha06" -uiTooling = "1.6.6" -kotlin = "1.9.23" +gradle = "8.5.0-alpha08" +uiTooling = "1.6.7" +kotlin = "1.9.24" [libraries] prDownloader = { module = "de.dertyp7214:PRDownloader", version.ref = "de-PRDownloader" } diff --git a/rboardcomponents b/rboardcomponents index 4ed2d492..46caa643 160000 --- a/rboardcomponents +++ b/rboardcomponents @@ -1 +1 @@ -Subproject commit 4ed2d492b7064ecf77d75126c8eed03ecd206c97 +Subproject commit 46caa643b9c4afff9bd42ef87cb576ee11981c45 From 6a755ae5042296cbc6c736f403025df5609a3625 Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Thu, 9 May 2024 12:05:02 +0200 Subject: [PATCH 12/15] Suppress DEPRECATION --- .../rboardthememanager/screens/PreferencesActivity.kt | 2 ++ .../java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt | 2 ++ 2 files changed, 4 insertions(+) diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt index 06a39c76..b1e68aac 100644 --- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt +++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/PreferencesActivity.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package de.dertyp7214.rboardthememanager.screens import android.annotation.SuppressLint diff --git a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt index b0696e02..adcd0149 100644 --- a/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt +++ b/app/src/main/java/de/dertyp7214/rboardthememanager/screens/ShareFlags.kt @@ -1,3 +1,5 @@ +@file:Suppress("DEPRECATION") + package de.dertyp7214.rboardthememanager.screens import android.annotation.SuppressLint From c77e1e808970cc8902e726762118e2039e520f5d Mon Sep 17 00:00:00 2001 From: DerBot7214 <37804065+DerTyp7214@users.noreply.github.com> Date: Sun, 12 May 2024 02:47:27 +0200 Subject: [PATCH 13/15] Create clearCache.yml (#674) --- .github/workflows/clearCache.yml | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 .github/workflows/clearCache.yml diff --git a/.github/workflows/clearCache.yml b/.github/workflows/clearCache.yml new file mode 100644 index 00000000..8985f34c --- /dev/null +++ b/.github/workflows/clearCache.yml @@ -0,0 +1,29 @@ +name: cleanup caches by a branch +on: + pull_request: + types: + - closed + +jobs: + cleanup: + runs-on: ubuntu-latest + steps: + - name: Cleanup + run: | + gh extension install actions/gh-actions-cache + + echo "Fetching list of cache key" + cacheKeysForPR=$(gh actions-cache list -R $REPO -B $BRANCH -L 100 | cut -f 1 ) + + ## Setting this to not fail the workflow while deleting cache keys. + set +e + echo "Deleting caches..." + for cacheKey in $cacheKeysForPR + do + gh actions-cache delete $cacheKey -R $REPO -B $BRANCH --confirm + done + echo "Done" + env: + GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + REPO: ${{ github.repository }} + BRANCH: refs/pull/${{ github.event.pull_request.number }}/merge From b55c88eb9fc3f98b5759499b4682d20b6b7cc15b Mon Sep 17 00:00:00 2001 From: PahaAkos Date: Fri, 26 Jul 2024 23:27:51 +0200 Subject: [PATCH 14/15] Debug Release 3.9.3 (393000) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 🔧 New dependencies changes: • Update Activity(-ktx) to 1.9.1 • Update Androidx-junit to 1.2.1 • Update Appcompat to 1.7.0 • Update Balloon to 1.6.5 • Update Gradle to 8.7.0-alpha03 • Update Gson to 2.11.0 • Update Espresso-core to 3.6.1 • Update Firebase-bom to 33.1.2 • Update Firebase-analytics(-ktx) to 22.0.2 • Update Fragment-ktx to 1.8.2 • Update GoogleServices to 4.4.2 • Update Kotlin to 2.0.0 • Update Libsu to 6.0.0 • Update Lifecycle-viewmodel-ktx to 2.8.4 • Update Ui-tooling to 1.6.8 🗂️ Others Changes: • Update versionCode to 393000 (3.9.3) • Update compileSdk & targetSdk to 35 • Update buildToolsVersion to 35.0.0 • Update Gradle to 8.9 • Update Workflow File • Fix EdgeToEdge on Android 15 • Fix NavigationBar Color on all Android • Fix About activity crash when first opened without internet • Added Material3 Flag to flag activity --- .github/workflows/buildCi.yml | 4 +- .github/workflows/buildPro.yml | 2 +- .github/workflows/buildRelease.yml | 4 +- .github/workflows/deployToGoogle.yml | 4 +- .github/workflows/pullRequest.yml | 2 +- .idea/kotlinc.xml | 6 +- app/build.gradle.kts | 12 +-- .../rboardthememanager/Application.kt | 2 +- .../rboardthememanager/core/Shell.kt | 2 +- .../rboardthememanager/core/String.kt | 4 +- .../dialogs/NoRootDialog.kt | 11 +++ .../rboardthememanager/dialogs/UsageDialog.kt | 11 +++ .../rboardthememanager/preferences/About.kt | 65 +++++++++++----- .../preferences/Settings.kt | 4 +- .../screens/InstallPackActivity.kt | 24 ++++++ .../rboardthememanager/screens/Logs.kt | 13 ++++ .../screens/MainActivity.kt | 13 +++- .../rboardthememanager/screens/ManageRepo.kt | 26 +++++++ .../screens/PreferencesActivity.kt | 13 +++- .../screens/ReadMoreReadFast.kt | 13 ++++ .../rboardthememanager/screens/ShareFlags.kt | 19 ++++- .../screens/ThemeChangerActivity.kt | 27 ++++++- .../SwitchKeyboardWidgetConfigureActivity.kt | 19 ++++- .../drawable/ic_baseline_outlined_flag_24.xml | 4 +- app/src/main/res/drawable/ic_emoji_clear.xml | 32 ++++++++ app/src/main/res/drawable/ic_logs.xml | 13 ++++ app/src/main/res/drawable/ic_patch.xml | 1 - app/src/main/res/drawable/ic_person.xml | 3 +- .../main/res/layout/activity_install_pack.xml | 76 ++++++++++++------- app/src/main/res/layout/activity_logs.xml | 3 +- .../main/res/layout/activity_manage_repo.xml | 23 ++++-- .../main/res/layout/activity_preferences.xml | 4 +- .../layout/activity_read_more_read_fast.xml | 3 +- .../main/res/layout/activity_share_flags.xml | 26 +++++-- .../res/layout/activity_theme_changer.xml | 67 ++++++++++------ app/src/main/res/layout/dialog_no_root.xml | 3 +- .../switch_keyboard_widget_configure.xml | 6 +- app/src/main/res/layout/usage_dialog.xml | 3 +- .../res/{values-id => values-in}/strings.xml | 0 app/src/main/res/values/themes.xml | 10 +-- build.gradle.kts | 2 +- colorutilsc | 2 +- gradle/libs.versions.toml | 38 +++++----- gradle/wrapper/gradle-wrapper.properties | 4 +- mathc | 2 +- rboardcomponents | 2 +- 46 files changed, 474 insertions(+), 153 deletions(-) create mode 100644 app/src/main/res/drawable/ic_emoji_clear.xml create mode 100644 app/src/main/res/drawable/ic_logs.xml rename app/src/main/res/{values-id => values-in}/strings.xml (100%) diff --git a/.github/workflows/buildCi.yml b/.github/workflows/buildCi.yml index 9af64782..7c8ee6b1 100644 --- a/.github/workflows/buildCi.yml +++ b/.github/workflows/buildCi.yml @@ -22,7 +22,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27 - name: Get Commit Message id: commitMessage @@ -85,7 +85,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: '35.0.0-rc3' + buildToolsVersion: '35.0.0' - name: Delete old APK run: rm app/build/outputs/apk/debug/app-debug.apk diff --git a/.github/workflows/buildPro.yml b/.github/workflows/buildPro.yml index 7ffc56d3..65b26fa2 100644 --- a/.github/workflows/buildPro.yml +++ b/.github/workflows/buildPro.yml @@ -74,7 +74,7 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - buildToolsVersion: '35.0.0-rc3' + buildToolsVersion: '35.0.0' - name: List files run: ls app/build/outputs/apk/pro diff --git a/.github/workflows/buildRelease.yml b/.github/workflows/buildRelease.yml index 986ae1b7..dc561d07 100644 --- a/.github/workflows/buildRelease.yml +++ b/.github/workflows/buildRelease.yml @@ -24,7 +24,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27 - name: Get Commit Message id: commitMessage @@ -89,7 +89,7 @@ jobs: signingKey: ${{ secrets.SIGNING_KEY }} keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} - buildToolsVersion: '35.0.0-rc3' + buildToolsVersion: '35.0.0' - name: List files run: ls app/build/outputs/apk/release diff --git a/.github/workflows/deployToGoogle.yml b/.github/workflows/deployToGoogle.yml index cf47e8cf..c373620a 100644 --- a/.github/workflows/deployToGoogle.yml +++ b/.github/workflows/deployToGoogle.yml @@ -25,7 +25,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27 - name: Setup JDK uses: actions/setup-java@v4 @@ -75,7 +75,7 @@ jobs: keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }} keyPassword: ${{ secrets.KEY_PASSWORD }} env: - buildToolsVersion: '35.0.0-rc3' + buildToolsVersion: '35.0.0' - name: Upload Artifact uses: actions/upload-artifact@v4 diff --git a/.github/workflows/pullRequest.yml b/.github/workflows/pullRequest.yml index c764fd91..fc5b8577 100644 --- a/.github/workflows/pullRequest.yml +++ b/.github/workflows/pullRequest.yml @@ -23,7 +23,7 @@ jobs: - uses: nttld/setup-ndk@v1 with: - ndk-version: r26d + ndk-version: r27 - name: Setup JDK uses: actions/setup-java@v4 diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml index e68ef862..485accd3 100644 --- a/.idea/kotlinc.xml +++ b/.idea/kotlinc.xml @@ -4,10 +4,10 @@