Skip to content

Commit

Permalink
Target SDK 34
Browse files Browse the repository at this point in the history
Build tools 34.0.0.
Annotate shared preference key as nullable.
  • Loading branch information
pranavpandey committed Jun 15, 2023
1 parent 06b7d50 commit ca2006e
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 21 deletions.
6 changes: 3 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: android
jdk: oraclejdk11
jdk: oraclejdk17

before_install:
- mkdir "$ANDROID_HOME/licenses" || true
Expand All @@ -10,8 +10,8 @@ android:
components:
- tools
- platform-tools
- build-tools-33.0.2
- android-33
- build-tools-34.0.0
- android-34
- extra-android-support
- extra-android-m2repository
- extra-google-m2repository
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@

buildscript {
ext.versions = [
'compileSdk' : 33,
'compileSdk' : 34,
'minSdk' : 14,
'targetSdk' : 33,
'buildTools' : '33.0.2',
'targetSdk' : 34,
'buildTools' : '34.0.0',
'multidex' : '2.0.1',
'dynamic' : '4.4.8',
'fragment' : '1.5.6',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,8 @@ public boolean setNavigationBarTheme() {
public void onNavigationBarThemeChanged() { }

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
if (DynamicPreferences.isNullKey(key)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1757,7 +1757,8 @@ public void onNavigationBarThemeChanged() {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) { }

/**
* Update the task description on API 21 and above to match it with the theme color.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -733,5 +733,6 @@ protected void finishActivity() {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -873,5 +873,6 @@ public void setHostMenuItemVisible(@IdRes int id, boolean visible) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) { }
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) { }
}
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,8 @@ public boolean isColorViewAlpha() {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -222,7 +222,8 @@ public void setImageBitmap(@Nullable Bitmap imageBitmap) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -669,7 +669,8 @@ public void setOnPromptListener(@Nullable OnPromptListener onPromptListener) {
public abstract @Nullable ViewGroup getPreferenceView();

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
if (DynamicPreferences.isNullKey(key)) {
return;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -715,7 +715,8 @@ private void setProgressFromControl(int progress) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,8 @@ public void setViewFrame(@Nullable View view, boolean removePrevious) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -754,7 +754,8 @@ private void setProgressFromControl(int progress) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,8 @@ public void setPreferenceValue(@NonNull String value) {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,8 @@ public void setOnThemeClickListener(@Nullable OnClickListener onThemeClickListen
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -744,7 +744,8 @@ public boolean isOnSharedPreferenceChangeListener() {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -724,7 +724,8 @@ public boolean isOnSharedPreferenceChangeListener() {
}

@Override
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences,
@Nullable String key) {
super.onSharedPreferenceChanged(sharedPreferences, key);

if (DynamicPreferences.isNullKey(key)) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ class SampleApplication : DynamicApplication() {
return AppController.instance.isThemeNavigationBar
}

override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) {
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String?) {
super.onSharedPreferenceChanged(sharedPreferences, key)

// Update themes on shared preferences change.
Expand Down

0 comments on commit ca2006e

Please sign in to comment.