forked from upstream-mirrors/OpenTracks
AGP: update 8.0.0 (incl. Java 17).
This commit is contained in:
@@ -13,7 +13,7 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: 'adopt'
|
distribution: 'adopt'
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
|
|
||||||
- name: Assemble APK
|
- name: Assemble APK
|
||||||
shell: bash
|
shell: bash
|
||||||
|
|||||||
@@ -16,6 +16,6 @@ jobs:
|
|||||||
- uses: actions/setup-java@v3
|
- uses: actions/setup-java@v3
|
||||||
with:
|
with:
|
||||||
distribution: 'zulu'
|
distribution: 'zulu'
|
||||||
java-version: '11'
|
java-version: '17'
|
||||||
|
|
||||||
- run: ./gradlew lint
|
- run: ./gradlew lint
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath 'com.android.tools.build:gradle:7.4.2'
|
classpath 'com.android.tools.build:gradle:8.0.0-rc01'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -311,9 +311,9 @@ public class TrackListActivity extends AbstractTrackDeleteActivity implements Co
|
|||||||
searchMenuItem = menu.findItem(R.id.track_list_search);
|
searchMenuItem = menu.findItem(R.id.track_list_search);
|
||||||
SearchView searchView = ActivityUtils.configureSearchWidget(this, searchMenuItem);
|
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.setHintTextColor(ContextCompat.getColor(this, android.R.color.white));
|
||||||
searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));
|
searchAutoComplete.setTextColor(ContextCompat.getColor(this, android.R.color.white));
|
||||||
|
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ public class ImportExportSettingsFragment extends PreferenceFragmentCompat {
|
|||||||
DocumentFile directory = IntentUtils.toDocumentFile(getContext(), directoryUri);
|
DocumentFile directory = IntentUtils.toDocumentFile(getContext(), directoryUri);
|
||||||
//Use same value for not set as Androidx ListPreference and EditTextPreference
|
//Use same value for not set as Androidx ListPreference and EditTextPreference
|
||||||
if (directory == null) {
|
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));
|
return directoryUri + (directory.canWrite() ? "" : getString(R.string.export_dir_not_writable));
|
||||||
|
|||||||
@@ -7,8 +7,6 @@ import android.util.TypedValue;
|
|||||||
|
|
||||||
import androidx.core.content.ContextCompat;
|
import androidx.core.content.ContextCompat;
|
||||||
|
|
||||||
import de.dennisguse.opentracks.R;
|
|
||||||
|
|
||||||
public class ThemeUtils {
|
public class ThemeUtils {
|
||||||
|
|
||||||
private ThemeUtils() {
|
private ThemeUtils() {
|
||||||
@@ -42,14 +40,14 @@ public class ThemeUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public static int getFontSizeSmallInPx(Context context) {
|
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);
|
int fontSize = typedArray.getDimensionPixelSize(0, 12);
|
||||||
typedArray.recycle();
|
typedArray.recycle();
|
||||||
return fontSize;
|
return fontSize;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static int getFontSizeMediumInPx(Context context) {
|
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);
|
int fontSize = typedArray.getDimensionPixelSize(0, 15);
|
||||||
typedArray.recycle();
|
typedArray.recycle();
|
||||||
return fontSize;
|
return fontSize;
|
||||||
|
|||||||
Reference in New Issue
Block a user