From d6da72d22ddf6716f699b59224ed0e5e94fc6666 Mon Sep 17 00:00:00 2001
From: Andreas Schildbach <andreas.schildbach@bloq.com>
Date: Thu, 12 Dec 2019 12:25:37 +0100
Subject: [PATCH] layouts.xml: Base wallet layout on screen width and height,
 rather than screen size qualifier.

---
 wallet/res/values-h400dp/layouts.xml                      | 1 +
 wallet/res/{values-small-land => values-land}/layouts.xml | 0
 wallet/res/values-large-land/layouts.xml                  | 5 -----
 wallet/res/values-normal-land/layouts.xml                 | 5 -----
 wallet/res/values-small/layouts.xml                       | 4 ----
 wallet/res/values-w720dp/layouts.xml                      | 2 ++
 wallet/res/values-xlarge/layouts.xml                      | 5 -----
 wallet/res/values/layouts.xml                             | 2 +-
 8 files changed, 4 insertions(+), 20 deletions(-)
 rename wallet/res/{values-small-land => values-land}/layouts.xml (100%)
 delete mode 100644 wallet/res/values-large-land/layouts.xml
 delete mode 100644 wallet/res/values-normal-land/layouts.xml
 delete mode 100644 wallet/res/values-small/layouts.xml
 delete mode 100644 wallet/res/values-xlarge/layouts.xml

diff --git a/wallet/res/values-h400dp/layouts.xml b/wallet/res/values-h400dp/layouts.xml
index 5ba04603f3..2dadd5685a 100644
--- a/wallet/res/values-h400dp/layouts.xml
+++ b/wallet/res/values-h400dp/layouts.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <item name="show_local_balance" type="bool">true</item>
     <bool name="show_wallet_address_dialog_hint">true</bool>
 </resources>
diff --git a/wallet/res/values-small-land/layouts.xml b/wallet/res/values-land/layouts.xml
similarity index 100%
rename from wallet/res/values-small-land/layouts.xml
rename to wallet/res/values-land/layouts.xml
diff --git a/wallet/res/values-large-land/layouts.xml b/wallet/res/values-large-land/layouts.xml
deleted file mode 100644
index b1b0a2404f..0000000000
--- a/wallet/res/values-large-land/layouts.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="wallet_content" type="layout">@layout/wallet_activity_twopanes</item>
-    <item name="show_exchange_rates_option" type="bool">false</item>
-</resources>
diff --git a/wallet/res/values-normal-land/layouts.xml b/wallet/res/values-normal-land/layouts.xml
deleted file mode 100644
index 1a34592392..0000000000
--- a/wallet/res/values-normal-land/layouts.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="wallet_content" type="layout">@layout/wallet_activity_onepane_horizontal</item>
-    <item name="show_local_balance" type="bool">false</item>
-</resources>
diff --git a/wallet/res/values-small/layouts.xml b/wallet/res/values-small/layouts.xml
deleted file mode 100644
index 7284b674af..0000000000
--- a/wallet/res/values-small/layouts.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="show_local_balance" type="bool">false</item>
-</resources>
diff --git a/wallet/res/values-w720dp/layouts.xml b/wallet/res/values-w720dp/layouts.xml
index cdb9fa0600..0a02f14494 100644
--- a/wallet/res/values-w720dp/layouts.xml
+++ b/wallet/res/values-w720dp/layouts.xml
@@ -1,4 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <item name="wallet_content" type="layout">@layout/wallet_activity_twopanes</item>
+    <item name="show_exchange_rates_option" type="bool">false</item>
     <item name="wallet_actions_top" type="bool">true</item>
 </resources>
diff --git a/wallet/res/values-xlarge/layouts.xml b/wallet/res/values-xlarge/layouts.xml
deleted file mode 100644
index b1b0a2404f..0000000000
--- a/wallet/res/values-xlarge/layouts.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="wallet_content" type="layout">@layout/wallet_activity_twopanes</item>
-    <item name="show_exchange_rates_option" type="bool">false</item>
-</resources>
diff --git a/wallet/res/values/layouts.xml b/wallet/res/values/layouts.xml
index ab5b697b7e..a6cbcf2380 100644
--- a/wallet/res/values/layouts.xml
+++ b/wallet/res/values/layouts.xml
@@ -2,9 +2,9 @@
 <resources>
     <item name="wallet_content" type="layout">@layout/wallet_activity_onepane_vertical</item>
     <item name="wallet_actions_top" type="bool">false</item>
+    <item name="show_local_balance" type="bool">false</item>
     <bool name="show_wallet_address_dialog_hint">false</bool>
     <item name="address_book_content" type="layout">@layout/address_book_onepane</item>
     <item name="network_monitor_content" type="layout">@layout/network_monitor_onepane</item>
     <item name="show_exchange_rates_option" type="bool">true</item>
-    <item name="show_local_balance" type="bool">true</item>
 </resources>