Remove textual Bitcoin address from main screen.

atdweb · Oct 13, 2014 · 6baae4b · 6baae4b
1 parent d0d6710
commit 6baae4b
Show file tree

Hide file tree

Showing 47 changed files with 83 additions and 178 deletions.
diff --git a/wallet/res/layout/wallet_activity_onepane_vertical.xml b/wallet/res/layout/wallet_activity_onepane_vertical.xml
@@ -11,22 +11,27 @@
 		android:background="@color/bg_panel"
 		android:orientation="vertical" >
 
-		<fragment
-			android:id="@+id/wallet_address_fragment"
-			android:name="de.schildbach.wallet.ui.WalletAddressFragment"
+		<LinearLayout
 			android:layout_width="match_parent"
 			android:layout_height="wrap_content"
-			android:layout_marginBottom="8dp"
-			android:layout_marginLeft="16dp"
-			android:layout_marginRight="16dp"
-			android:layout_marginTop="16dp" />
-
-		<fragment
-			android:id="@+id/wallet_balance_fragment"
-			android:name="de.schildbach.wallet.ui.WalletBalanceFragment"
-			android:layout_width="match_parent"
-			android:layout_height="wrap_content"
-			android:layout_gravity="center" />
+			android:baselineAligned="false"
+			android:orientation="horizontal" >
+
+			<fragment
+				android:id="@+id/wallet_balance_fragment"
+				android:name="de.schildbach.wallet.ui.WalletBalanceFragment"
+				android:layout_width="0px"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:layout_weight="1" />
+
+			<fragment
+				android:id="@+id/wallet_address_fragment"
+				android:name="de.schildbach.wallet.ui.WalletAddressFragment"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_margin="8dp" />
+		</LinearLayout>
 
 		<FrameLayout
 			android:layout_width="match_parent"

diff --git a/wallet/res/layout/wallet_activity_twopanes.xml b/wallet/res/layout/wallet_activity_twopanes.xml
@@ -5,48 +5,57 @@
 	android:layout_height="match_parent"
 	android:orientation="vertical" >
 
-	<TableLayout
+	<LinearLayout
 		android:layout_width="match_parent"
 		android:layout_height="0px"
 		android:layout_weight="1"
-		android:background="#d8d8e0" >
+		android:orientation="horizontal" >
 
-		<TableRow>
+		<FrameLayout
+			android:layout_width="320sp"
+			android:layout_height="match_parent"
+			android:background="#efefef" >
 
 			<fragment
-				android:id="@+id/wallet_balance_fragment"
-				android:name="de.schildbach.wallet.ui.WalletBalanceFragment"
-				android:layout_gravity="center_vertical"
-				android:layout_weight="1" />
+				android:id="@+id/exchange_rates_fragment"
+				android:name="de.schildbach.wallet.ui.ExchangeRatesFragment"
+				android:layout_width="match_parent"
+				android:layout_height="match_parent" />
+		</FrameLayout>
 
-			<fragment
-				android:id="@+id/wallet_address_fragment"
-				android:name="de.schildbach.wallet.ui.WalletAddressFragment"
-				android:layout_gravity="center_vertical"
-				android:layout_margin="16dp"
-				android:layout_weight="2" />
-		</TableRow>
+		<LinearLayout
+			android:layout_width="0px"
+			android:layout_height="match_parent"
+			android:layout_weight="1"
+			android:background="@color/bg_panel"
+			android:orientation="vertical" >
 
-		<TableRow>
+			<LinearLayout
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:baselineAligned="false"
+				android:orientation="horizontal" >
 
-			<FrameLayout
-				android:layout_height="match_parent"
-				android:layout_weight="1"
-				android:background="#efefef"
-				android:foreground="@drawable/fragment_shadow_horizontal_light"
-				android:foregroundGravity="top|fill_horizontal" >
+				<fragment
+					android:id="@+id/wallet_balance_fragment"
+					android:name="de.schildbach.wallet.ui.WalletBalanceFragment"
+					android:layout_width="0px"
+					android:layout_height="wrap_content"
+					android:layout_gravity="center"
+					android:layout_weight="1" />
 
 				<fragment
