Added "more" icons on Save To Permanent screen.

Updated versionCode.
PermanentOrg · Nov 10, 2022 · ac36fa5 · ac36fa5
1 parent f9599f7
commit ac36fa5
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -16,7 +16,7 @@ android {
         applicationId "org.permanent.PermanentArchive"
         minSdkVersion 26
         targetSdkVersion 32
-        versionCode 39
+        versionCode 40
         versionName "1.5.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/res/drawable/ic_more_horizontal_black.xml b/app/src/main/res/drawable/ic_more_horizontal_black.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#000000"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_save_to_permanent.xml b/app/src/main/res/layout/fragment_save_to_permanent.xml
@@ -160,20 +160,31 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
-                android:layout_marginEnd="16dp"
                 android:ellipsize="end"
                 android:fontFamily="@font/open_sans"
                 android:letterSpacing="-0.01"
                 android:maxLines="1"
+                android:onClick="@{() -> viewModel.onDestinationArchiveClick()}"
                 android:text="@{viewModel.currentArchiveName}"
                 android:textColor="@color/black"
                 android:textSize="14sp"
-                android:onClick="@{() -> viewModel.onDestinationArchiveClick()}"
                 app:layout_constraintBottom_toBottomOf="@+id/ivArchiveThumb"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/btnArchiveMore"
                 app:layout_constraintStart_toEndOf="@id/ivArchiveThumb"
                 app:layout_constraintTop_toTopOf="@+id/ivArchiveThumb" />
 
+            <Button
+                android:id="@+id/btnArchiveMore"
+                style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+                android:layout_width="38dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                app:icon="@drawable/ic_more_horizontal_black"
+                app:iconTint="@color/middleGrey"
+                app:layout_constraintBottom_toBottomOf="@+id/ivArchiveThumb"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/ivArchiveThumb" />
+
             <View
                 android:id="@+id/viewDividerArchive"
                 android:layout_width="match_parent"
@@ -200,20 +211,31 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="12dp"
-                android:layout_marginEnd="16dp"
                 android:ellipsize="end"
                 android:fontFamily="@font/open_sans"
                 android:letterSpacing="-0.01"
                 android:maxLines="1"
+                android:onClick="@{() -> viewModel.onDestinationFolderClick()}"
                 android:text="@{viewModel.destinationFolderName}"
                 android:textColor="@color/black"
                 android:textSize="14sp"
-                android:onClick="@{() -> viewModel.onDestinationFolderClick()}"
                 app:layout_constraintBottom_toBottomOf="@+id/ivFolderThumb"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintEnd_toStartOf="@+id/btnFolderMore"
                 app:layout_constraintStart_toEndOf="@id/ivFolderThumb"
                 app:layout_constraintTop_toTopOf="@+id/ivFolderThumb" />
 
+            <Button
+                android:id="@+id/btnFolderMore"
+                style="@style/Widget.MaterialComponents.Button.TextButton.Icon"
+                android:layout_width="38dp"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="16dp"
+                app:icon="@drawable/ic_more_horizontal_black"
+                app:iconTint="@color/middleGrey"
+                app:layout_constraintBottom_toBottomOf="@+id/ivFolderThumb"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintTop_toTopOf="@+id/ivFolderThumb" />
+
             <View
                 android:id="@+id/viewDividerFolder"
                 android:layout_width="match_parent"