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=bd459471876c591dd4f634cae61ed350377848cd;hp=856aa5d57163802fdd4c92e6d1dea72e787e48ff;hb=f0393ca22075be3e5fe9199c7db87381256236fa;hpb=0a5d2eabceeafb49a957598538aa74d4f11dfce0 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 856aa5d5..bd459471 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-2018 Soren Stoutner . + * Copyright © 2016-2019 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,30 +19,41 @@ package com.stoutner.privacybrowser.activities; +import android.content.SharedPreferences; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import android.preference.PreferenceManager; import android.view.WindowManager; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; // The AndroidX toolbar must be used until the minimum API is >= 21. +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; + import com.stoutner.privacybrowser.fragments.GuideTabFragment; import com.stoutner.privacybrowser.R; public class GuideActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { + // Get a handle for the shared preferences. + SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); + + // Get the theme and screenshot preferences. + boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false); + boolean allowScreenshots = sharedPreferences.getBoolean("allow_screenshots", false); + // Disable screenshots if not allowed. - if (!MainWebViewActivity.allowScreenshots) { + if (!allowScreenshots) { getWindow().addFlags(WindowManager.LayoutParams.FLAG_SECURE); } // Set the theme. - if (MainWebViewActivity.darkTheme) { + if (darkTheme) { setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); } else { setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); @@ -54,14 +65,18 @@ public class GuideActivity extends AppCompatActivity { // 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 = findViewById(R.id.guide_toolbar); - setSupportActionBar(guideAppBar); + // The AndroidX toolbar must be used until the minimum API is >= 21. + Toolbar toolbar = findViewById(R.id.guide_toolbar); + setSupportActionBar(toolbar); - // Display the home arrow on `ppBar`. - final ActionBar appBar = getSupportActionBar(); - assert appBar != null; // This assert removes the incorrect lint warning in Android Studio on the following line that `appBar` might be `null`. - appBar.setDisplayHomeAsUpEnabled(true); + // Get a handle for the action bar. + final ActionBar actionBar = getSupportActionBar(); + + // Remove the incorrect lint warning that the action bar might be null. + assert actionBar != null; + + // Display the home arrow on the action bar. + actionBar.setDisplayHomeAsUpEnabled(true); // Setup the ViewPager. ViewPager aboutViewPager = findViewById(R.id.guide_viewpager); @@ -75,14 +90,15 @@ public class GuideActivity extends AppCompatActivity { } private class guidePagerAdapter extends FragmentPagerAdapter { - private guidePagerAdapter(FragmentManager fm) { - super(fm); + private guidePagerAdapter(FragmentManager fragmentManager) { + // Run the default commands. + super(fragmentManager); } @Override // Get the count of the number of tabs. public int getCount() { - return 9; + return 10; } @Override @@ -102,18 +118,21 @@ public class GuideActivity extends AppCompatActivity { return getString(R.string.user_agent); case 4: - return getString(R.string.domain_settings); + return getString(R.string.requests); case 5: - return getString(R.string.ssl_certificates); + return getString(R.string.domain_settings); case 6: - return getString(R.string.tor); + return getString(R.string.ssl_certificates); case 7: - return getString(R.string.tracking_ids); + return getString(R.string.tor); case 8: + return getString(R.string.tracking_ids); + + case 9: return getString(R.string.bookmarks); default: