Adding Locked Navigation to the home

BijoySingh · Dec 15, 2017 · a1e2b46 · a1e2b46
1 parent d876d26
commit a1e2b46
Show file tree

Hide file tree

Showing 25 changed files with 113 additions and 26 deletions.
diff --git a/app/src/main/java/com/bijoysingh/quicknote/activities/MainActivity.java b/app/src/main/java/com/bijoysingh/quicknote/activities/MainActivity.java
@@ -22,6 +22,7 @@
 import com.bijoysingh.quicknote.items.NoteRecyclerItem;
 import com.bijoysingh.quicknote.items.RecyclerItem;
 import com.bijoysingh.quicknote.recyclerview.NoteAppAdapter;
+import com.bijoysingh.quicknote.utils.HomeNavigationState;
 import com.bijoysingh.quicknote.utils.NoteState;
 import com.github.bijoysingh.starter.async.MultiAsyncTask;
 import com.github.bijoysingh.starter.async.SimpleThreadExecutor;
@@ -39,7 +40,7 @@ public class MainActivity extends ThemedActivity {
 
   RecyclerView recyclerView;
   NoteAppAdapter adapter;
-  NoteState mode;
+  HomeNavigationState mode;
   DataStore store;
 
   ImageView addList, homeNav, addRichNote, homeOptions, backButton, searchIcon, searchBackButton, searchCloseIcon;
@@ -55,7 +56,7 @@ public class MainActivity extends ThemedActivity {
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     setContentView(R.layout.activity_main);
-    mode = NoteState.DEFAULT;
+    mode = HomeNavigationState.DEFAULT;
     store = DataStore.get(this);
     executor = new SimpleThreadExecutor(1);
 
@@ -192,43 +193,62 @@ public List<Note> run() {
 
       @Override
       public void handle(List<Note> notes) {
-        adapter.clearItems();
-
-        if (notes.isEmpty()) {
-          adapter.addItem(new EmptyRecyclerItem());
-        }
-
-        for (Note note : notes) {
-          adapter.addItem(new NoteRecyclerItem(note));
-        }
+        handleNewItems(notes);
       }
     });
   }
 
