fix

Author: WirelessAlien

app/src/main/java/com/wirelessalien/zipxtract/fragment/SevenZipFragment.kt

@@ -132,8 +132,8 @@ class SevenZipFragment : Fragment(), ArchiveItemAdapter.OnItemClickListener, Fil
             }
         })
 
-        binding.fabBack.setOnClickListener {
-            handleBackNavigation()
+        binding.cancelBtn.setOnClickListener {
+            parentFragmentManager.popBackStack()
         }
 
         adapter = ArchiveItemAdapter(requireContext(), emptyList())

app/src/main/res/layout/dialog_file_picker.xml

@@ -24,15 +24,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
         android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginBottom="11dp"
             android:layout_marginTop="10dp">
 
             <com.google.android.material.button.MaterialButton
@@ -42,7 +40,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
                 android:layout_marginStart="-16dp"
                 app:icon="@drawable/ic_arrow_back_default" />
 
@@ -86,6 +83,7 @@
                     android:text="@string/internal_storage"
                     android:clickable="true"
                     android:checkable="false"
+                    android:layout_marginEnd="8dp"
                     app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.Full"
                     android:visibility="visible" />
 

app/src/main/res/layout/dialog_path_picker.xml

@@ -24,15 +24,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginTop="16dp"
         android:orientation="vertical">
 
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
             android:layout_marginEnd="16dp"
-            android:layout_marginBottom="11dp"
             android:layout_marginTop="10dp">
 
             <com.google.android.material.button.MaterialButton
@@ -42,7 +40,6 @@
                 android:layout_height="wrap_content"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
-                android:layout_marginEnd="8dp"
                 android:layout_marginStart="-16dp"
                 app:icon="@drawable/ic_arrow_back_default" />
 
@@ -86,6 +83,7 @@
                     android:text="@string/internal_storage"
                     android:clickable="true"
                     android:checkable="false"
+                    android:layout_marginEnd="8dp"
                     app:shapeAppearance="@style/ShapeAppearance.Material3.Corner.Full"
                     android:visibility="visible" />
 

app/src/main/res/layout/fragment_seven_zip.xml

@@ -70,18 +70,17 @@
             android:id="@+id/fab_add_file"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_toStartOf="@id/fab_back"
+            android:layout_alignParentEnd="true"
             android:layout_marginEnd="10dp"
             style="@style/Widget.Material3.Button.TonalButton"
-            app:icon="@drawable/ic_add"
             android:text="@string/add"/>
 
         <com.google.android.material.button.MaterialButton
-            android:id="@+id/fab_back"
+            android:id="@+id/cancel_btn"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
-            android:layout_alignParentEnd="true"
-            app:icon="@drawable/ic_arrow_back"/>
+            style="@style/Widget.Material3.Button.TextButton"
+            android:layout_toStartOf="@id/fab_add_file"
+            android:text="@string/cancel"/>
     </RelativeLayout>
 </RelativeLayout>