#1383 remove rendundant menu items + reorganise items/constants + clear notes in KiwixSettingsActivity

app/src/main/java/org/kiwix/kiwixmobile/main/AddNoteDialog.java

@@ -35,12 +35,11 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import org.kiwix.kiwixmobile.BuildConfig;
+import org.kiwix.kiwixmobile.KiwixApplication;
 import org.kiwix.kiwixmobile.R;
 import org.kiwix.kiwixmobile.data.ZimContentProvider;
 import org.kiwix.kiwixmobile.utils.SharedPreferenceUtil;
 
-import static org.kiwix.kiwixmobile.utils.Constants.NOTES_DIRECTORY;
-
 /**
  * Created by @author Aditya-Sood (21/05/19) as a part of GSoC 2019
  *
@@ -53,6 +52,8 @@ import static org.kiwix.kiwixmobile.utils.Constants.NOTES_DIRECTORY;
 public class AddNoteDialog extends DialogFragment
   implements ConfirmationAlertDialogFragment.UserClickListener {
 
+  public static final String NOTES_DIRECTORY =
+    Environment.getExternalStorageDirectory() + "/Kiwix/Notes/";
   public static final String TAG = "AddNoteDialog";
 
   private SharedPreferenceUtil sharedPreferenceUtil;
@@ -298,7 +299,7 @@ public class AddNoteDialog extends DialogFragment
      *    "{External Storage}/Kiwix/Notes/ZimFileTitle/ArticleTitle.txt"
      * */
 
