Merge pull request #1710 from yashk2000/patch-1

#1708 Add a text when Bookmarks or History is empty

core/src/main/java/org/kiwix/kiwixmobile/core/bookmark/BookmarksActivity.java

@@ -19,12 +19,16 @@
 package org.kiwix.kiwixmobile.core.bookmark;
 
 import android.content.Intent;
+import android.database.DataSetObserver;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.Settings;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
+
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.view.ActionMode;
 import androidx.appcompat.widget.SearchView;
@@ -61,6 +65,8 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
   Toolbar toolbar;
   @BindView(R2.id.recycler_view)
   RecyclerView recyclerView;
+  @BindView(R2.id.no_bookmarks)
+  TextView noBookmarks;
   @Inject
   BookmarksContract.Presenter presenter;
   @Inject
@@ -129,8 +135,19 @@ public class BookmarksActivity extends BaseActivity implements BookmarksContract
       actionBar.setTitle(R.string.menu_bookmarks);
     }
 
-    bookmarksAdapter = new BookmarksAdapter(bookmarksList, deleteList, this);
+    setupBookmarksAdapter();
     recyclerView.setAdapter(bookmarksAdapter);
+
+  }
+
+  private void setupBookmarksAdapter() {
+    bookmarksAdapter = new BookmarksAdapter(bookmarksList, deleteList, this);
+    bookmarksAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+      @Override public void onChanged() {
+        super.onChanged();
+        noBookmarks.setVisibility(bookmarksList.size() == 0 ? View.VISIBLE : View.GONE);
+      }
+    });
   }
 
   @Override

core/src/main/java/org/kiwix/kiwixmobile/core/history/HistoryActivity.java

@@ -25,7 +25,9 @@ import android.os.Parcelable;
 import android.provider.Settings;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.TextView;
 import android.widget.Toast;
 import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.view.ActionMode;
@@ -70,6 +72,8 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
   ZimReaderContainer zimReaderContainer;
   @BindView(R2.id.recycler_view)
   RecyclerView recyclerView;
+  @BindView(R2.id.no_history)
+  TextView noHistory;
   private boolean refreshAdapter = true;
   private HistoryAdapter historyAdapter;
   private LinearLayoutManager layoutManager;
@@ -140,12 +144,22 @@ public class HistoryActivity extends BaseActivity implements HistoryContract.Vie
       actionBar.setTitle(R.string.history);
     }
 
-    historyAdapter = new HistoryAdapter(historyList, deleteList, this);
+    setupHistoryAdapter();
     recyclerView.setAdapter(historyAdapter);
     layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager();
     recyclerView.setLayoutManager(layoutManager);
   }
 
+  private void setupHistoryAdapter() {
+    historyAdapter = new HistoryAdapter(historyList, deleteList, this);
+    historyAdapter.registerAdapterDataObserver(new RecyclerView.AdapterDataObserver() {
+      @Override public void onChanged() {
+        super.onChanged();
+        noHistory.setVisibility(historyList.size() == 0 ? View.VISIBLE : View.GONE);
+      }
+    });
+  }
+
   @Override
   protected void onResume() {
     super.onResume();

core/src/main/res/layout/activity_bookmarks.xml

@@ -7,6 +7,19 @@
 
   <include layout="@layout/layout_standard_app_bar" />
 
+  <TextView
+    android:id="@+id/no_bookmarks"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/no_bookmarks"
+    android:textAppearance="@style/TextAppearance.KiwixTheme.Headline5"
+    android:visibility="gone"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/app_bar"
+    />
+
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="0dp"

core/src/main/res/layout/activity_history.xml

@@ -7,6 +7,19 @@
 
   <include layout="@layout/layout_standard_app_bar" />
 
+  <TextView
+    android:id="@+id/no_history"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
+    android:text="@string/no_history"
+    android:visibility="gone"
+    android:textAppearance="@style/TextAppearance.KiwixTheme.Headline5"
+    app:layout_constraintBottom_toBottomOf="parent"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    app:layout_constraintTop_toBottomOf="@id/app_bar"
+    />
+
   <androidx.recyclerview.widget.RecyclerView
     android:id="@+id/recycler_view"
     android:layout_width="0dp"

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

@@ -293,6 +293,8 @@
   <string name="grant_read_storage_permission">This app requires the ability to read storage to function. Please grant the permission in your settings</string>
   <string name="go_to_permissions">Go to Settings</string>
   <string name="no_results">No Results</string>
+  <string name="no_bookmarks">No Bookmarks</string>
+  <string name="no_history">No History</string>
   <string-array name="pref_night_modes_entries">
     <item>On</item>
     <item>Off</item>