From 887d9a249fd5bc5ba5c66fa67c3c2ba5d82b3112 Mon Sep 17 00:00:00 2001
From: Severiano Jaramillo <severiano.jaramillo@gmail.com>
Date: Tue, 15 Jan 2019 21:43:24 -0600
Subject: [PATCH] Improve FilterOptionsDialog layout by moving the
 'IgnoreNetworkFees' section above the 'Fiat Amount' section.

---
 .../main/res/layout/dialog_filter_options.xml | 28 ++++++++++---------
 app/src/main/res/values/strings.xml           |  2 +-
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/app/src/main/res/layout/dialog_filter_options.xml b/app/src/main/res/layout/dialog_filter_options.xml
index 3ed9ae4..e6352f0 100644
--- a/app/src/main/res/layout/dialog_filter_options.xml
+++ b/app/src/main/res/layout/dialog_filter_options.xml
@@ -127,12 +127,24 @@
         tools:listitem="@android:layout/simple_list_item_1"
         app:layout_constraintTop_toBottomOf="@id/cbAsset"/>
 
+    <!-- Ignore Agorise Fees -->
+
+    <Switch
+        android:id="@+id/switchAgoriseFees"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/spacing_same_topic"
+        android:switchPadding="12dp"
+        android:text="@string/text__ignore_network_fees"
+        android:textSize="16sp"
+        android:textColor="?android:textColorSecondary"
+        app:layout_constraintTop_toBottomOf="@id/sAsset"/>
+
     <!-- Fiat Amount -->
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="2dp"
         android:text="@string/text__fiat_amount"
         android:textSize="16sp"
         app:layout_constraintTop_toTopOf="@id/cbFiatAmount"
@@ -142,10 +154,10 @@
         android:id="@+id/cbFiatAmount"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_same_topic"
+        android:layout_marginTop="@dimen/spacing_different_topic"
         android:text="@string/text__all"
         android:enabled="false"
-        app:layout_constraintTop_toBottomOf="@id/sAsset"
+        app:layout_constraintTop_toBottomOf="@id/switchAgoriseFees"
         app:layout_constraintEnd_toEndOf="parent"/>
 
     <LinearLayout
@@ -187,14 +199,4 @@
 
     </LinearLayout>
 
-    <Switch
-        android:id="@+id/switchAgoriseFees"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/spacing_different_topic"
-        android:switchPadding="12dp"
-        android:text="@string/msg__ignore_transaction_fees"
-        android:textSize="16sp"
-        app:layout_constraintTop_toBottomOf="@id/llFiatAmount"/>
-
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8e85f60..f226a6f 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,7 +58,7 @@
     <string name="text__received">Received</string>
     <string name="text__date_range">Date Range</string>
     <string name="text__fiat_amount">Fiat Amount</string>
-    <string name="msg__ignore_transaction_fees">Ignore transaction network fees</string>
+    <string name="text__ignore_network_fees">Ignore Network fees</string>
     <string name="button__filter">Filter</string>
 
     <!-- Send Transaction -->