PR review #2

MozillaReality · Oct 23, 2019 · 915dea2 · 915dea2
1 parent 4fb9a4c
commit 915dea2
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 11 deletions.
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/BookmarkAdapter.java
@@ -62,10 +62,10 @@ public BookmarkAdapter(@Nullable BookmarkItemCallback clickCallback, Context aCo
         setHasStableIds(false);
     }
 
-    public void setNarrow(boolean isNarrow, int first, int last) {
+    public void setNarrow(boolean isNarrow) {
         if (mIsNarrowLayout != isNarrow) {
             mIsNarrowLayout = isNarrow;
-            notifyItemRangeChanged(first, last);
+            notifyDataSetChanged();
         }
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/adapters/HistoryAdapter.java
@@ -62,10 +62,10 @@ public HistoryAdapter(@Nullable HistoryItemCallback clickCallback, Context aCont
         setHasStableIds(true);
     }
 
-    public void setNarrow(boolean isNarrow, int first, int last) {
+    public void setNarrow(boolean isNarrow) {
         if (mIsNarrowLayout != isNarrow) {
             mIsNarrowLayout = isNarrow;
-            notifyItemRangeChanged(first, last);
+            notifyDataSetChanged();
         }
     }
 

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/BookmarksView.java
@@ -292,10 +292,9 @@ private void updateLayout() {
         post(() -> {
             double width = Math.ceil(getWidth()/getContext().getResources().getDisplayMetrics().density);
             boolean isNarrow = width < SettingsStore.WINDOW_WIDTH_DEFAULT;
+
             if (isNarrow != mBinding.getIsNarrow()) {
-                int firstVisibleItem = ((LinearLayoutManager) mBinding.bookmarksList.getLayoutManager()).findFirstVisibleItemPosition();
-                int lastVisibleItem = ((LinearLayoutManager) mBinding.bookmarksList.getLayoutManager()).findLastVisibleItemPosition();
-                mBookmarkAdapter.setNarrow(isNarrow, firstVisibleItem, lastVisibleItem);
+                mBookmarkAdapter.setNarrow(isNarrow);
 
                 mBinding.setIsNarrow(isNarrow);
                 mBinding.executePendingBindings();

diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/HistoryView.java
@@ -337,9 +337,7 @@ private void updateLayout() {
             boolean isNarrow = width < SettingsStore.WINDOW_WIDTH_DEFAULT;
 
             if (isNarrow != mBinding.getIsNarrow()) {
-                int firstVisibleItem = ((LinearLayoutManager) mBinding.historyList.getLayoutManager()).findFirstVisibleItemPosition();
-                int lastVisibleItem = ((LinearLayoutManager) mBinding.historyList.getLayoutManager()).findLastVisibleItemPosition();
-                mHistoryAdapter.setNarrow(width < SettingsStore.WINDOW_WIDTH_DEFAULT, firstVisibleItem, lastVisibleItem);
+                mHistoryAdapter.setNarrow(isNarrow);
 
                 mBinding.setIsNarrow(isNarrow);
                 mBinding.executePendingBindings();

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -521,7 +521,7 @@
 
     <!-- This string is used to in the Library panels to the left of the sync button to indicate
          that the content has never been synced yet. -->
-    <string name="fxa_account_last_no_synced">No synced yet</string>
+    <string name="fxa_account_last_no_synced">Not synced yet</string>
 
     <!-- This string is used to in the Library panels to the left of the sync button to indicate
          that the syncing is off. -->