-    if (isExternalStorageWritable()) {
+    if (KiwixApplication.getInstance().isExternalStorageWritable()) {
 
       if (ContextCompat.checkSelfPermission(getContext(),
         Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
@@ -415,10 +416,6 @@ public class AddNoteDialog extends DialogFragment
     }
   }
 
-  static boolean isExternalStorageWritable() {
-    return Environment.MEDIA_MOUNTED.equals(Environment.getExternalStorageState());
-  }
-
   private void showToast(int stringResource, int duration) {
     Toast.makeText(getActivity(), stringResource, duration).show();
   }

app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java

@@ -26,7 +26,6 @@ import android.appwidget.AppWidgetManager;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.Context;
-import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -86,7 +85,6 @@ import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import com.google.android.material.navigation.NavigationView;
 import com.google.android.material.snackbar.Snackbar;
 import io.reactivex.android.schedulers.AndroidSchedulers;
-
 import java.io.File;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -136,8 +134,6 @@ import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_LIBRARY;
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_SEARCH;
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_ZIM_FILE;
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_ZIM_FILE_2;
-import static org.kiwix.kiwixmobile.utils.Constants.NOTES_DIRECTORY;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_KIWIX_MOBILE;
 import static org.kiwix.kiwixmobile.utils.Constants.REQUEST_FILE_SEARCH;
 import static org.kiwix.kiwixmobile.utils.Constants.REQUEST_FILE_SELECT;
 import static org.kiwix.kiwixmobile.utils.Constants.REQUEST_HISTORY_ITEM_CHOSEN;
@@ -154,6 +150,7 @@ import static org.kiwix.kiwixmobile.utils.Constants.TAG_CURRENT_TAB;
 import static org.kiwix.kiwixmobile.utils.Constants.TAG_FILE_SEARCHED;
 import static org.kiwix.kiwixmobile.utils.Constants.TAG_KIWIX;
 import static org.kiwix.kiwixmobile.utils.LanguageUtils.getResourceString;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_KIWIX_MOBILE;
 import static org.kiwix.kiwixmobile.utils.StyleUtils.dialogStyle;
 import static org.kiwix.kiwixmobile.utils.UpdateUtils.reformatProviderUrl;
 
@@ -364,7 +361,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     setupDocumentParser();
 
     if (BuildConfig.IS_CUSTOM_APP) {
-      Log.d(TAG_KIWIX, "This is a custom app:" +BuildConfig.APPLICATION_ID);
+      Log.d(TAG_KIWIX, "This is a custom app:" + BuildConfig.APPLICATION_ID);
       if (loadCustomAppContent()) {
         Log.d(TAG_KIWIX, "Found custom content, continuing...");
         // Continue
@@ -375,7 +372,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         // it didn't crash yet today the app crashes because it tries to load books
         // in onResume();
       }
-
     } else {
 
       manageExternalLaunchAndRestoringViewState();
@@ -645,7 +641,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     Uri kiwixBrowserMarketUri =
       Uri.parse("http://play.google.com/store/apps/details?id=" + getPackageName());
 
-
     Intent goToMarket = new Intent(Intent.ACTION_VIEW, kiwixLocalMarketUri);
 
     goToMarket.addFlags(Intent.FLAG_ACTIVITY_NO_HISTORY |
@@ -853,7 +848,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     switch (item.getItemId()) {
-      case R.id.menu_new_tab:
       case android.R.id.home:
         if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
           hideTabSwitcher();
@@ -861,17 +855,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         newTab(HOME_URL);
         return true;
 
-      case R.id.menu_home:
-        openMainPage();
-        break;
-
-      case R.id.menu_searchintext:
-        compatCallback.setActive();
-        compatCallback.setWebView(getCurrentWebView());
-        startSupportActionMode(compatCallback);
-        compatCallback.showSoftInput();
-        break;
-
       case R.id.menu_add_note:
         if (requestExternalStorageWritePermissionForNotes()) {
           // Check permission since notes are stored in the public-external storage
@@ -879,12 +862,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         }
         break;
 
-      case R.id.menu_clear_notes:
-        if (requestExternalStorageWritePermissionForNotes()) { // Check permission since notes are stored in the public-external storage
-          showClearAllNotesDialog();
-        }
-        break;
-
       case R.id.menu_bookmarks_list:
         goToBookmarks();
         break;
@@ -950,75 +927,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     return super.onOptionsItemSelected(item);
   }
 
-  /** Dialog to take user confirmation before deleting all notes */
-  private void showClearAllNotesDialog() {
-
-    AlertDialog.Builder builder;
-    if (sharedPreferenceUtil != null && sharedPreferenceUtil.nightMode()) { // Night Mode support
-      builder = new AlertDialog.Builder(this, R.style.AppTheme_Dialog_Night);
-    } else {
-      builder = new AlertDialog.Builder(this);
-    }
-
-    builder.setMessage(R.string.delete_notes_confirmation_msg)
-        .setNegativeButton(android.R.string.cancel, null) // Do nothing for 'Cancel' button
-        .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
-          @Override
-          public void onClick(DialogInterface dialog, int which) {
-            clearAllNotes();
-          }
-        })
-        .show();
-  }
-
-  /** Method to delete all user notes */
-  void clearAllNotes() {
-
-    boolean result = true; // Result of all delete() calls is &&-ed to this variable
-
-    if (AddNoteDialog.isExternalStorageWritable()) {
-      if (ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE)
-          != PackageManager.PERMISSION_GRANTED) {
-        Log.d("MainActivity", "WRITE_EXTERNAL_STORAGE permission not granted");
-        showToast(R.string.ext_storage_permission_not_granted, Toast.LENGTH_LONG);
-        return;
-      }
-
-      // TODO: Replace below code with Kotlin's deleteRecursively() method
-
-      File notesDirectory = new File(NOTES_DIRECTORY);
-      File[] filesInNotesDirectory = notesDirectory.listFiles();
-
-      if (filesInNotesDirectory == null) { // Notes folder doesn't exist
-        showToast(R.string.notes_deletion_none_found, Toast.LENGTH_LONG);
-        return;
-      }
-
-      for (File wikiFileDirectory : filesInNotesDirectory) {
-        if (wikiFileDirectory.isDirectory()) {
-          File[] filesInWikiDirectory = wikiFileDirectory.listFiles();
-
-          for (File noteFile : filesInWikiDirectory) {
-            if (noteFile.isFile()) {
-              result = result && noteFile.delete();
-            }
-          }
-        }
-
-        result = result && wikiFileDirectory.delete(); // Wiki specific notes directory deleted
-      }
-
-      result =
-          result && notesDirectory.delete(); // "{External Storage}/Kiwix/Notes" directory deleted
-    }
-
-    if (result) {
-      showToast(R.string.notes_deletion_successful, Toast.LENGTH_SHORT);
-    } else {
-      showToast(R.string.notes_deletion_unsuccessful, Toast.LENGTH_SHORT);
-    }
-  }
-
   /** Creates the full screen AddNoteDialog, which is a DialogFragment */
   private void showAddNoteDialog() {
     FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
@@ -1246,7 +1154,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
           showAddNoteDialog();
         } else {
           Toast.makeText(getApplicationContext(),
-              getString(R.string.ext_storage_write_permission_denied_add_note), Toast.LENGTH_LONG);
+            getString(R.string.ext_storage_write_permission_denied_add_note), Toast.LENGTH_LONG)
+            .show();
         }
 
         break;
@@ -1290,9 +1199,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
   private void initAllMenuItems() {
     try {
       menu.findItem(R.id.menu_fullscreen).setVisible(true);
-      menu.findItem(R.id.menu_home).setVisible(true);
       menu.findItem(R.id.menu_random_article).setVisible(true);
-      menu.findItem(R.id.menu_searchintext).setVisible(true);
 
       MenuItem searchItem = menu.findItem(R.id.menu_search);
       searchItem.setVisible(true);
@@ -1368,7 +1275,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     boolean isBookmark = false;
     if (articleUrl != null && !bookmarks.contains(articleUrl)) {
       if (ZimContentProvider.getId() != null) {
-        presenter.saveBookmark( BookmarkItem.fromZimContentProvider(getCurrentWebView().getTitle(), articleUrl));
+        presenter.saveBookmark(
+          BookmarkItem.fromZimContentProvider(getCurrentWebView().getTitle(), articleUrl));
       } else {
         Toast.makeText(this, R.string.unable_to_add_to_bookmarks, Toast.LENGTH_SHORT).show();
       }
@@ -1590,13 +1498,10 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
   private void toggleActionItemsConfig() {
     if (menu != null) {
       MenuItem random = menu.findItem(R.id.menu_random_article);
-      MenuItem home = menu.findItem(R.id.menu_home);
       if (getResources().getConfiguration().orientation == ORIENTATION_LANDSCAPE) {
         random.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
-        home.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
       } else {
         random.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
-        home.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
       }
     }
   }
@@ -1747,9 +1652,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
     if (tabSwitcherRoot.getVisibility() == View.VISIBLE) {
       menu.findItem(R.id.menu_search).setVisible(false);
       menu.findItem(R.id.menu_fullscreen).setVisible(false);
-      menu.findItem(R.id.menu_home).setVisible(false);
       menu.findItem(R.id.menu_random_article).setVisible(false);
-      menu.findItem(R.id.menu_searchintext).setVisible(false);
       menu.findItem(R.id.menu_read_aloud).setVisible(false);
     } else {
       menu.findItem(R.id.menu_search).setVisible(true);
@@ -1757,15 +1660,11 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
       if (getCurrentWebView().getUrl() == null ||
         getCurrentWebView().getUrl().equals(HOME_URL)) {
         menu.findItem(R.id.menu_read_aloud).setVisible(false);
-        menu.findItem(R.id.menu_home).setVisible(false);
         menu.findItem(R.id.menu_random_article).setVisible(false);
-        menu.findItem(R.id.menu_searchintext).setVisible(false);
         menu.findItem(R.id.menu_host_books).setVisible(true);
       } else {
         menu.findItem(R.id.menu_read_aloud).setVisible(true);
-        menu.findItem(R.id.menu_home).setVisible(true);
         menu.findItem(R.id.menu_random_article).setVisible(true);
-        menu.findItem(R.id.menu_searchintext).setVisible(true);
       }
     }
     return true;
@@ -1976,7 +1875,8 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         FileUtils.getLocalFilePathByUri(getApplicationContext(), getIntent().getData());
 
       if (filePath == null || !new File(filePath).exists()) {
-        Toast.makeText(MainActivity.this, getString(R.string.error_file_not_found), Toast.LENGTH_LONG)
+        Toast.makeText(MainActivity.this, getString(R.string.error_file_not_found),
+          Toast.LENGTH_LONG)
           .show();
         return;
       }
@@ -1998,7 +1898,6 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
         Log.d(TAG_KIWIX, "Kiwix normal start, no zimFile loaded last time  -> display home page");
         showHomePage();
       }
-
     }
   }
 

