Commit 77cad2e

committed

Persist onboarding defaults and neutral ad placeholder

1 parent f3c5036 commit 77cad2eCopy full SHA for 77cad2e

File tree

+16

-1

lines changed

app/src/main
- java/com/d4rk/androidtutorials/java/ui/screens/onboarding
  - OnboardingViewModel.java
- res/layout
  - activity_main.xml

+16

-1

lines changed

Lines changed: 15 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`import android.content.Context;`
`4`	`4`	`import android.content.SharedPreferences;`
`5`	`5`
	`6`	`+import androidx.appcompat.app.AppCompatDelegate;`
`6`	`7`	`import androidx.lifecycle.ViewModel;`
`7`	`8`	`import androidx.preference.PreferenceManager;`
`8`	`9`
`@@ -24,6 +25,20 @@ public class OnboardingViewModel extends ViewModel {`
`24`	`25`	`public OnboardingViewModel(@ApplicationContext Context context) {`
`25`	`26`	`this.context = context;`
`26`	`27`	`this.prefs = PreferenceManager.getDefaultSharedPreferences(context);`
	`28`	`+`
	`29`	`+ // Ensure defaults are persisted so skipping onboarding still sets them`
	`30`	`+ String themeKey = context.getString(R.string.key_theme);`
	`31`	`+ String[] themeValues = context.getResources().getStringArray(R.array.preference_theme_values);`
	`32`	`+ if (!prefs.contains(themeKey)) {`
	`33`	`+ prefs.edit().putString(themeKey, themeValues[0]).apply();`
	`34`	`+ AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);`
	`35`	`+ }`
	`36`	`+`
	`37`	`+ String tabKey = context.getString(R.string.key_default_tab);`
	`38`	`+ String[] tabValues = context.getResources().getStringArray(R.array.preference_default_tab_values);`
	`39`	`+ if (!prefs.contains(tabKey)) {`
	`40`	`+ prefs.edit().putString(tabKey, tabValues[0]).apply();`
	`41`	`+ }`
`27`	`42`	`}`
`28`	`43`
`29`	`44`	`public void setTheme(String value) {`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`android:id="@+id/ad_placeholder"`
`52`	`52`	`android:layout_width="match_parent"`
`53`	`53`	`android:layout_height="match_parent"`
`54`		`- android:background="@android:color/darker_gray" />`
	`54`	`+ android:background="?attr/colorSurfaceContainer" />`
`55`	`55`
`56`	`56`	`<com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView`
`57`	`57`	`android:id="@+id/ad_view"`

Comments

(0)