From 09ecc03be59e5abe9819b2a93eb068876132343f Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 12 Apr 2023 19:21:06 +0200 Subject: [PATCH 1/2] AGP: update 8.0.0 (incl. Java 17). --- .github/workflows/build_apk.yml | 2 +- .github/workflows/lint.yml | 2 +- build.gradle | 2 +- .../java/de/dennisguse/opentracks/TrackListActivity.java | 4 ++-- .../opentracks/settings/ImportExportSettingsFragment.java | 2 +- .../java/de/dennisguse/opentracks/ui/util/ThemeUtils.java | 6 ++---- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/.github/workflows/build_apk.yml b/.github/workflows/build_apk.yml index 84cb16455..be1877960 100644 --- a/.github/workflows/build_apk.yml +++ b/.github/workflows/build_apk.yml @@ -13,7 +13,7 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Assemble APK shell: bash diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0cfc4f840..2490e89b8 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -16,6 +16,6 @@ jobs: - uses: actions/setup-java@v3 with: distribution: 'zulu' - java-version: '11' + java-version: '17' - run: ./gradlew lint diff --git a/build.gradle b/build.gradle index f607f81eb..b7d5c068f 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.0-rc01' } } diff --git a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java index 671de5486..57c66ca92 100644 --- a/src/main/java/de/dennisguse/opentracks/TrackListActivity.java +++ b/src/main/java/de/dennisguse/opentracks/TrackListActivity.java @@ -311,9 +311,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co searchMenuItem = menu.findItem(R.id.track_list_search); SearchView searchView = ActivityUtils.configureSearchWidget(this, searchMenuItem); - searchView.findViewById(R.id.search_edit_frame).setPadding(0, 0, 48, 0); + searchView.findViewById(androidx.appcompat.R.id.search_edit_frame).setPadding(0, 0, 48, 0); - SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(R.id.search_src_text); + SearchView.SearchAutoComplete searchAutoComplete = searchView.findViewById(androidx.appcompat.R.id.search_src_text); searchAutoComplete.setHintTextColor(ContextCompat.getColor(this, android.R.color.white)); searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white)); diff --git a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java index 984ee19ed..a088f93e7 100644 --- a/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java +++ b/src/main/java/de/dennisguse/opentracks/settings/ImportExportSettingsFragment.java @@ -64,7 +64,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat { DocumentFile directory = IntentUtils.toDocumentFile(getContext(), directoryUri); //Use same value for not set as Androidx ListPreference and EditTextPreference if (directory == null) { - return getString(R.string.not_set); + return getString(androidx.preference.R.string.not_set); } return directoryUri + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable)); diff --git a/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java index f0d49c804..bc3845899 100644 --- a/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java +++ b/src/main/java/de/dennisguse/opentracks/ui/util/ThemeUtils.java @@ -7,8 +7,6 @@ import android.util.TypedValue; import androidx.core.content.ContextCompat; -import de.dennisguse.opentracks.R; - public class ThemeUtils { private ThemeUtils() { @@ -42,14 +40,14 @@ public class ThemeUtils { } public static int getFontSizeSmallInPx(Context context) { - TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize}); + TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body2, new int[]{android.R.attr.textSize}); int fontSize = typedArray.getDimensionPixelSize(0, 12); typedArray.recycle(); return fontSize; } public static int getFontSizeMediumInPx(Context context) { - TypedArray typedArray = context.obtainStyledAttributes(R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize}); + TypedArray typedArray = context.obtainStyledAttributes(com.google.android.material.R.style.TextAppearance_MaterialComponents_Body1, new int[]{android.R.attr.textSize}); int fontSize = typedArray.getDimensionPixelSize(0, 15); typedArray.recycle(); return fontSize; From 7dcc0ec8bc75cc34d9c1326460bc2fd48042799d Mon Sep 17 00:00:00 2001 From: Dennis Guse Date: Wed, 12 Apr 2023 15:29:06 +0200 Subject: [PATCH 2/2] AGP: generate local_config.xml --- build.gradle | 7 ++++- gradle.properties | 2 +- src/main/AndroidManifest.xml | 3 +- src/main/res/resources.properties | 1 + src/main/res/xml/locales_config.xml | 47 ----------------------------- 5 files changed, 9 insertions(+), 51 deletions(-) create mode 100644 src/main/res/resources.properties delete mode 100644 src/main/res/xml/locales_config.xml diff --git a/build.gradle b/build.gradle index b7d5c068f..a8ffc9a48 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:8.0.0-rc01' + classpath 'com.android.tools.build:gradle:8.1.0-alpha11' } } @@ -55,6 +55,11 @@ android { buildFeatures { viewBinding true + buildConfig true + } + + androidResources { + generateLocaleConfig = true } defaultConfig { diff --git a/gradle.properties b/gradle.properties index 6e5de13d6..3c8ba69b7 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ android.useAndroidX=true -org.gradle.jvmargs=-Xmx1024m -XX:MaxPermSize=256m +org.gradle.jvmargs=-Xmx1024m diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index 31510ae6f..3b28c217d 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -70,8 +70,7 @@ limitations under the License. android:icon="@drawable/ic_launcher" android:label="@string/app_name" android:supportsRtl="true" - android:theme="@style/ThemeCustom" - android:localeConfig="@xml/locales_config"> + android:theme="@style/ThemeCustom"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -