X-Git-Url: https://gitweb.stoutner.com/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FGuideActivity.java;h=3e45bedc7cf2ad34620996eeb41343bafc82ed77;hb=a645a62dec2fb33103ad53dca0fdc88077f660b4;hp=ca7756e9dd16fe2637bec593ced073672f8fff67;hpb=f82135d919d64d4909c37c79a18e14ceba802579;p=PrivacyBrowserAndroid.git diff --git a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java index ca7756e9..3e45bedc 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java +++ b/app/src/main/java/com/stoutner/privacybrowser/activities/GuideActivity.java @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2017 Soren Stoutner . + * Copyright © 2016-2018 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -35,11 +35,21 @@ import com.stoutner.privacybrowser.R; public class GuideActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + // Set the theme. + if (MainWebViewActivity.darkTheme) { + setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); + } else { + setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); + } + + // Run the default commands. super.onCreate(savedInstanceState); + + // Set the content view. setContentView(R.layout.guide_coordinatorlayout); // We need to use `SupportActionBar` from `android.support.v7.app.ActionBar` until the minimum API is >= 21. - Toolbar guideAppBar = (Toolbar) findViewById(R.id.guide_toolbar); + Toolbar guideAppBar = findViewById(R.id.guide_toolbar); setSupportActionBar(guideAppBar); // Display the home arrow on `ppBar`. @@ -48,12 +58,12 @@ public class GuideActivity extends AppCompatActivity { appBar.setDisplayHomeAsUpEnabled(true); // Setup the ViewPager. - ViewPager aboutViewPager = (ViewPager) findViewById(R.id.guide_viewpager); + ViewPager aboutViewPager = findViewById(R.id.guide_viewpager); assert aboutViewPager != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutViewPager might be null. aboutViewPager.setAdapter(new guidePagerAdapter(getSupportFragmentManager())); // Setup the TabLayout and connect it to the ViewPager. - TabLayout aboutTabLayout = (TabLayout) findViewById(R.id.guide_tablayout); + TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout); assert aboutTabLayout != null; // This assert removes the incorrect warning in Android Studio on the following line that aboutTabLayout might be null. aboutTabLayout.setupWithViewPager(aboutViewPager); } @@ -89,16 +99,16 @@ public class GuideActivity extends AppCompatActivity { return getString(R.string.domain_settings); case 5: - return getString(R.string.tor); + return getString(R.string.ssl_certificates); case 6: - return getString(R.string.tracking_ids); + return getString(R.string.tor); case 7: - return getString(R.string.clear_and_exit); + return getString(R.string.tracking_ids); case 8: - return getString(R.string.planned_features); + return getString(R.string.bookmarks); default: return ""; @@ -111,5 +121,4 @@ public class GuideActivity extends AppCompatActivity { return GuideTabFragment.createTab(tab); } } - }