X-Git-Url: https://git.ktnx.net/?p=mobile-ledger.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fprofile_detail.xml;h=c1aea4dc3a1830e268bd040e90bf05684ad9b936;hp=2667a5200d6d2d066667ac3fa4704ab3d162101a;hb=HEAD;hpb=340a2bbb2750aff33e99f63335402f1c45da66b5

diff --git a/app/src/main/res/layout/profile_detail.xml b/app/src/main/res/layout/profile_detail.xml
index 2667a520..f2218a3a 100644
--- a/app/src/main/res/layout/profile_detail.xml
+++ b/app/src/main/res/layout/profile_detail.xml
@@ -68,7 +68,7 @@
         android:orientation="vertical"
         >
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/enable_http_auth"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -144,67 +144,83 @@
         </LinearLayout>
 
         <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/api_version_layout"
+            android:id="@+id/server_version_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             >
 
             <TextView
-                android:id="@+id/api_version_label"
-                android:layout_width="match_parent"
+                android:id="@+id/server_version_label"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:text="@string/profile_api_version_title"
+                android:text="@string/profile_server_version_title"
                 android:textAppearance="?android:textAppearanceListItem"
+                app:layout_constraintEnd_toStartOf="@id/server_version_detect_button"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
                 />
 
             <TextView
-                android:id="@+id/api_version_text"
+                android:id="@+id/detected_server_version_text"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
+                android:layout_marginEnd="8dp"
+                android:gravity="start"
                 android:textAppearance="?android:textAppearanceListItemSecondary"
                 android:textColor="?attr/textColor"
-                app:layout_constraintEnd_toStartOf="@id/detected_version_text"
+                android:text="@string/server_version_unknown_label"
+                app:layout_constraintEnd_toStartOf="@id/server_version_detect_button"
+                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/api_version_label"
+                app:layout_constraintTop_toBottomOf="@id/server_version_label"
                 />
+            <ProgressBar
+                android:layout_height="24dp"
+                android:id="@+id/server_version_detect_button"
+                android:layout_width="24dp"
+                android:indeterminate="true"
+                android:foregroundGravity="bottom"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/detected_server_version_text"
+                android:visibility="invisible"
+                />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/api_version_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            >
+
             <TextView
-                android:id="@+id/detected_version_label"
+                android:id="@+id/api_version_label"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:gravity="end"
-                android:text="@string/detected_version_label"
-                android:textAppearance="?android:textAppearanceListItemSecondary"
-                app:layout_constraintEnd_toStartOf="@id/detected_version_text"
+                android:layout_marginEnd="24dp"
+                android:text="@string/profile_api_version_title"
+                android:textAppearance="?android:textAppearanceListItem"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/api_version_text"
+                app:layout_constraintTop_toTopOf="parent"
                 />
+
             <TextView
-                android:id="@+id/detected_version_text"
-                android:layout_width="wrap_content"
+                android:id="@+id/api_version_text"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8dp"
-                android:text="@string/api_version_unknown_label"
+                android:layout_marginEnd="24dp"
                 android:textAppearance="?android:textAppearanceListItemSecondary"
                 android:textColor="?attr/textColor"
-                app:layout_constraintEnd_toStartOf="@id/api_version_detect_button"
-                app:layout_constraintTop_toBottomOf="@id/api_version_text"
-                />
-            <TextView
-                android:id="@+id/api_version_detect_button"
-                android:layout_width="24dp"
-                android:layout_height="0dp"
-                android:drawableBottom="@drawable/ic_refresh_primary_24dp"
-                android:foregroundGravity="bottom"
-                app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/api_version_label"
                 />
         </androidx.constraintlayout.widget.ConstraintLayout>
 
-        <Switch
+        <com.google.android.material.switchmaterial.SwitchMaterial
             android:id="@+id/profile_permit_posting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -247,7 +263,7 @@
                     />
             </LinearLayout>
 
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/profile_show_commodity"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -256,7 +272,7 @@
                 android:textAppearance="?android:textAppearanceListItem"
                 />
 
-            <Switch
+            <com.google.android.material.switchmaterial.SwitchMaterial
                 android:id="@+id/profile_show_comments"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
@@ -291,7 +307,7 @@
             </LinearLayout>
 
             <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/preferred_accounts_accounts_filter_layout"
+                android:id="@+id/preferred_accounts_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="16dp"
@@ -299,7 +315,7 @@
                 >
 
                 <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/preferred_accounts_filter_filter"
+                    android:id="@+id/preferred_accounts_filter"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:fontFamily="monospace"