-					android:id="@+id/exchange_rates_fragment"
-					android:name="de.schildbach.wallet.ui.ExchangeRatesFragment"
-					android:layout_width="match_parent"
-					android:layout_height="match_parent" />
-			</FrameLayout>
+					android:id="@+id/wallet_address_fragment"
+					android:name="de.schildbach.wallet.ui.WalletAddressFragment"
+					android:layout_width="wrap_content"
+					android:layout_height="wrap_content"
+					android:layout_margin="8dp" />
+			</LinearLayout>
 
 			<FrameLayout
-				android:layout_height="match_parent"
-				android:layout_span="2"
-				android:layout_weight="4"
+				android:layout_width="match_parent"
+				android:layout_height="0px"
+				android:layout_weight="1"
 				android:background="@android:color/white"
 				android:foreground="@drawable/fragment_shadow_horizontal_light"
 				android:foregroundGravity="top|fill_horizontal" >
@@ -55,10 +64,11 @@
 					android:id="@+id/wallet_transactions_fragment"
 					android:name="de.schildbach.wallet.ui.WalletTransactionsFragment"
 					android:layout_width="match_parent"
-					android:layout_height="match_parent" />
+					android:layout_height="match_parent"
+					android:layout_gravity="bottom|center_horizontal" />
 			</FrameLayout>
-		</TableRow>
-	</TableLayout>
+		</LinearLayout>
+	</LinearLayout>
 
 	<include layout="@layout/wallet_activity_bottom_include" />
 

diff --git a/wallet/res/layout/wallet_address_fragment.xml b/wallet/res/layout/wallet_address_fragment.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="wrap_content"
+	android:layout_height="wrap_content" >
+
+	<ImageView
+		android:id="@+id/bitcoin_address_qr"
+		android:layout_width="@dimen/wallet_address_qr_size"
+		android:layout_height="@dimen/wallet_address_qr_size"
+		android:layout_gravity="center"
+		android:background="@drawable/qrcode_frame"
+		android:contentDescription="@string/action_show_qr"
+		android:focusable="true"
+		android:scaleType="centerInside" />
+
+</FrameLayout>
diff --git a/wallet/res/layout/wallet_address_fragment_horizontal.xml b/wallet/res/layout/wallet_address_fragment_horizontal.xml
diff --git a/wallet/res/layout/wallet_address_fragment_vertical.xml b/wallet/res/layout/wallet_address_fragment_vertical.xml
diff --git a/wallet/res/layout/wallet_balance_fragment.xml b/wallet/res/layout/wallet_balance_fragment.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	xmlns:tools="http://schemas.android.com/tools"
-	android:layout_width="match_parent"
 	android:layout_height="wrap_content" >
 
 	<LinearLayout

diff --git a/wallet/res/values-ar/strings.xml b/wallet/res/values-ar/strings.xml
@@ -12,7 +12,6 @@
 	<string name="blockchain_state_progress_stalled">مزامنة البيانات متوقفة</string>
 	<string name="blockchain_state_progress_problem_storage">مزامنة بيانات: توجد مشكلة بوحدة التخزين</string>
 	<string name="blockchain_state_progress_problem_network">مزامنة بيانات: توجد مشكلة بالشبكة</string>
-	<string name="wallet_address_fragment_your">عنوان محفظة البيتكوين الخاصة بك:</string>
 	<string name="wallet_address_fragment_clipboard_msg">تم نسخ عنوان محفظتك إلى الحافظة</string>
 	<string name="wallet_balance_fragment_replaying">الرصيد غير متاح في حالة إعادة التشغيل.</string>
 	<string name="exchange_rates_activity_title">أسعار صرف العملات</string>

diff --git a/wallet/res/values-ca/strings.xml b/wallet/res/values-ca/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Sincronització encallada</string>
   <string name="blockchain_state_progress_problem_storage">Sincronitzant: problema d\'emmagatzematge</string>
   <string name="blockchain_state_progress_problem_network">Sincronitzant: problema de xarxa</string>