app/src/main/java/org/kiwix/kiwixmobile/settings/KiwixSettingsActivity.java

@@ -19,6 +19,7 @@
 
 package org.kiwix.kiwixmobile.settings;
 
+import android.Manifest;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
@@ -37,6 +38,7 @@ import android.widget.Toast;
 import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.content.ContextCompat;
 import eu.mhutti1.utils.storage.StorageDevice;
 import eu.mhutti1.utils.storage.StorageSelectDialog;
 import java.io.File;
@@ -44,27 +46,27 @@ import java.util.List;
 import java.util.Locale;
 import javax.inject.Inject;
 import kotlin.Unit;
+import kotlin.io.FilesKt;
 import org.kiwix.kiwixmobile.BuildConfig;
 import org.kiwix.kiwixmobile.KiwixApplication;
 import org.kiwix.kiwixmobile.R;
 import org.kiwix.kiwixmobile.base.BaseActivity;
+import org.kiwix.kiwixmobile.extensions.ContextExtensionsKt;
+import org.kiwix.kiwixmobile.main.AddNoteDialog;
 import org.kiwix.kiwixmobile.main.MainActivity;
 import org.kiwix.kiwixmobile.utils.LanguageUtils;
 import org.kiwix.kiwixmobile.utils.SharedPreferenceUtil;
 
 import static org.kiwix.kiwixmobile.utils.Constants.EXTRA_WEBVIEWS_LIST;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_AUTONIGHTMODE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_CLEAR_ALL_HISTORY;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_CREDITS;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_LANG;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_NIGHTMODE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_STORAGE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_VERSION;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_WIFI_ONLY;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_ZOOM;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_ZOOM_ENABLED;
 import static org.kiwix.kiwixmobile.utils.Constants.RESULT_HISTORY_CLEARED;
 import static org.kiwix.kiwixmobile.utils.Constants.RESULT_RESTART;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_AUTONIGHTMODE;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_LANG;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_NIGHTMODE;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_STORAGE;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_WIFI_ONLY;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_ZOOM;
