X-Git-Url: https://git.ktnx.net/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fres%2Flayout%2Fprofile_detail.xml;h=3c192f6d74dd10bc2f587a59049112983c91f050;hb=35050728743d57f5edc80658c19b03bd1be28b00;hp=4c8bba39bcf7ed4c6bec1624c01cc96a9f738d39;hpb=5144bddd6f2b5611c0d7bd912b9a6f72e78a3f0a;p=mobile-ledger.git

diff --git a/app/src/main/res/layout/profile_detail.xml b/app/src/main/res/layout/profile_detail.xml
index 4c8bba39..3c192f6d 100644
--- a/app/src/main/res/layout/profile_detail.xml
+++ b/app/src/main/res/layout/profile_detail.xml
@@ -16,8 +16,8 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/profile_detail"
     style="?android:attr/textAppearanceLarge"
     android:layout_width="match_parent"
@@ -64,51 +64,22 @@
         android:animateLayoutChanges="true"
         android:orientation="vertical">
 
-        <Switch
-            android:id="@+id/profile_permit_posting"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="16dp"
-            android:textAppearance="?android:textAppearanceListItem"
-            android:text="@string/posting_permitted" />
-
-        <LinearLayout
-            android:id="@+id/future_dates_layout"
-            android:layout_width="match_parent"
-            android:layout_marginBottom="16dp"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <TextView
-                android:id="@+id/future_dates_title"
-                android:textAppearance="?android:textAppearanceListItem"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/profile_future_dates_label" />
-
-            <TextView
-                android:id="@+id/future_dates_text"
-                android:textAppearance="?android:textAppearanceListItemSecondary"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:textColor="?attr/textColor"/>
-        </LinearLayout>
-
         <Switch
             android:id="@+id/enable_http_auth"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
-            android:textAppearance="?android:textAppearanceListItem"
-            android:text="@string/pref_title_use_http_auth" />
+            android:text="@string/pref_title_use_http_auth"
+            android:textAppearance="?android:textAppearanceListItem" />
 
         <LinearLayout
             android:id="@+id/auth_params"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp"
+            android:animateLayoutChanges="true"
             android:orientation="vertical"
             android:paddingStart="8dp"
-            android:animateLayoutChanges="true"
             tools:ignore="RtlSymmetry">
 
             <LinearLayout
@@ -116,13 +87,14 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="@dimen/activity_vertical_margin"
-                android:background="@color/error_background"
+                android:background="?colorError"
                 android:padding="@dimen/activity_vertical_margin"
                 android:visibility="gone">
 
                 <TextView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:textColor="?colorOnError"
                     android:text="@string/insecure_scheme_with_auth" />
             </LinearLayout>
 
@@ -161,23 +133,121 @@
 
         </LinearLayout>
 
-        <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/preferred_accounts_accounts_filter_layout"
+        <LinearLayout
+            android:id="@+id/api_version_layout"
+            android:orientation="vertical"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="16dp">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/profile_api_version_title"
+                android:textAppearance="?android:textAppearanceListItem" />
+
+            <TextView
+                android:id="@+id/api_version_text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAppearance="?android:textAppearanceListItemSecondary"
+                android:textColor="?attr/textColor" />
+        </LinearLayout>
+
+        <Switch
+            android:id="@+id/profile_permit_posting"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
+            android:text="@string/posting_permitted"
+            android:textAppearance="?android:textAppearanceListItem" />
+
+        <LinearLayout
+            android:id="@+id/posting_sub_items"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <com.google.android.material.textfield.TextInputEditText
-                android:id="@+id/preferred_accounts_filter_filter"
+            <LinearLayout
+                android:id="@+id/default_commodity_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:clickable="true"
+                android:focusable="true"
+                android:orientation="vertical">
+
+                <TextView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/profile_default_commodity"
+                    android:textAppearance="?android:textAppearanceListItem" />
+
+                <TextView
+                    android:id="@+id/default_commodity_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/btn_no_currency"
+                    android:textAppearance="?android:textAppearanceListItemSecondary"
+                    android:textColor="?attr/textColor" />
+            </LinearLayout>
+
+            <Switch
+                android:id="@+id/profile_show_commodity"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:text="@string/currency_input_by_default"
+                android:textAppearance="?android:textAppearanceListItem" />
+
+            <Switch
+                android:id="@+id/profile_show_comments"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:text="@string/show_comment_input_by_default"
+                android:textAppearance="?android:textAppearanceListItem" />
+
+            <LinearLayout
+                android:id="@+id/future_dates_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:ems="10"
-                android:fontFamily="monospace"
-                android:hint="@string/pref_preferred_autocompletion_account_filter_hint"
-                android:inputType="text"
-                android:textColor="?attr/editTextColor" />
-        </com.google.android.material.textfield.TextInputLayout>
+                android:layout_marginBottom="16dp"
+                android:orientation="vertical">
+
+                <TextView
+                    android:id="@+id/future_dates_title"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/profile_future_dates_label"
+                    android:textAppearance="?android:textAppearanceListItem" />
+
+                <TextView
+                    android:id="@+id/future_dates_text"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textAppearance="?android:textAppearanceListItemSecondary"
+                    android:textColor="?attr/textColor" />
+            </LinearLayout>
+
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/preferred_accounts_accounts_filter_layout"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="16dp"
+                android:orientation="vertical">
+
+                <com.google.android.material.textfield.TextInputEditText
+                    android:id="@+id/preferred_accounts_filter_filter"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:ems="10"
+                    android:fontFamily="monospace"
+                    android:hint="@string/pref_preferred_autocompletion_account_filter_hint"
+                    android:inputType="text"
+                    android:textColor="?attr/editTextColor" />
+            </com.google.android.material.textfield.TextInputLayout>
+        </LinearLayout>
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -189,8 +259,8 @@
                 android:layout_height="match_parent"
                 android:layout_weight="100"
                 android:gravity="center_vertical"
-                android:textAppearance="?android:textAppearanceListItem"
-                android:text="@string/profile_color_label" />
+                android:text="@string/profile_color_label"
+                android:textAppearance="?android:textAppearanceListItem" />
 
             <ImageButton
                 android:id="@+id/btn_pick_ring_color"
@@ -199,8 +269,8 @@
                 android:layout_weight="1"
                 android:background="?colorPrimary"
                 android:contentDescription="@string/btn_color_picker_button"
-                android:src="@drawable/ic_palette_black_24dp"
-                android:tint="?drawer_background" />
+                app:srcCompat="@drawable/ic_palette_black_24dp"
+                android:tint="?android:attr/colorBackground" />
 
         </LinearLayout>