-  <string name="wallet_address_fragment_your">La teva adreça Bitcoin:</string>
   <string name="wallet_address_fragment_clipboard_msg">L\'adreça Bitcoin s\'ha copiat al porta-retalls.</string>
   <string name="wallet_balance_fragment_replaying">El balança no està disponible mentre s\'escaneja.</string>
   <string name="exchange_rates_activity_title">Preus de canvi</string>

diff --git a/wallet/res/values-cs/strings.xml b/wallet/res/values-cs/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Synchronizace pozastavena</string>
   <string name="blockchain_state_progress_problem_storage">Synchronizace: Problém uložiště</string>
   <string name="blockchain_state_progress_problem_network">Synchronizace: Problém se sítí</string>
-  <string name="wallet_address_fragment_your">Vaše Bitcoin Adresa:</string>
   <string name="wallet_address_fragment_clipboard_msg">Adresa zkopírována do schránky</string>
   <string name="wallet_balance_fragment_replaying">Bilance je nedostupná během synchronizace.</string>
   <string name="exchange_rates_activity_title">Směné kurzy</string>

diff --git a/wallet/res/values-da/strings.xml b/wallet/res/values-da/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Synkronisering står stille</string>
   <string name="blockchain_state_progress_problem_storage">Synkroniserer: Pladsproblem</string>
   <string name="blockchain_state_progress_problem_network">Synkroniserer: Netærksproblem</string>
-  <string name="wallet_address_fragment_your">Din Bitcoin-adresse:</string>
   <string name="wallet_address_fragment_clipboard_msg">Bitcoin-adresse kopieret til udklipsholder</string>
   <string name="wallet_balance_fragment_replaying">Saldo er ikke tilgængelig under genafspilning.</string>
   <string name="exchange_rates_activity_title">Valutakurser</string>

diff --git a/wallet/res/values-de/strings.xml b/wallet/res/values-de/strings.xml
@@ -14,7 +14,6 @@
 	<string name="blockchain_state_progress_stalled">Synchronisation blockiert</string>
 	<string name="blockchain_state_progress_problem_storage">Synchronisation: Speicherplatz-Problem</string>
 	<string name="blockchain_state_progress_problem_network">Synchronisation: Netzwerk-Problem</string>
-	<string name="wallet_address_fragment_your">Deine Bitcoin-Adresse:</string>
 	<string name="wallet_address_fragment_clipboard_msg">Bitcoin-Adresse ins Clipboard kopiert</string>
 	<string name="wallet_balance_fragment_replaying">Guthaben ist während des Replays nicht verfügbar.</string>
 	<string name="exchange_rates_activity_title">Wechselkurse</string>

diff --git a/wallet/res/values-el/strings.xml b/wallet/res/values-el/strings.xml
@@ -3,7 +3,6 @@
 
 	<string name="toast_wallet_reset">Το πορτοφόλι έχει αποκατασταθεί,\nθα πάρει κάποιο χρόνο για την ανάκτηση</string>
 	<string name="wallet_disclaimer_fragment_remind_safety">Χρησιμοποιήστε με δική σας ευθύνη. Διαβάστε τις οδηγίες ασφαλείας</string>
-	<string name="wallet_address_fragment_your">H Bitcoin διεύθυνή σας:</string>
 	<string name="wallet_address_fragment_clipboard_msg">H Bitcoin διεύθυνή αντιγράφικε στο clipboard</string>
 	<string name="exchange_rates_fragment_empty_text">Δεν ήταν δυνατή η φόρτωση των συναλλαγματικών ισοτιμιών</string>
 	<string name="wallet_transactions_fragment_tab_received">Ελήφθη</string>

diff --git a/wallet/res/values-eo/strings.xml b/wallet/res/values-eo/strings.xml
@@ -12,7 +12,6 @@
 	<string name="blockchain_state_progress_stalled">Sinkronigo stagnis</string>
 	<string name="blockchain_state_progress_problem_storage">Sinkronigado: Stokante problemo</string>
 	<string name="blockchain_state_progress_problem_network">Sinkronigado: Reta problemo</string>
