app: support multiple named remotes

Let each folder select a named SSH endpoint and migrate the published
0.1.x configuration without discarding its folders or host pin.

4 files changed, 76 insertions, 68 deletions

diff --git a/app/src/main/res/layout/activity_folder.xml b/app/src/main/res/layout/activity_folder.xml
index 9709312..a67af55 100644
--- a/app/src/main/res/layout/activity_folder.xml
+++ b/app/src/main/res/layout/activity_folder.xml
@@ -76,10 +76,23 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/space_m"
                 android:textAppearance="@style/TextAppearance.Rsend.Caption"
+                android:text="Remote" />
+
+            <Spinner
+                android:id="@+id/remoteName"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/space_m"
+                android:textAppearance="@style/TextAppearance.Rsend.Caption"
                 android:text="Remote path" />
 
             <EditText
-                android:id="@+id/remote"
+                android:id="@+id/remotePath"
                 style="@style/Widget.Rsend.EditText"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index d58f907..20fe99b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -95,51 +95,6 @@
                 android:text="Setup" />
 
             <LinearLayout
-                android:id="@+id/rowRemote"
-                style="@style/Widget.Rsend.Row"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content">
-
-                <ImageView
-                    android:layout_width="24dp"
-                    android:layout_height="24dp"
-                    android:layout_marginEnd="@dimen/space_m"
-                    android:src="@drawable/ic_remote"
-                    android:contentDescription="@null" />
-
-                <LinearLayout
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_weight="1"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Rsend.Body"
-                        android:text="Remote" />
-
-                    <TextView
-                        android:id="@+id/remoteValue"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:textAppearance="@style/TextAppearance.Rsend.Caption" />
-                </LinearLayout>
-
-                <ImageView
-                    android:layout_width="20dp"
-                    android:layout_height="20dp"
-                    android:src="@drawable/ic_chevron"
-                    android:contentDescription="@null" />
-            </LinearLayout>
-
-            <View
-                android:layout_width="match_parent"
-                android:layout_height="@dimen/stroke"
-                android:layout_marginStart="40dp"
-                android:background="@color/outline" />
-
-            <LinearLayout
                 android:id="@+id/rowKey"
                 style="@style/Widget.Rsend.Row"
                 android:layout_width="match_parent"
@@ -371,6 +326,29 @@
             </LinearLayout>
         </LinearLayout>
 
+        <!-- Remotes -->
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="@dimen/space_s"
+            android:layout_marginBottom="@dimen/space_s"
+            android:textAppearance="@style/TextAppearance.Rsend.SectionHeader"
+            android:text="Remotes" />
+
+        <LinearLayout
+            android:id="@+id/remotes"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical" />
+
+        <Button
+            android:id="@+id/btnAddRemote"
+            style="@style/Widget.Rsend.Button.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/space_m"
+            android:text="+ Add remote" />
+
         <!-- Folders -->
         <TextView
             android:layout_width="match_parent"
@@ -386,28 +364,20 @@
             android:layout_height="wrap_content"
             android:orientation="vertical" />
 
-        <LinearLayout
+        <Button
+            android:id="@+id/btnAddFolder"
+            style="@style/Widget.Rsend.Button.Secondary"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="horizontal">
+            android:layout_marginBottom="@dimen/space_m"
+            android:text="+ Add folder" />
 
-            <Button
-                android:id="@+id/btnAddFolder"
-                style="@style/Widget.Rsend.Button.Secondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:layout_marginEnd="@dimen/space_s"
-                android:text="+ Add folder" />
-
-            <Button
-                android:id="@+id/btnLog"
-                style="@style/Widget.Rsend.Button.Secondary"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="View log" />
-        </LinearLayout>
+        <Button
+            android:id="@+id/btnLog"
+            style="@style/Widget.Rsend.Button.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="View log" />
     </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_remote.xml b/app/src/main/res/layout/activity_remote.xml
index 2c3ba4b..ab7690c 100644
--- a/app/src/main/res/layout/activity_remote.xml
+++ b/app/src/main/res/layout/activity_remote.xml
@@ -28,6 +28,22 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAppearance="@style/TextAppearance.Rsend.Caption"
+                android:text="Name" />
+
+            <EditText
+                android:id="@+id/name"
+                style="@style/Widget.Rsend.EditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:inputType="text"
+                android:hint="nas" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/space_m"
+                android:textAppearance="@style/TextAppearance.Rsend.Caption"
                 android:text="Host" />
 
             <EditText
@@ -95,6 +111,14 @@
                 android:text="Save" />
         </LinearLayout>
 
+        <Button
+            android:id="@+id/removeRemote"
+            style="@style/Widget.Rsend.Button.Secondary"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/space_s"
+            android:text="Remove" />
+
         <TextView
             android:id="@+id/status"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/item_folder.xml b/app/src/main/res/layout/item_row.xml
index bb5a2bf..a436874 100644
--- a/app/src/main/res/layout/item_folder.xml
+++ b/app/src/main/res/layout/item_row.xml
@@ -10,6 +10,7 @@
     android:foreground="?attr/selectableItemBackground">
 
     <ImageView
+        android:id="@+id/icon"
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:layout_marginEnd="@dimen/space_m"
@@ -23,7 +24,7 @@
         android:orientation="vertical">
 
         <TextView
-            android:id="@+id/folderName"
+            android:id="@+id/rowTitle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="1"
@@ -31,7 +32,7 @@
             android:textAppearance="@style/TextAppearance.Rsend.Title" />
 
         <TextView
-            android:id="@+id/folderPath"
+            android:id="@+id/rowSub"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:maxLines="1"
@@ -40,7 +41,7 @@
     </LinearLayout>
 
     <TextView
-        android:id="@+id/folderChip"
+        android:id="@+id/rowChip"
         style="@style/Widget.Rsend.Chip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"