+import static org.kiwix.kiwixmobile.utils.SharedPreferenceUtil.PREF_ZOOM_ENABLED;
 import static org.kiwix.kiwixmobile.utils.StyleUtils.dialogStyle;
 
 public class KiwixSettingsActivity extends BaseActivity {
@@ -112,6 +114,10 @@ public class KiwixSettingsActivity extends BaseActivity {
     SettingsContract.View,
     SharedPreferences.OnSharedPreferenceChangeListener {
 
+    public static final String PREF_VERSION = "pref_version";
+    public static final String PREF_CLEAR_ALL_HISTORY = "pref_clear_all_history";
+    public static final String PREF_CLEAR_ALL_NOTES = "pref_clear_all_notes";
+    public static final String PREF_CREDITS = "pref_credits";
     @Inject
     SettingsPresenter presenter;
     @Inject
@@ -298,6 +304,40 @@ public class KiwixSettingsActivity extends BaseActivity {
         .show();
     }
 
+    private void showClearAllNotesDialog() {
+      AlertDialog.Builder builder;
+      if (sharedPreferenceUtil.nightMode()) { // Night Mode support
+        builder = new AlertDialog.Builder(getActivity(), R.style.AppTheme_Dialog_Night);
+      } else {
+        builder = new AlertDialog.Builder(getActivity());
+      }
+
+      builder.setMessage(R.string.delete_notes_confirmation_msg)
+        .setNegativeButton(android.R.string.cancel, null) // Do nothing for 'Cancel' button
+        .setPositiveButton(R.string.yes, (dialog, which) -> clearAllNotes())
+        .show();
+    }
+
+    private void clearAllNotes() {
+      if (KiwixApplication.getInstance().isExternalStorageWritable()) {
+        if (ContextCompat.checkSelfPermission(getActivity(),
+          Manifest.permission.WRITE_EXTERNAL_STORAGE)
+          != PackageManager.PERMISSION_GRANTED) {
+          ContextExtensionsKt.toast(getActivity(), R.string.ext_storage_permission_not_granted,
+            Toast.LENGTH_LONG);
+          return;
+        }
+
+        if (FilesKt.deleteRecursively(new File(AddNoteDialog.NOTES_DIRECTORY))) {
+          ContextExtensionsKt.toast(getActivity(), R.string.notes_deletion_successful,
+            Toast.LENGTH_SHORT);
+          return;
+        }
+      }
+      ContextExtensionsKt.toast(getActivity(), R.string.notes_deletion_unsuccessful,
+        Toast.LENGTH_SHORT);
+    }
+
     public void openCredits() {
       WebView view =
         (WebView) LayoutInflater.from(getActivity()).inflate(R.layout.credits_webview, null);
@@ -318,6 +358,9 @@ public class KiwixSettingsActivity extends BaseActivity {
       if (preference.getKey().equalsIgnoreCase(PREF_CLEAR_ALL_HISTORY)) {
         clearAllHistoryDialog();
       }
+      if (preference.getKey().equalsIgnoreCase(PREF_CLEAR_ALL_NOTES)) {
+        showClearAllNotesDialog();
+      }
 
       if (preference.getKey().equalsIgnoreCase(PREF_CREDITS)) {
         openCredits();
@@ -332,15 +375,12 @@ public class KiwixSettingsActivity extends BaseActivity {
 
     public void openFolderSelect() {
       StorageSelectDialog dialogFragment = new StorageSelectDialog();
-      dialogFragment.setOnSelectListener(storageDevice -> {
+      dialogFragment.setOnSelectListener(this::onStorageDeviceSelected);
-        selectionCallback(storageDevice);
-        return Unit.INSTANCE;
-      });
       dialogFragment.show(((AppCompatActivity) getActivity()).getSupportFragmentManager(),
         getResources().getString(R.string.pref_storage));
     }
 
-    private void selectionCallback(StorageDevice storageDevice) {
+    private Unit onStorageDeviceSelected(StorageDevice storageDevice) {
       findPreference(PREF_STORAGE).setSummary(
         storageCalculator.calculateAvailableSpace(storageDevice.getFile())
       );
@@ -354,6 +394,7 @@ public class KiwixSettingsActivity extends BaseActivity {
         sharedPreferenceUtil.putPrefStorageTitle(
           getResources().getString(R.string.external_storage));
       }
+      return Unit.INSTANCE;
     }
   }
 }

app/src/main/java/org/kiwix/kiwixmobile/utils/Constants.java

@@ -17,8 +17,6 @@
  */
 package org.kiwix.kiwixmobile.utils;
 
-import android.os.Environment;
-
 import org.kiwix.kiwixmobile.BuildConfig;
 
 public final class Constants {
@@ -49,46 +47,6 @@ public final class Constants {
 
   public static final int RESULT_HISTORY_CLEARED = 1239;
 
-  // Prefs
-  public static final String PREF_LANG = "pref_language_chooser";
-
-  public static final String PREF_VERSION = "pref_version";
-
-  public static final String PREF_CLEAR_ALL_HISTORY = "pref_clear_all_history";
-
-  public static final String PREF_CREDITS = "pref_credits";
-
-  public static final String PREF_STORAGE = "pref_select_folder";
-
-  public static final String PREF_AUTONIGHTMODE = "pref_auto_nightmode";
-
-  public static final String PREF_NIGHTMODE = "pref_nightmode";
-
-  public static final String PREF_WIFI_ONLY = "pref_wifi_only";
-
-  public static final String PREF_KIWIX_MOBILE = "kiwix-mobile";
-
-  public static final String PREF_BACK_TO_TOP = "pref_backtotop";
-
-  public static final String PREF_HIDE_TOOLBAR = "pref_hidetoolbar";
-
-  public static final String PREF_ZOOM = "pref_zoom_slider";
-
-  public static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled";
-
-  public static final String PREF_FULLSCREEN = "pref_fullscreen";
-
-  public static final String PREF_NEW_TAB_BACKGROUND = "pref_newtab_background";
-
-  public static final String PREF_FULL_TEXT_SEARCH = "pref_full_text_search";
-
-  public static final String PREF_STORAGE_TITLE = "pref_selected_title";
-
-  public static final String PREF_EXTERNAL_LINK_POPUP = "pref_external_link_popup";
-
-  public static final String PREF_IS_FIRST_RUN = "isFirstRun";
-
-  public static final String PREF_SHOW_INTRO = "showIntro";
 
   // Tags
   public static final String TAG_FILE_SEARCHED = "searchedarticle";
@@ -138,7 +96,4 @@ public final class Constants {
   public static final String OLD_PROVIDER_DOMAIN = "org.kiwix.zim.base";
 
   public static final String NEW_PROVIDER_DOMAIN = BuildConfig.APPLICATION_ID + ".zim.base";
-
-  // Path Constants
-  public static final String NOTES_DIRECTORY = Environment.getExternalStorageDirectory() + "/Kiwix/Notes/";
 }

app/src/main/java/org/kiwix/kiwixmobile/utils/SharedPreferenceUtil.java

@@ -5,34 +5,35 @@ import android.content.SharedPreferences;
 import android.os.Environment;
 import android.preference.PreferenceManager;
 import io.reactivex.Flowable;
-import io.reactivex.processors.BehaviorProcessor;
 import io.reactivex.processors.PublishProcessor;
 import java.util.Calendar;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_AUTONIGHTMODE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_BACK_TO_TOP;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_EXTERNAL_LINK_POPUP;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_FULLSCREEN;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_HIDE_TOOLBAR;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_IS_FIRST_RUN;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_LANG;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_NEW_TAB_BACKGROUND;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_NIGHTMODE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_SHOW_INTRO;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_STORAGE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_STORAGE_TITLE;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_WIFI_ONLY;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_ZOOM;
-import static org.kiwix.kiwixmobile.utils.Constants.PREF_ZOOM_ENABLED;
-
 /**
  * Manager for the Default Shared Preferences of the application.
  */
 
 @Singleton
 public class SharedPreferenceUtil {
+  // Prefs
+  public static final String PREF_LANG = "pref_language_chooser";
+  public static final String PREF_STORAGE = "pref_select_folder";
+  public static final String PREF_AUTONIGHTMODE = "pref_auto_nightmode";
+  public static final String PREF_NIGHTMODE = "pref_nightmode";
+  public static final String PREF_WIFI_ONLY = "pref_wifi_only";
+  public static final String PREF_KIWIX_MOBILE = "kiwix-mobile";
+  public static final String PREF_BACK_TO_TOP = "pref_backtotop";
+  public static final String PREF_HIDE_TOOLBAR = "pref_hidetoolbar";
+  public static final String PREF_ZOOM = "pref_zoom_slider";
+  public static final String PREF_ZOOM_ENABLED = "pref_zoom_enabled";
+  public static final String PREF_FULLSCREEN = "pref_fullscreen";
+  public static final String PREF_NEW_TAB_BACKGROUND = "pref_newtab_background";
+  public static final String PREF_FULL_TEXT_SEARCH = "pref_full_text_search";
+  public static final String PREF_STORAGE_TITLE = "pref_selected_title";
+  public static final String PREF_EXTERNAL_LINK_POPUP = "pref_external_link_popup";
+  public static final String PREF_IS_FIRST_RUN = "isFirstRun";
+  public static final String PREF_SHOW_INTRO = "showIntro";
   private static final String PREF_SHOW_BOOKMARKS_CURRENT_BOOK = "show_bookmarks_current_book";
   private static final String PREF_SHOW_HISTORY_CURRENT_BOOK = "show_history_current_book";
   private SharedPreferences sharedPreferences;
@@ -59,7 +60,6 @@ public class SharedPreferenceUtil {
     return sharedPreferences.getBoolean(PREF_FULLSCREEN, false);
   }
 
-
   public boolean getPrefBackToTop() {
     return sharedPreferences.getBoolean(PREF_BACK_TO_TOP, false);
   }
@@ -127,7 +127,7 @@ public class SharedPreferenceUtil {
     prefStorages.onNext(storage);
   }
 
-  public Flowable<String> getPrefStorages(){
+  public Flowable<String> getPrefStorages() {
     return prefStorages.startWith(getPrefStorage());
   }
 

app/src/main/res/drawable/ic_baseline_delete_sweep_24px.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M15,16h4v2h-4zM15,8h7v2h-7zM15,12h6v2h-6zM3,18c0,1.1 0.9,2 2,2h6c1.1,0 2,-0.9 2,-2L13,8L3,8v10zM14,5h-3l-1,-1L6,4L5,5L2,5v2h12z"/>
-</vector>

app/src/main/res/menu/menu_main.xml

@@ -1,102 +1,85 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+  xmlns:app="http://schemas.android.com/apk/res-auto"
+  xmlns:tools="http://schemas.android.com/tools">
 
   <item
     android:id="@+id/menu_search"
     android:icon="@drawable/action_search"
     android:title="@string/menu_search"
     android:visible="false"
-      app:showAsAction="always"/>
+    tools:visible="true"
+    app:showAsAction="always" />
 
   <item
     android:id="@+id/menu_tab_switcher"
     android:title="@string/switch_tabs"
     app:actionLayout="@layout/ic_tab_switcher"
-      app:showAsAction="always"/>
+    app:showAsAction="always" />
-
-  <item
-    android:id="@+id/menu_add_note"
-    android:title="@string/add_note"
-    android:icon="@drawable/ic_add_note"
-    app:showAsAction="ifRoom"/>
-
-  <item
-    android:id="@+id/menu_clear_notes"
-    android:title="@string/clear_all_notes"
-    android:icon="@drawable/ic_baseline_delete_sweep_24px"
-    app:showAsAction="ifRoom"/>
-
-  <item
-      android:id="@+id/menu_new_tab"
-      android:title="@string/new_tab"
-      app:showAsAction="never"/>
 
   <item
     android:id="@+id/menu_bookmarks_list"
     android:title="@string/menu_bookmarks_list"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_history"
     android:title="@string/history"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
   <item
-      android:id="@+id/menu_home"
+    android:id="@+id/menu_openfile"
-      android:icon="@drawable/action_home"
+    android:icon="@drawable/action_open_file"
-      android:title="@string/menu_home"
+    android:title="@string/menu_zim_manager"
-      android:visible="false"
+    app:showAsAction="never" />
-      app:showAsAction="never"/>
+
+  <item
+    android:id="@+id/menu_add_note"
+    android:icon="@drawable/ic_add_note"
+    android:title="@string/note"
+    app:showAsAction="ifRoom" />
+
 
   <item
     android:id="@+id/menu_random_article"
     android:icon="@drawable/action_randomarticle"
     android:title="@string/menu_random_article"
     android:visible="false"
-      app:showAsAction="never"/>
+    tools:visible="true"
+    app:showAsAction="never" />
 
-  <item
-      android:id="@+id/menu_openfile"
-      android:icon="@drawable/action_open_file"
-      android:title="@string/menu_zim_manager"
-      app:showAsAction="never"/>
-
-  <item
-      android:id="@+id/menu_searchintext"
-      android:title="@string/menu_search_in_text"
-      android:visible="false"
-      app:showAsAction="never"/>
 
   <item
     android:id="@+id/menu_fullscreen"
     android:title="@string/menu_full_screen"
     android:visible="false"
-      app:showAsAction="never"/>
+    tools:visible="true"
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_read_aloud"
     android:title="@string/menu_read_aloud"
     android:visible="false"
-      app:showAsAction="never"/>
+    tools:visible="true"
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_host_books"
     android:title="@string/menu_host_books"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_help"
     android:title="@string/menu_help"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_settings"
     android:title="@string/menu_settings"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
   <item
     android:id="@+id/menu_support_kiwix"
     android:title="@string/menu_support_kiwix"
-      app:showAsAction="never"/>
+    app:showAsAction="never" />
 
 </menu>

app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources xmlns:tools="http://schemas.android.com/tools">
   <string name="kiwi">Kiwi</string>
-  <string name="menu_zim_manager">Get Content</string>
+  <string name="menu_zim_manager">Library</string>
   <string name="menu_help">Help</string>
   <string name="menu_home">Home</string>
   <string name="menu_settings">Settings</string>
@@ -237,7 +237,6 @@
   </string-array>
   <string name="bookmarks_from_current_book">Bookmarks from current book</string>
   <string name="search_bookmarks">Search bookmarks</string>
-  <string name="new_tab">New tab</string>
   <string name="switch_tabs">Switch tabs</string>
   <string name="smiling_face">:D</string>
   <string name="close_all_tabs">Close all tabs</string>
@@ -260,7 +259,6 @@
   <string name="failed_unhandled_http_code">Unknown HTTP code received</string>
   <string name="failed_unknown">Unknown</string>
   <string name="failed_http_code">HTTP code %s</string>
-  <string name="add_note">Add Note</string>
   <string name="save">Save</string>
   <string name="note">Note</string>
   <string name="wiki_article_title">Wiki Article Title</string>
@@ -272,10 +270,8 @@
   <string name="note_share_error_file_missing">Note file doesn\'t exist</string>
   <string name="note_share_app_chooser_title">Share note file with:</string>
   <string name="confirmation_alert_dialog_message">Discard unsaved changes?</string>
-  <string name="clear_all_notes">Clear All Notes</string>
   <string name="delete_notes_confirmation_msg">Delete all notes?</string>
   <string name="ext_storage_permission_not_granted">Error: Storage permissions not granted</string>
-  <string name="notes_deletion_none_found">No notes found for deletion</string>
   <string name="notes_deletion_successful">Entire notes folder deleted</string>
   <string name="notes_deletion_unsuccessful">Some files not deleted</string>
   <plurals name="books_count">
@@ -308,4 +304,6 @@
   <string name="performing_handshake">Performing handshake....</string>
   <string name="local_zim_sharing">Local ZIM Sharing</string>
   <string name="status">Status</string>
+  <string name="pref_clear_all_notes_summary">Clears all notes on all articles</string>
+  <string name="pref_clear_all_notes_title">Clear all notes</string>
 </resources>

app/src/main/res/xml/preferences.xml

@@ -101,6 +101,16 @@
         android:summary="@string/pref_clear_all_history_summary"
         android:title="@string/pref_clear_all_history_title"/>
 
+  </PreferenceCategory>
+  <PreferenceCategory
+    android:key="pref_notes"
+    android:title="Notes">
+
+    <Preference
+      android:key="pref_clear_all_notes"
+      android:summary="@string/pref_clear_all_notes_summary"
+      android:title="@string/pref_clear_all_notes_title"/>
+
   </PreferenceCategory>
   <PreferenceCategory
       android:key="pref_language"