X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Ffragments%2FDomainsListFragment.java;h=2bf499e4d21ffb28d91d0bb92c92668031713da8;hp=3caccf529ca1c0edd842cf76926dd7c6ae3c2be5;hb=f0393ca22075be3e5fe9199c7db87381256236fa;hpb=96cf5fae34ebc2ae7ca05322837a859943e19ba0

diff --git a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
index 3caccf52..2bf499e4 100644
--- a/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
+++ b/app/src/main/java/com/stoutner/privacybrowser/fragments/DomainsListFragment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+ * Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
  *
  * This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
  *
@@ -19,23 +19,42 @@
 
 package com.stoutner.privacybrowser.fragments;
 
+import android.content.Context;
+import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.FloatingActionButton;
-// `android.support.v4.app.Fragment` must be used until minimum API >= 23.  Otherwise `getContext()` cannot be called.
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
+import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ListView;
 
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;  // The AndroidX fragment must be used until minimum API >= 23.  Otherwise `getContext()` does not work.
+import androidx.fragment.app.FragmentManager;
+
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
 import com.stoutner.privacybrowser.R;
 import com.stoutner.privacybrowser.activities.DomainsActivity;
-import com.stoutner.privacybrowser.activities.MainWebViewActivity;
 
 public class DomainsListFragment extends Fragment {
+    // Instantiate the dismiss snackbar interface handle.
+    private DismissSnackbarInterface dismissSnackbarInterface;
+
+    // Define the public dismiss snackbar interface.
+    public interface DismissSnackbarInterface {
+        void dismissSnackbar();
+    }
+
+    public void onAttach(Context context) {
+        // Run the default commands.
+        super.onAttach(context);
+
+        // Get a handle for the dismiss snackbar interface.
+        dismissSnackbarInterface = (DismissSnackbarInterface) context;
+    }
+
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         // Inflate `domains_list_fragment`.  `false` does not attach it to the root `container`.
         View domainsListFragmentView = inflater.inflate(R.layout.domains_list_fragment, container, false);
@@ -46,21 +65,23 @@ public class DomainsListFragment extends Fragment {
         // Remove the incorrect lint error below that `.getSupportFragmentManager()` might be null.
         assert getActivity() != null;
 
-        // Get a handle for `supportFragmentManager`.
+        // Get a handle for the support fragment manager.
         final FragmentManager supportFragmentManager = getActivity().getSupportFragmentManager();
 
         domainsListView.setOnItemClickListener((AdapterView<?> parent, View view, int position, long id) -> {
-            // Dismiss `undoDeleteSnackbar` if it is currently displayed (because a domain has just been deleted).
-            if ((DomainsActivity.undoDeleteSnackbar != null) && (DomainsActivity.undoDeleteSnackbar.isShown())) {
-                DomainsActivity.dismissingSnackbar = true;
-
-                DomainsActivity.undoDeleteSnackbar.dismiss();
-            }
+            // Dismiss the snackbar if it is visible.
+            dismissSnackbarInterface.dismissSnackbar();
 
             // Save the current domain settings if operating in two-paned mode and a domain is currently selected.
             if (DomainsActivity.twoPanedMode && DomainsActivity.deleteMenuItem.isEnabled()) {
+                // Get a handle for the domain settings fragment.
+                Fragment domainSettingsFragment = supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container);
+
+                // Remove the incorrect lint error below that the domain settings fragment might be null.
+                assert domainSettingsFragment != null;
+
                 // Get a handle for the domain settings fragment view.
-                View domainSettingsFragmentView = supportFragmentManager.findFragmentById(R.id.domain_settings_fragment_container).getView();
+                View domainSettingsFragmentView = domainSettingsFragment.getView();
 
                 // Get a handle for the domains activity.
                 DomainsActivity domainsActivity = new DomainsActivity();
@@ -76,7 +97,7 @@ public class DomainsListFragment extends Fragment {
             Bundle argumentsBundle = new Bundle();
             argumentsBundle.putInt(DomainSettingsFragment.DATABASE_ID, DomainsActivity.currentDomainDatabaseId);
 
-            // Add `argumentsBundle` to `domainSettingsFragment`.
+            // Add the arguments bundle to the domain settings fragment.
             DomainSettingsFragment domainSettingsFragment = new DomainSettingsFragment();
             domainSettingsFragment.setArguments(argumentsBundle);
 
@@ -84,18 +105,24 @@ public class DomainsListFragment extends Fragment {
             if (DomainsActivity.twoPanedMode) {  // The device in in two-paned mode.
                 // enable `deleteMenuItem` if the system is not waiting for a `Snackbar` to be dismissed.
                 if (!DomainsActivity.dismissingSnackbar) {
-                    // Enable `deleteMenuItem`.
+                    // Enable the delete menu item.
                     DomainsActivity.deleteMenuItem.setEnabled(true);
 
+                    // Get a handle for the shared preferences.
+                    SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getContext());
+
+                    // Get the theme preferences.
+                    boolean darkTheme = sharedPreferences.getBoolean("dark_theme", false);
+
                     // Set the delete icon according to the theme.
-                    if (MainWebViewActivity.darkTheme) {
+                    if (darkTheme) {
                         DomainsActivity.deleteMenuItem.setIcon(R.drawable.delete_dark);
                     } else {
                         DomainsActivity.deleteMenuItem.setIcon(R.drawable.delete_light);
                     }
                 }
 
-                // Display `domainSettingsFragment`.
+                // Display the domain settings fragment.
                 supportFragmentManager.beginTransaction().replace(R.id.domain_settings_fragment_container, domainSettingsFragment).commit();
             } else { // The device in in single-paned mode
                 // Show `deleteMenuItem` if the system is not waiting for a `Snackbar` to be dismissed.
@@ -103,15 +130,15 @@ public class DomainsListFragment extends Fragment {
                     DomainsActivity.deleteMenuItem.setVisible(true);
                 }
 
-                // Hide `add_domain_fab`.
+                // Hide the add domain FAB.
                 FloatingActionButton addDomainFAB = getActivity().findViewById(R.id.add_domain_fab);
-                addDomainFAB.setVisibility(View.GONE);
+                addDomainFAB.hide();
 
-                // Display `domainSettingsFragment`.
+                // Display the domain settings fragment.
                 supportFragmentManager.beginTransaction().replace(R.id.domains_listview_fragment_container, domainSettingsFragment).commit();
             }
         });
 
         return domainsListFragmentView;
     }
-}
+}
\ No newline at end of file