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=54c87a87eaa26a6638d2201c73b29d2bf04d7b1c;hp=5cbf0c50a120e3557e1151b814d028e85108789a;hb=4196bafc4069857b554ac95addcae92fcabae901;hpb=7bc7a51a468fd1a5e4801b2fd2c6a7b38ac36ba1 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 5cbf0c50..54c87a87 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-2020 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -19,34 +19,37 @@ 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 com.stoutner.privacybrowser.fragments.GuideTabFragment; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; +import androidx.viewpager.widget.ViewPager; + +import com.google.android.material.tabs.TabLayout; + +import com.stoutner.privacybrowser.adapters.GuidePagerAdapter; 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 screenshot preference. + 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) { - setTheme(R.style.PrivacyBrowserDark_SecondaryActivity); - } else { - setTheme(R.style.PrivacyBrowserLight_SecondaryActivity); - } + setTheme(R.style.PrivacyBrowser); // Run the default commands. super.onCreate(savedInstanceState); @@ -54,80 +57,34 @@ 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(); - // Setup the 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())); + // Remove the incorrect lint warning that the action bar might be null. + assert actionBar != null; - // Setup the TabLayout and connect it to the ViewPager. - 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); - } - - private class guidePagerAdapter extends FragmentPagerAdapter { - private guidePagerAdapter(FragmentManager fm) { - super(fm); - } - - @Override - // Get the count of the number of tabs. - public int getCount() { - return 10; - } + // Display the home arrow on the action bar. + actionBar.setDisplayHomeAsUpEnabled(true); - @Override - // Get the name of each tab. Tab numbers start at 0. - public CharSequence getPageTitle(int tab) { - switch (tab) { - case 0: - return getString(R.string.overview); - - case 1: - return getString(R.string.javascript); - - case 2: - return getString(R.string.local_storage); - - case 3: - return getString(R.string.user_agent); - - case 4: - return getString(R.string.requests); - - case 5: - return getString(R.string.domain_settings); - - case 6: - return getString(R.string.ssl_certificates); - - case 7: - return getString(R.string.tor); + // Get a handle for the view pager and the tab layout. + ViewPager aboutViewPager = findViewById(R.id.guide_viewpager); + TabLayout aboutTabLayout = findViewById(R.id.guide_tablayout); - case 8: - return getString(R.string.tracking_ids); + // Remove the incorrect lint warnings that the views might be null + assert aboutViewPager != null; + assert aboutTabLayout != null; - case 9: - return getString(R.string.bookmarks); + // Set the view pager adapter. + aboutViewPager.setAdapter(new GuidePagerAdapter(getSupportFragmentManager(), getApplicationContext())); - default: - return ""; - } - } + // Keep all the tabs in memory. + aboutViewPager.setOffscreenPageLimit(10); - @Override - // Setup each tab. - public Fragment getItem(int tab) { - return GuideTabFragment.createTab(tab); - } + // Link the tab layout to the view pager. + aboutTabLayout.setupWithViewPager(aboutViewPager); } -} +} \ No newline at end of file