-  public NoteState getMode() {
-    return mode == null ? NoteState.DEFAULT : mode;
+  public HomeNavigationState getMode() {
+    return mode == null ? HomeNavigationState.DEFAULT : mode;
   }
 
   public void onHomeClick() {
-    mode = NoteState.DEFAULT;
+    mode = HomeNavigationState.DEFAULT;
     loadNoteByStates(new String[]{NoteState.DEFAULT.name(), NoteState.FAVOURITE.name()});
   }
 
   public void onFavouritesClick() {
-    mode = NoteState.FAVOURITE;
+    mode = HomeNavigationState.FAVOURITE;
     loadNoteByStates(new String[]{NoteState.FAVOURITE.name()});
   }
 
   public void onArchivedClick() {
-    mode = NoteState.ARCHIVED;
+    mode = HomeNavigationState.ARCHIVED;
     loadNoteByStates(new String[]{NoteState.ARCHIVED.name()});
   }
 
   public void onTrashClick() {
-    mode = NoteState.TRASH;
+    mode = HomeNavigationState.TRASH;
     loadNoteByStates(new String[]{NoteState.TRASH.name()});
   }
 
+  public void onLockedClick() {
+    mode = HomeNavigationState.LOCKED;
+    MultiAsyncTask.execute(this, new MultiAsyncTask.Task<List<Note>>() {
+      @Override
+      public List<Note> run() {
+        return Note.db(MainActivity.this).getNoteByLocked(true);
+      }
+
+      @Override
+      public void handle(List<Note> notes) {
+        handleNewItems(notes);
+      }
+    });
+  }
+
+  private void handleNewItems(List<Note> notes) {
+    adapter.clearItems();
+
+    if (notes.isEmpty()) {
+      adapter.addItem(new EmptyRecyclerItem());
+    }
+
+    for (Note note : notes) {
+      adapter.addItem(new NoteRecyclerItem(note));
+    }
+  }
+
   public View.OnClickListener openNewNoteActivity() {
     return new View.OnClickListener() {
       @Override
@@ -263,7 +283,7 @@ public void onClick(View view) {
   }
 
   public void moveItemToTrashOrDelete(Note note) {
-    if (mode == NoteState.TRASH) {
+    if (mode == HomeNavigationState.TRASH) {
       note.delete(this);
       setupData();
       return;
@@ -299,6 +319,9 @@ public void setupData() {
       case TRASH:
         onTrashClick();
         return;
+      case LOCKED:
+        onLockedClick();
+        return;
       default:
       case DEFAULT:
         onHomeClick();

diff --git a/app/src/main/java/com/bijoysingh/quicknote/activities/sheets/HomeNavigationBottomSheet.kt b/app/src/main/java/com/bijoysingh/quicknote/activities/sheets/HomeNavigationBottomSheet.kt
@@ -7,6 +7,7 @@ import com.bijoysingh.quicknote.activities.MainActivity
 import com.bijoysingh.quicknote.activities.external.ImportNoteFromFileActivity
 import com.bijoysingh.quicknote.activities.external.getStoragePermissionManager
 import com.bijoysingh.quicknote.items.OptionsItem
+import com.bijoysingh.quicknote.utils.HomeNavigationState
 import com.bijoysingh.quicknote.utils.NoteState
 import com.github.bijoysingh.starter.util.IntentUtils
 
@@ -23,7 +24,7 @@ class HomeNavigationBottomSheet : OptionItemBottomSheetBase() {
         title = R.string.nav_home,
         subtitle = R.string.nav_home_details,
         icon = R.drawable.ic_home_white_48dp,
-        selected = activity.mode == NoteState.DEFAULT,
+        selected = activity.mode == HomeNavigationState.DEFAULT,
         listener = View.OnClickListener {
           activity.onHomeClick();
           dismiss();
@@ -33,7 +34,7 @@ class HomeNavigationBottomSheet : OptionItemBottomSheetBase() {
         title = R.string.nav_favourites,
         subtitle = R.string.nav_favourites_details,
         icon = R.drawable.ic_favorite_white_48dp,
-        selected = activity.mode == NoteState.FAVOURITE,
+        selected = activity.mode == HomeNavigationState.FAVOURITE,
         listener = View.OnClickListener {
           activity.onFavouritesClick();
           dismiss();
@@ -43,17 +44,27 @@ class HomeNavigationBottomSheet : OptionItemBottomSheetBase() {
         title = R.string.nav_archived,
         subtitle = R.string.nav_archived_details,
         icon = R.drawable.ic_archive_white_48dp,
-        selected = activity.mode == NoteState.ARCHIVED,
+        selected = activity.mode == HomeNavigationState.ARCHIVED,
         listener = View.OnClickListener {
           activity.onArchivedClick();
           dismiss();
         }
     ))
+    options.add(OptionsItem(
+        title = R.string.nav_locked,
+        subtitle = R.string.nav_locked_details,
+        icon = R.drawable.ic_action_lock,
+        selected = activity.mode == HomeNavigationState.LOCKED,
+        listener = View.OnClickListener {
+          activity.onLockedClick();
+          dismiss();
+        }
+    ))
     options.add(OptionsItem(
         title = R.string.nav_trash,
         subtitle = R.string.nav_trash_details,
         icon = R.drawable.ic_delete_white_48dp,
-        selected = activity.mode == NoteState.TRASH,
+        selected = activity.mode == HomeNavigationState.TRASH,
         listener = View.OnClickListener {
           activity.onTrashClick();
           dismiss();

diff --git a/app/src/main/java/com/bijoysingh/quicknote/database/NoteDao.java b/app/src/main/java/com/bijoysingh/quicknote/database/NoteDao.java
@@ -29,6 +29,9 @@ public interface NoteDao {
   @Query("SELECT * FROM note WHERE state in (:states) ORDER BY timestamp DESC")
   List<Note> getByNoteState(String[] states);
 
+  @Query("SELECT * FROM note WHERE locked = :locked ORDER BY timestamp DESC")
+  List<Note> getNoteByLocked(boolean locked);
+
   @Query("SELECT * FROM note ORDER BY timestamp DESC LIMIT :limit")
   List<Note> getNotes(int limit);
 

diff --git a/app/src/main/java/com/bijoysingh/quicknote/utils/HomeNavigationState.kt b/app/src/main/java/com/bijoysingh/quicknote/utils/HomeNavigationState.kt
@@ -0,0 +1,12 @@
+package com.bijoysingh.quicknote.utils
+
+/**
+ * Superset of the Note State class
+ */
+enum class HomeNavigationState {
+  DEFAULT,
+  TRASH,
+  FAVOURITE,
+  ARCHIVED,
+  LOCKED,
+}
diff --git a/app/src/main/java/com/bijoysingh/quicknote/utils/NoteState.kt b/app/src/main/java/com/bijoysingh/quicknote/utils/NoteState.kt
@@ -4,5 +4,5 @@ enum class NoteState {
   DEFAULT,
   TRASH,
   FAVOURITE,
-  ARCHIVED
+  ARCHIVED,
 }
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -114,4 +114,7 @@
   <string name="search_notes">بحث ملاحظات | |</string>
   <string name="open_in_notification">إنشاء إعلام</string>
   <string name="notification_channel_label">ملاحظة الإخطارات</string>
+  <string name="nav_locked">مقفل</string>
+  <string name="nav_locked_details">كل من الملاحظات الخاصة بك مؤمن</string>
+
 </resources>
diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -116,5 +116,7 @@
   <string name="nav_trash_details">ট্র্যাশ আপনার সমস্ত নোট</string>
   <string name="open_in_notification">বিজ্ঞপ্তি তৈরি করুন</string>
   <string name="notification_channel_label">নোট বিজ্ঞপ্তিগুলি</string>
+  <string name="nav_locked">লক</string>
+  <string name="nav_locked_details">আপনার লক নোট সব</string>
 
 </resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -115,5 +115,7 @@
   <string name="nav_trash_details">Alle Ihre Notizen im Papierkorb</string>
   <string name="open_in_notification">Benachrichtigung erstellen</string>
   <string name="notification_channel_label">Hinweis Benachrichtigungen</string>
+  <string name="nav_locked">Verschlossen</string>
+  <string name="nav_locked_details">Alle Ihre gesperrten Notizen</string>
 
 </resources>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
@@ -115,5 +115,7 @@
   <string name="nav_trash_details">Todas tus notas en la basura</string>
   <string name="open_in_notification">Crear notificación</string>
   <string name="notification_channel_label">Nota Notificaciones</string>
+  <string name="nav_locked">Bloqueado</string>
+  <string name="nav_locked_details">Todas tus notas bloqueadas</string>
 
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
@@ -114,5 +114,6 @@
   <string name="nav_trash_details">Toutes vos notes à la poubelle</string>
   <string name="open_in_notification">Créer une notification</string>
   <string name="notification_channel_label">Notifications de note</string>
-
+  <string name="nav_locked">Fermé à clef</string>
+  <string name="nav_locked_details">Toutes vos notes verrouillées</string>
 </resources>
diff --git a/app/src/main/res/values-hi/strings.xml b/app/src/main/res/values-hi/strings.xml
@@ -114,5 +114,6 @@
   <string name="nav_trash_details">कचरा में आपके सभी नोट्स</string>
   <string name="open_in_notification">अधिसूचना बनाएं</string>
   <string name="notification_channel_label">नोट नोटिफिकेशन</string>
-
+  <string name="nav_locked">बंद</string>
+  <string name="nav_locked_details">आपके सभी लॉक नोट्स</string>
 </resources>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
@@ -114,5 +114,7 @@
   <string name="nav_trash_details">Tutte le tue note nel cestino</string>
   <string name="open_in_notification">Crea notifica</string>
   <string name="notification_channel_label">Notare le notifiche</string>
+  <string name="nav_locked">Bloccato</string>
+  <string name="nav_locked_details">Tutte le tue note bloccate</string>
 
 </resources>
diff --git a/app/src/main/res/values-iw/strings.xml b/app/src/main/res/values-iw/strings.xml
@@ -115,5 +115,7 @@
   <string name="nav_trash_details">כל ההערות שלך באשפה</string>
   <string name="open_in_notification">צור הודעה</string>
   <string name="notification_channel_label">הערה הודעות</string>
+  <string name="nav_locked">נָעוּל</string>
+  <string name="nav_locked_details">כל ההערות הנעולות שלך</string>
 
 </resources>
diff --git a/app/src/main/res/values-mr/strings.xml b/app/src/main/res/values-mr/strings.xml
@@ -113,5 +113,6 @@
   <string name="nav_trash_details">कचरा मधील आपल्या सर्व नोट्स</string>
   <string name="open_in_notification">सूचना तयार करा</string>
   <string name="notification_channel_label">टीप सूचना</string>
-
+  <string name="nav_locked">लॉक केलेले</string>
+  <string name="nav_locked_details">आपली सर्व लॉक केलेली टिपा</string>
 </resources>
diff --git a/app/src/main/res/values-ms/strings.xml b/app/src/main/res/values-ms/strings.xml
@@ -114,5 +114,7 @@
   <string name="nav_trash_details">Semua nota anda di dalam tong sampah</string>
   <string name="open_in_notification">Buat Pemberitahuan</string>
   <string name="notification_channel_label">Pemberitahuan Nota</string>
+  <string name="nav_locked">Terkunci</string>
+  <string name="nav_locked_details">Semua nota terkunci anda</string>
 
 </resources>
diff --git a/app/src/main/res/values-pa/strings.xml b/app/src/main/res/values-pa/strings.xml
@@ -114,5 +114,7 @@
   <string name="nav_trash_details">ਰੱਦੀ ਵਿੱਚ ਤੁਹਾਡੇ ਸਾਰੇ ਨੋਟਸ</string>
   <string name="open_in_notification">ਸੂਚਨਾ ਬਣਾਓ</string>
   <string name="notification_channel_label">ਸੂਚਨਾ ਨੋਟਿਸ</string>
+  <string name="nav_locked">ਬੰਦ</string>
+  <string name="nav_locked_details">ਤੁਹਾਡੇ ਸਾਰੇ ਲਾਕ ਨੋਟਸ</string>
 
 </resources>
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
@@ -115,5 +115,7 @@
   <string name="nav_trash_details">Todas as suas notas no lixo</string>
   <string name="open_in_notification">Criar Notificação</string>
   <string name="notification_channel_label">Notificações de nota</string>
+  <string name="nav_locked">Bloqueado</string>
+  <string name="nav_locked_details">Todas as suas notas bloqueadas</string>
 
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -117,5 +117,7 @@
   <string name="home_option_markdown_settings_subtitle">Посмотрите, как использовать уценку в заметках</string>
   <string name="open_in_notification">Создать уведомление</string>
   <string name="notification_channel_label">Уведомления об уведомлениях</string>
+  <string name="nav_locked">запертый</string>
+  <string name="nav_locked_details">Все ваши заблокированные заметки</string>
 
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
@@ -115,6 +115,8 @@
   <string name="home_option_markdown_settings_subtitle">Notlarda markdown\'u nasıl kullanacağınızı öğrenin</string>
   <string name="open_in_notification">Bildirim Oluştur</string>
   <string name="notification_channel_label">Not Bildirimleri</string>
+  <string name="nav_locked">Kilitli</string>
+  <string name="nav_locked_details">Kilitli notların tümü</string>
 
 
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -113,5 +113,7 @@
   <string name="home_option_markdown_settings_subtitle">看看如何在笔记中使用降价</string>
   <string name="open_in_notification">创建通知</string>
   <string name="notification_channel_label">注意通知</string>
+  <string name="nav_locked">锁定</string>
+  <string name="nav_locked_details">所有锁定的笔记</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml
@@ -113,5 +113,7 @@
   <string name="home_option_markdown_settings_subtitle">看看如何在筆記中使用降價</string>
   <string name="open_in_notification">創建通知</string>
   <string name="notification_channel_label">注意通知</string>
+  <string name="nav_locked">鎖定</string>
+  <string name="nav_locked_details">所有鎖定的筆記</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rMO/strings.xml b/app/src/main/res/values-zh-rMO/strings.xml
@@ -113,5 +113,7 @@
   <string name="home_option_markdown_settings_subtitle">看看如何在筆記中使用降價</string>
   <string name="open_in_notification">創建通知</string>
   <string name="notification_channel_label">注意通知</string>
+  <string name="nav_locked">鎖定</string>
+  <string name="nav_locked_details">所有鎖定的筆記</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -114,5 +114,7 @@
   <string name="home_option_markdown_settings_subtitle">看看如何在筆記中使用降價</string>
   <string name="open_in_notification">創建通知</string>
   <string name="notification_channel_label">注意通知</string>
+  <string name="nav_locked">鎖定</string>
+  <string name="nav_locked_details">所有鎖定的筆記</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml
@@ -114,5 +114,7 @@
   <string name="home_option_markdown_settings_subtitle">看看如何在筆記中使用降價</string>
   <string name="open_in_notification">創建通知</string>
   <string name="notification_channel_label">注意通知</string>
+  <string name="nav_locked">鎖定</string>
+  <string name="nav_locked_details">所有鎖定的筆記</string>
 
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -56,6 +56,8 @@
   <string name="nav_favourites_details">All of your favourite notes</string>
   <string name="nav_archived">Archived</string>
   <string name="nav_archived_details">All of your archived notes</string>
+  <string name="nav_locked">Locked</string>
+  <string name="nav_locked_details">All of your locked notes</string>
   <string name="nav_trash">Trash</string>
   <string name="nav_trash_details">All of your notes in the trash</string>