-	<string name="wallet_address_fragment_your">Via Bitmona Adreso:</string>
 	<string name="wallet_address_fragment_clipboard_msg">Bitmonadreso kopiita al tondujo</string>
 	<string name="wallet_balance_fragment_replaying">Saldo nedisponeblas dum ripeto.</string>
 	<string name="exchange_rates_activity_title">Kurzoj</string>

diff --git a/wallet/res/values-es/strings.xml b/wallet/res/values-es/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Sincronización atascada</string>
   <string name="blockchain_state_progress_problem_storage">Sincronización: Problema de almacenamiento</string>
   <string name="blockchain_state_progress_problem_network">Sincronización: Problema de red</string>
-  <string name="wallet_address_fragment_your">Su dirección Bitcoin:</string>
   <string name="wallet_address_fragment_clipboard_msg">Dirección Bitcoin copiada al portapapeles</string>
   <string name="wallet_balance_fragment_replaying">Saldo no disponible durante la reevaluación.</string>
   <string name="exchange_rates_activity_title">Tipos de cambio</string>

diff --git a/wallet/res/values-fi/strings.xml b/wallet/res/values-fi/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Synkronointi pysäytetty</string>
   <string name="blockchain_state_progress_problem_storage">Synkronointi: Tilaongelma</string>
   <string name="blockchain_state_progress_problem_network">Synkronointi: Verkko-ongelma</string>
-  <string name="wallet_address_fragment_your">Bitcoin-osoitteesi:</string>
   <string name="wallet_address_fragment_clipboard_msg">Bitcoin-osoite on kopioitu leikepöydälle</string>
   <string name="wallet_balance_fragment_replaying">Saldo ei ole saatavilla uusinnan aikaan.</string>
   <string name="exchange_rates_activity_title">Vaihtokurssit:</string>

diff --git a/wallet/res/values-fr/strings.xml b/wallet/res/values-fr/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Synchronisation interrompue</string>
   <string name="blockchain_state_progress_problem_storage">Synchronisation : problème de stockage</string>
   <string name="blockchain_state_progress_problem_network">Synchronisation : problème de réseau</string>
-  <string name="wallet_address_fragment_your">Votre adresse Bitcoin :</string>
   <string name="wallet_address_fragment_clipboard_msg">Adresse Bitcoin copiée dans le presse-papiers</string>
   <string name="wallet_balance_fragment_replaying">Le solde est indisponible durant la reprise.</string>
   <string name="exchange_rates_activity_title">Taux de change</string>

diff --git a/wallet/res/values-he/strings.xml b/wallet/res/values-he/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">סינכרון עוקב</string>
   <string name="blockchain_state_progress_problem_storage">סינכרון: בעיית אחסון</string>
   <string name="blockchain_state_progress_problem_network">סינכרון:בעיית רשת</string>
-  <string name="wallet_address_fragment_your">כתובת ארנק הביטקוין שלך:</string>
   <string name="wallet_address_fragment_clipboard_msg">כתובת הביטקוין הועתקה ללוח</string>
   <string name="wallet_balance_fragment_replaying">היתרה אינה זמינה במהלך שחזור</string>
   <string name="exchange_rates_activity_title">שערי המרה</string>

diff --git a/wallet/res/values-hu/strings.xml b/wallet/res/values-hu/strings.xml
@@ -12,7 +12,6 @@
 	<string name="blockchain_state_progress_stalled">A szinkronizálás szünetel</string>
 	<string name="blockchain_state_progress_problem_storage">Szinkronizálás: tárolóhely probléma</string>
 	<string name="blockchain_state_progress_problem_network">Szinkronizálás: Hálózati probléma</string>
-	<string name="wallet_address_fragment_your">Bitcoin címed:</string>
 	<string name="wallet_address_fragment_clipboard_msg">Bitcoin cím a vágólapra másolva</string>
 	<string name="wallet_balance_fragment_replaying">A frissítés során az egyenleg nem elérhető.</string>
 	<string name="exchange_rates_activity_title">Árfolyamok</string>

