X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Factivities%2FGuideActivity.java;h=a8728fe650746782102fdf4bea573686f7835b99;hp=c929757b3ed8f89b421033efa194a8e5d3daf7f3;hb=a6d829c39b356e9134cb488c4ae7e0e29bf9df96;hpb=bec253231a61ce8d9fd9d2003d5d4bad6af295d8 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 c929757b..a8728fe6 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-2017 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -35,8 +35,22 @@ 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); - setContentView(R.layout.guide_coordinatorlayout); + + // Set the content view according to the theme. + if (MainWebViewActivity.darkTheme) { + setContentView(R.layout.guide_coordinatorlayout_dark); + } else { + setContentView(R.layout.guide_coordinatorlayout_light); + } // 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); @@ -66,7 +80,7 @@ public class GuideActivity extends AppCompatActivity { @Override // Get the count of the number of tabs. public int getCount() { - return 9; + return 7; } @Override @@ -94,12 +108,6 @@ public class GuideActivity extends AppCompatActivity { case 6: return getString(R.string.tracking_ids); - case 7: - return getString(R.string.clear_and_exit); - - case 8: - return getString(R.string.planned_features); - default: return ""; }