Move Web Apps to the end of the buttons lists

Signed-off-by: Songlin Jiang <[email protected]>
Igalia · Aug 1, 2023 · 84f56ab · 84f56ab
1 parent 856f3a7
commit 84f56ab
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 22 deletions.
diff --git a/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java b/app/src/common/shared/com/igalia/wolvic/ui/widgets/WindowWidget.java
@@ -538,12 +538,7 @@ public void switchPanel(@Windows.PanelType int panelType) {
             hidePanel(true);
 
         } else {
-            if (mViewModel.getIsDownloadsVisible().getValue().get()) {
-                hideDownloadsPanel(false);
-            }
-            if (mViewModel.getIsAddonsVisible().getValue().get()) {
-                hideAddonsPanel(false);
-            }
+            hideAllPanel(false);
             showPanel(panelType, true);
             mViewModel.refresh();
         }
@@ -554,12 +549,7 @@ public void switchDownloadsPanel() {
             hideDownloadsPanel(true);
 
         } else {
-            if (mViewModel.getIsLibraryVisible().getValue().get()) {
-                hidePanel(false);
-            }
-            if (mViewModel.getIsAddonsVisible().getValue().get()) {
-                hideAddonsPanel(false);
-            }
+            hideAllPanel(false);
             showDownloadsPanel(true);
             mViewModel.refresh();
         }
@@ -570,12 +560,7 @@ public void switchAddonsPanel() {
             hideAddonsPanel(true);
 
         } else {
-            if (mViewModel.getIsLibraryVisible().getValue().get()) {
-                hidePanel(false);
-            }
-            if (mViewModel.getIsDownloadsVisible().getValue().get()) {
-                hideDownloadsPanel(false);
-            }
+            hideAllPanel(false);
             showAddonsPanel(true);
             mViewModel.refresh();
         }

diff --git a/app/src/main/res/layout/library.xml b/app/src/main/res/layout/library.xml
@@ -34,13 +34,13 @@
                         android:onClick="@{(view) -> delegate != null ? delegate.onButtonClick(view) : void}"/>
                     <com.igalia.wolvic.ui.views.UIButton
                         style="@style/libraryButtonMiddleTheme"
-                        android:src="@drawable/ic_icon_webapps"
-                        android:id="@+id/web_apps"
+                        android:src="@drawable/ic_icon_history"
+                        android:id="@+id/history"
                         android:onClick="@{(view) -> delegate != null ? delegate.onButtonClick(view) : void}"/>
                     <com.igalia.wolvic.ui.views.UIButton
                         style="@style/libraryButtonMiddleTheme"
-                        android:src="@drawable/ic_icon_history"
-                        android:id="@+id/history"
+                        android:src="@drawable/ic_icon_webapps"
+                        android:id="@+id/web_apps"
                         android:onClick="@{(view) -> delegate != null ? delegate.onButtonClick(view) : void}"/>
                     <com.igalia.wolvic.ui.views.UIButton
                         style="@style/libraryButtonMiddleTheme"