Skip to content

Commit ca2006e

Browse files
committed
Target SDK 34
Build tools 34.0.0. Annotate shared preference key as nullable.
1 parent 06b7d50 commit ca2006e

File tree

17 files changed

+35
-21
lines changed

17 files changed

+35
-21
lines changed

.travis.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: android
2-
jdk: oraclejdk11
2+
jdk: oraclejdk17
33

44
before_install:
55
- mkdir "$ANDROID_HOME/licenses" || true
@@ -10,8 +10,8 @@ android:
1010
components:
1111
- tools
1212
- platform-tools
13-
- build-tools-33.0.2
14-
- android-33
13+
- build-tools-34.0.0
14+
- android-34
1515
- extra-android-support
1616
- extra-android-m2repository
1717
- extra-google-m2repository

build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616

1717
buildscript {
1818
ext.versions = [
19-
'compileSdk' : 33,
19+
'compileSdk' : 34,
2020
'minSdk' : 14,
21-
'targetSdk' : 33,
22-
'buildTools' : '33.0.2',
21+
'targetSdk' : 34,
22+
'buildTools' : '34.0.0',
2323
'multidex' : '2.0.1',
2424
'dynamic' : '4.4.8',
2525
'fragment' : '1.5.6',

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/DynamicApplication.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ public boolean setNavigationBarTheme() {
330330
public void onNavigationBarThemeChanged() { }
331331

332332
@Override
333-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
333+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
334+
@Nullable String key) {
334335
if (DynamicPreferences.isNullKey(key)) {
335336
return;
336337
}

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/activity/DynamicSystemActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1757,7 +1757,8 @@ public void onNavigationBarThemeChanged() {
17571757
}
17581758

17591759
@Override
1760-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
1760+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
1761+
@Nullable String key) { }
17611762

17621763
/**
17631764
* Update the task description on API 21 and above to match it with the theme color.

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/dialog/fragment/DynamicDialogFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -733,5 +733,6 @@ protected void finishActivity() {
733733
}
734734

735735
@Override
736-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
736+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
737+
@Nullable String key) { }
737738
}

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/fragment/DynamicFragment.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -873,5 +873,6 @@ public void setHostMenuItemVisible(@IdRes int id, boolean visible) {
873873
}
874874

875875
@Override
876-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
876+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
877+
@Nullable String key) { }
877878
}

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicColorPreference.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -857,7 +857,8 @@ public boolean isColorViewAlpha() {
857857
}
858858

859859
@Override
860-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
860+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
861+
@Nullable String key) {
861862
super.onSharedPreferenceChanged(sharedPreferences, key);
862863

863864
if (DynamicPreferences.isNullKey(key)) {

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicImagePreference.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,8 @@ public void setImageBitmap(@Nullable Bitmap imageBitmap) {
222222
}
223223

224224
@Override
225-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
225+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
226+
@Nullable String key) {
226227
super.onSharedPreferenceChanged(sharedPreferences, key);
227228

228229
if (DynamicPreferences.isNullKey(key)) {

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicPreference.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,8 @@ public void setOnPromptListener(@Nullable OnPromptListener onPromptListener) {
669669
public abstract @Nullable ViewGroup getPreferenceView();
670670

671671
@Override
672-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
672+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
673+
@Nullable String key) {
673674
if (DynamicPreferences.isNullKey(key)) {
674675
return;
675676
}

dynamic-support/src/main/java/com/pranavpandey/android/dynamic/support/setting/base/DynamicSeekBarPreference.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,8 @@ private void setProgressFromControl(int progress) {
715715
}
716716

717717
@Override
718-
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
718+
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
719+
@Nullable String key) {
719720
super.onSharedPreferenceChanged(sharedPreferences, key);
720721

721722
if (DynamicPreferences.isNullKey(key)) {

0 commit comments

Comments
 (0)