diff --git a/wallet/res/values-id/strings.xml b/wallet/res/values-id/strings.xml
@@ -12,7 +12,6 @@
 	<string name="blockchain_state_progress_stalled">Sinkronisasi terhenti</string>
 	<string name="blockchain_state_progress_problem_storage">Sinkronisasi: Masalah penyimpanan</string>
 	<string name="blockchain_state_progress_problem_network">Sinkronisasi: Masalah jaringan</string>
-	<string name="wallet_address_fragment_your">Alamat Bitcoin Anda:</string>
 	<string name="wallet_address_fragment_clipboard_msg">Alamat Bitcoin disalin</string>
 	<string name="wallet_balance_fragment_replaying">Saldo tidak tersedia saat pengulangan.</string>
 	<string name="exchange_rates_activity_title">Nilai Tukar</string>

diff --git a/wallet/res/values-it/strings.xml b/wallet/res/values-it/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">Sincronizzazione bloccata</string>
   <string name="blockchain_state_progress_problem_storage">Sincronizzazione: problema di Memorizzazione</string>
   <string name="blockchain_state_progress_problem_network">Sincronizzazione: problema di Rete</string>
-  <string name="wallet_address_fragment_your">Il tuo indirizzo Bitcoin:</string>
   <string name="wallet_address_fragment_clipboard_msg">Indirizzo Bitcoin copiato negli appunti</string>
   <string name="wallet_balance_fragment_replaying">Il conto non è disponibile durante la ripetizione.</string>
   <string name="exchange_rates_activity_title">Tasso di cambio</string>

diff --git a/wallet/res/values-iw/strings.xml b/wallet/res/values-iw/strings.xml
@@ -12,7 +12,6 @@
 	<string name="blockchain_state_progress_stalled">סינכרון עוקב</string>
 	<string name="blockchain_state_progress_problem_storage">סינכרון: בעיית אחסון</string>
 	<string name="blockchain_state_progress_problem_network">סינכרון:בעיית רשת</string>
-	<string name="wallet_address_fragment_your">כתובת ארנק הביטקוין שלך:</string>
 	<string name="wallet_address_fragment_clipboard_msg">כתובת הביטקוין הועתקה ללוח</string>
 	<string name="wallet_balance_fragment_replaying">היתרה אינה זמינה במהלך שחזור</string>
 	<string name="exchange_rates_activity_title">שערי המרה</string>

diff --git a/wallet/res/values-ja/strings.xml b/wallet/res/values-ja/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">同期を停止</string>
   <string name="blockchain_state_progress_problem_storage">同期：ストレージの問題</string>
   <string name="blockchain_state_progress_problem_network">同期：ネットワークの問題</string>
-  <string name="wallet_address_fragment_your">あなたのビットコインアドレス:</string>
   <string name="wallet_address_fragment_clipboard_msg">ビットコインアドレスはクリップボードにコピーされました</string>
   <string name="wallet_balance_fragment_replaying">再生中は残高情報は利用できません。</string>
   <string name="exchange_rates_activity_title">為替レート</string>

diff --git a/wallet/res/values-ko/strings.xml b/wallet/res/values-ko/strings.xml
@@ -11,7 +11,6 @@
   <string name="blockchain_state_progress_stalled">동기화 멈춤</string>
   <string name="blockchain_state_progress_problem_storage">동기화 중 : 저장 공간 문제 발생</string>
   <string name="blockchain_state_progress_problem_network">동기화 중 : 네트워크에 문제 발생</string>
-  <string name="wallet_address_fragment_your">비트코인 주소 :</string>
   <string name="wallet_address_fragment_clipboard_msg">비트코인 주소가 클립보드에 복사되었습니다</string>
   <string name="wallet_balance_fragment_replaying">블럭체인 재실행 중 잔액 접근이 불가능합니다.</string>
   <string name="exchange_rates_activity_title">환율 목록</string>