layout correction + new version code

* Adjusted layout files with correct sizes.

* Added password visibility toggle

app/build.gradle

@@ -8,8 +8,8 @@ android {
         applicationId "com.m2049r.xmrwallet"
         minSdkVersion 21
         targetSdkVersion 25
-        versionCode 39
-        versionName "1.2"
+        versionCode 41
+        versionName "1.2.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         externalNativeBuild {
             cmake {

app/src/main/res/drawable/ic_eye.xml

@@ -17,11 +17,11 @@
 9.24995106,8.48677287 C9.24995106,5.61623564 11.5770468,3.28929415
 14.4474298,3.28929415 C17.3178128,3.28929415 19.6449085,5.61623564
 19.6449085,8.48677287 C19.6449085,11.3571559 17.3178128,13.6840973
-14.4474298,13.6840973 M14.4474298,-4.62765957e-05 C8.23695638,-4.62765957e-05
-2.82706809,3.42395904 3.08510638e-05,8.48692713 C2.82706809,13.5494324
+14.4474298,13.6840973 M14.4474298,-0.0000463 C8.23695638,-0.0000463
+2.82706809,3.42395904 0.0000309,8.48692713 C2.82706809,13.5494324
 8.23695638,16.9734378 14.4474298,16.9734378 C20.6579032,16.9734378
 26.0676372,13.5494324 28.8948287,8.48692713 C26.0676372,3.42395904
-20.6579032,-4.62765957e-05 14.4474298,-4.62765957e-05"
+20.6579032,-0.0000463 14.4474298,-0.0000463"
                 android:strokeWidth="1" />
         </group>
     </group>

app/src/main/res/layout/fragment_about.xml

@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="16sp"
-    android:paddingStart="16sp"
-    android:paddingTop="8sp">
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="50sp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher" />
 
         <TextView

app/src/main/res/layout/fragment_donation.xml

@@ -2,9 +2,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8sp"
-    android:paddingEnd="16sp"
-    android:paddingStart="16sp">
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="100sp"
+            android:layout_height="100dp"
             android:src="@drawable/gunther_donate" />
 
         <TextView

app/src/main/res/layout/fragment_generate.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp">
+    android:layout_margin="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"

app/src/main/res/layout/fragment_help.xml

@@ -3,9 +3,9 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingEnd="16sp"
-    android:paddingStart="16sp"
-    android:paddingTop="8sp">
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp"
+    android:paddingTop="8dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -14,7 +14,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="50sp"
+            android:layout_height="48dp"
             android:src="@mipmap/ic_launcher" />
 
         <TextView

app/src/main/res/layout/fragment_login.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp">
+    android:layout_margin="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -39,7 +39,7 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center"
-            android:padding="8sp"
+            android:padding="8dp"
             android:text="@string/label_login_wallets" />
 
         <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

app/src/main/res/layout/fragment_privacy_policy.xml

@@ -2,9 +2,9 @@
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:paddingTop="8sp"
-    android:paddingEnd="16sp"
-    android:paddingStart="16sp">
+    android:paddingTop="8dp"
+    android:paddingEnd="16dp"
+    android:paddingStart="16dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -13,7 +13,7 @@
 
         <ImageView
             android:layout_width="match_parent"
-            android:layout_height="50sp"
+            android:layout_height="48dp"
             android:src="@drawable/ic_eye_black_24dp" />
 
         <TextView

app/src/main/res/layout/fragment_receive.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp"
+    android:layout_margin="8dp"
     android:orientation="vertical">
 
     <ProgressBar
@@ -12,7 +12,7 @@
         style="@style/Widget.AppCompat.ProgressBar.Horizontal"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4sp"
+        android:layout_marginBottom="4dp"
         android:indeterminate="true"
         android:visibility="gone" />
 
@@ -103,10 +103,10 @@
         style="@style/MoneroButton"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="4sp"
-        android:layout_marginTop="4sp"
+        android:layout_marginBottom="4dp"
+        android:layout_marginTop="4dp"
         android:enabled="false"
-        android:minHeight="36sp"
+        android:minHeight="36dp"
         android:text="@string/receive_generate_hint" />
 
     <ImageView
@@ -117,7 +117,7 @@
 
     <EditText
         android:id="@+id/etDummy"
-        android:layout_width="0sp"
-        android:layout_height="0sp" />
+        android:layout_width="0dp"
+        android:layout_height="0dp" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_review.xml

@@ -3,7 +3,7 @@
     android:id="@+id/scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp">
+    android:layout_margin="8dp">
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -137,7 +137,7 @@
             android:layout_gravity="center"
             android:layout_marginTop="@dimen/section_top"
             android:background="?android:selectableItemBackground"
-            android:drawablePadding="4sp"
+            android:drawablePadding="4dp"
             android:drawableStart="@drawable/ic_add_circle_outline"
             android:text="@string/label_wallet_advanced_details"
             android:visibility="gone" />

app/src/main/res/layout/fragment_send.xml

@@ -5,7 +5,7 @@
     android:id="@+id/scrollview"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp">
+    android:layout_margin="8dp">
 
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
@@ -15,7 +15,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4sp"
+            android:layout_marginTop="4dp"
             android:orientation="horizontal"
             android:weightSum="10">
 
@@ -44,7 +44,7 @@
                 android:layout_width="48dp"
                 android:layout_height="48dp"
                 android:layout_gravity="center"
-                android:layout_marginStart="16sp"
+                android:layout_marginStart="16dp"
                 android:background="@drawable/ic_scan"
                 android:text="@string/send_qr_hint" />
         </LinearLayout>
@@ -53,8 +53,8 @@
             android:id="@+id/evAmount"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="16sp"
-            android:layout_marginTop="0sp"
+            android:layout_marginBottom="16dp"
+            android:layout_marginTop="0dp"
             android:orientation="vertical"
             android:paddingEnd="56dp"
             android:paddingStart="56dp" />
@@ -62,7 +62,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4sp"
+            android:layout_marginBottom="4dp"
             android:orientation="horizontal"
             android:weightSum="10">
 
@@ -91,9 +91,9 @@
                 android:id="@+id/bPaymentId"
                 style="@style/MoneroText.Button.Small"
                 android:layout_width="56dp"
-                android:layout_height="56sp"
+                android:layout_height="56dp"
                 android:layout_gravity="center"
-                android:layout_marginStart="8sp"
+                android:layout_marginStart="8dp"
                 android:background="?android:selectableItemBackground"
                 android:drawableTop="@drawable/ic_settings_orange_24dp"
                 android:text="@string/send_generate_paymentid_hint"
@@ -102,8 +102,8 @@
 
         <EditText
             android:id="@+id/etDummy"
-            android:layout_width="0sp"
-            android:layout_height="0sp" />
+            android:layout_width="0dp"
+            android:layout_height="0dp" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -116,7 +116,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center|end"
-                android:layout_marginEnd="8sp"
+                android:layout_marginEnd="8dp"
                 android:text="Advanced:"
                 android:textAlignment="textEnd" />
 
@@ -125,7 +125,7 @@
                 style="@style/MoneroSpinnerGray"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8sp"
+                android:layout_marginEnd="8dp"
                 android:layout_weight="1"
                 android:entries="@array/mixin"
                 android:textAlignment="center" />
@@ -146,10 +146,10 @@
             style="@style/MoneroButton"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4sp"
-            android:layout_marginTop="4sp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:enabled="true"
-            android:minHeight="36sp"
+            android:minHeight="36dp"
             android:text="@string/send_prepare_hint" />
 
         <ProgressBar
@@ -164,8 +164,8 @@
             android:id="@+id/llConfirmSend"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="4sp"
-            android:layout_marginTop="4sp"
+            android:layout_marginBottom="4dp"
+            android:layout_marginTop="4dp"
             android:orientation="vertical"
             android:visibility="gone">
 
@@ -174,8 +174,8 @@
                 style="@style/MoneroButton.Alert"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4sp"
-                android:minHeight="36sp"
+                android:layout_marginBottom="4dp"
+                android:minHeight="36dp"
                 android:text="@string/send_dispose_hint" />
 
             <LinearLayout
@@ -187,9 +187,9 @@
                 <TextView
                     android:id="@+id/tvTxAmountLabel"
                     style="@style/MoneroLabel.Caps"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8sp"
+                    android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:text="@string/send_amount_label"
                     android:textAlignment="textEnd" />
@@ -197,9 +197,9 @@
                 <TextView
                     android:id="@+id/tvTxAmount"
                     style="@style/MoneroText"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8sp"
+                    android:layout_marginStart="8dp"
                     android:layout_weight="2"
                     android:textAlignment="textEnd"
                     tools:text="143.008000000000" />
@@ -214,9 +214,9 @@
                 <TextView
                     android:id="@+id/tvTxFeeLabel"
                     style="@style/MoneroLabel.Caps.Gray"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="4sp"
+                    android:layout_marginEnd="4dp"
                     android:layout_weight="1"
                     android:text="@string/send_fee_label"
                     android:textAlignment="textEnd" />
@@ -224,9 +224,9 @@
                 <TextView
                     android:id="@+id/tvTxFee"
                     style="@style/MoneroText.Gray"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginStart="8sp"
+                    android:layout_marginStart="8dp"
                     android:layout_weight="2"
                     android:textAlignment="textEnd"
                     tools:text="0.006817000000" />
@@ -241,9 +241,9 @@
                 <TextView
                     android:id="@+id/tvTxTotalLabel"
                     style="@style/MoneroLabel.Caps.Black"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginEnd="8sp"
+                    android:layout_marginEnd="8dp"
                     android:layout_weight="1"
                     android:text="@string/send_total_label"
                     android:textAlignment="textEnd" />
@@ -251,9 +251,9 @@
                 <TextView
                     android:id="@+id/tvTxTotal"
                     style="@style/MoneroText.Black"
-                    android:layout_width="0sp"
+                    android:layout_width="0dp"
                     android:layout_height="wrap_content"
-                    android:layout_marginLeft="8sp"
+                    android:layout_marginStart="8dp"
                     android:layout_weight="2"
                     android:textAlignment="textEnd"
                     tools:text="143.014817000000" />
@@ -264,7 +264,7 @@
                 style="@style/MoneroEdit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="4sp"
+                android:layout_marginTop="4dp"
                 android:backgroundTint="@color/moneroGray"
                 android:hint="@string/send_notes_hint"
                 android:imeOptions="actionDone"
@@ -276,10 +276,10 @@
                 style="@style/MoneroButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="4sp"
-                android:layout_marginTop="4sp"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="4dp"
                 android:enabled="false"
-                android:minHeight="36sp"
+                android:minHeight="36dp"
                 android:text="@string/send_send_hint" />
 
             <Button
@@ -287,8 +287,8 @@
                 style="@style/MoneroButton.ReallySend"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8sp"
-                android:layout_marginTop="16sp"
+                android:layout_marginBottom="8dp"
+                android:layout_marginTop="16dp"
                 android:enabled="false"
                 android:padding="8dp"
                 android:text="@string/send_really_send_hint"

app/src/main/res/layout/fragment_tx_info.xml

@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="8sp"
+    android:layout_margin="8dp"
     android:fillViewport="true">
 
     <LinearLayout
@@ -15,10 +15,10 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal"
-            android:padding="16sp">
+            android:padding="16dp">
 
             <LinearLayout
-                android:layout_width="0sp"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
                 android:layout_weight="2"
@@ -47,10 +47,10 @@
             <TextView
                 android:id="@+id/tvTxTimestamp"
                 style="@style/MoneroText.PosDate"
-                android:layout_width="0sp"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginStart="24sp"
+                android:layout_marginStart="24dp"
                 android:layout_weight="1"
                 android:gravity="center"
                 android:selectAllOnFocus="true"
@@ -59,7 +59,7 @@
         </LinearLayout>
 
 
-        <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        <TableLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:shrinkColumns="1">
@@ -82,7 +82,7 @@
                     <EditText
                         android:id="@+id/etTxNotes"
                         style="@style/MoneroEdit"
-                        android:layout_width="0sp"
+                        android:layout_width="0dp"
                         android:layout_height="wrap_content"
                         android:layout_weight="8"
                         android:backgroundTint="@color/moneroGray"
@@ -93,10 +93,10 @@
                     <Button
                         android:id="@+id/bTxNotes"
                         style="@style/MoneroButton.Small"
-                        android:layout_width="0sp"
+                        android:layout_width="0dp"
                         android:layout_height="match_parent"
-                        android:layout_marginBottom="8sp"
-                        android:layout_marginTop="8sp"
+                        android:layout_marginBottom="8dp"
+                        android:layout_marginTop="8dp"
                         android:layout_weight="2"
                         android:enabled="true"
                         android:text="@string/tx_button_notes" />
@@ -110,14 +110,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_destination" />
 
                 <TextView
                     android:id="@+id/tvDestination"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
             </TableRow>
@@ -128,14 +128,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_paymentId" />
 
                 <TextView
                     android:id="@+id/tvTxPaymentId"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
             </TableRow>
@@ -146,14 +146,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_id" />
 
                 <TextView
                     android:id="@+id/tvTxId"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
             </TableRow>
@@ -164,14 +164,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_key" />
 
                 <TextView
                     android:id="@+id/tvTxKey"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
             </TableRow>
@@ -182,14 +182,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_blockheight" />
 
                 <TextView
                     android:id="@+id/tvTxBlockheight"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
             </TableRow>
@@ -200,14 +200,14 @@
                     style="@style/MoneroLabel.Small"
                     android:layout_gravity="center_vertical"
                     android:gravity="end"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:text="@string/tx_transfers" />
 
                 <TextView
                     android:id="@+id/tvTxTransfers"
                     style="@style/MoneroText"
                     android:gravity="start"
-                    android:padding="8sp"
+                    android:padding="8dp"
                     android:selectAllOnFocus="true"
                     android:textIsSelectable="true" />
 

app/src/main/res/layout/fragment_wallet.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="8sp"
+    android:layout_margin="8dp"
     android:orientation="vertical">
 
     <LinearLayout
@@ -23,8 +23,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginEnd="0sp"
-                android:layout_marginStart="8sp"
+                android:layout_marginEnd="0dp"
+                android:layout_marginStart="8dp"
                 android:visibility="gone">
 
                 <ImageView
@@ -84,7 +84,7 @@
                 android:id="@+id/ivSynced"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="8sp"
+                android:layout_marginEnd="8dp"
                 android:src="@drawable/ic_done_all"
                 android:visibility="gone" />
 
@@ -111,8 +111,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-        <android.support.v7.widget.RecyclerView xmlns:app="http://schemas.android.com/apk/res-auto"
-            xmlns:tools="http://schemas.android.com/tools"
+        <android.support.v7.widget.RecyclerView
             android:id="@+id/list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/item_transaction.xml

@@ -46,11 +46,11 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginEnd="16sp"
-            android:layout_marginStart="16sp"
+            android:layout_marginEnd="16dp"
+            android:layout_marginStart="16dp"
             android:layout_weight="13"
             android:gravity="start"
-            android:text="0123456789abcdef" />
+            tools:text="0123456789abcdef" />
 
         <TextView
             android:id="@+id/tx_datetime"
@@ -60,7 +60,7 @@
             android:layout_gravity="center"
             android:layout_weight="6"
             android:gravity="center"
-            android:text="2017-05-22 21:32" />
+            tools:text="2017-05-22 21:32" />
 
         <ImageView
             android:layout_width="wrap_content"

app/src/main/res/layout/item_wallet.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/card_view"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
@@ -9,35 +10,31 @@
     card_view:cardCornerRadius="1dp"
     card_view:cardElevation="8dp">
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <RelativeLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/selector_login"
-        android:orientation="horizontal">
+        android:background="@drawable/selector_login">
 
-        <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            android:layout_width="fill_parent"
+        <TextView
+            android:id="@+id/tvName"
+            style="@style/MoneroText.Label"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="32dp"
-            android:layout_marginRight="32dp"
-            android:orientation="vertical"
-            android:padding="16dp">
+            android:layout_marginStart="48dp"
+            android:layout_marginTop="16dp"
+            android:layout_toStartOf="@+id/ibOptions"
+            tools:text="My Wallet" />
 
-            <TextView
-                android:id="@+id/tvName"
-                style="@style/MoneroText.Label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="My Wallet" />
-
-            <TextView
-                android:id="@+id/tvAddress"
-                style="@style/MoneroText.Small"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/tvName"
-                android:text="4AdkPJox...g3viqCuk" />
-        </RelativeLayout>
+        <TextView
+            android:id="@+id/tvAddress"
+            style="@style/MoneroText.Small"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tvName"
+            android:layout_marginBottom="16dp"
+            android:layout_marginStart="48dp"
+            android:layout_toStartOf="@+id/ibOptions"
+            tools:text="4AdkPJox...g3viqCuk" />
 
         <ImageButton
             android:id="@+id/ibOptions"

app/src/main/res/layout/prompt_password.xml

@@ -3,14 +3,15 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/layout_root"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
+    android:layout_height="wrap_content"
     android:orientation="vertical"
-    android:padding="10dp">
+    android:padding="8dp">
 
     <android.support.design.widget.TextInputLayout
         android:id="@+id/etPassword"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        app:passwordToggleEnabled="true"
         app:errorEnabled="true">
 
         <android.support.design.widget.TextInputEditText

app/src/main/res/layout/prompt_rename.xml

@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    android:padding="10dp" >
+    android:padding="8dp" >
 
     <TextView
         android:id="@+id/tvRenameLabel"

app/src/main/res/layout/view_exchange.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:showIn="LinearLayout"
     xmlns:tools="http://schemas.android.com/tools">
 
     <LinearLayout
@@ -11,7 +12,7 @@
 
         <Spinner
             android:id="@+id/sCurrencyA"
-            android:layout_width="56sp"
+            android:layout_width="56dp"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:entries="@array/currency"

app/src/main/res/values/dimens.xml

@@ -10,9 +10,9 @@
 
     <dimen name="event_title_text_size">@dimen/abc_text_size_title_material_toolbar</dimen>
 
-    <dimen name="header_top_first">12sp</dimen>
-    <dimen name="header_top">16sp</dimen>
-    <dimen name="section_top">24sp</dimen>
-    <dimen name="data_top">8sp</dimen>
+    <dimen name="header_top_first">12dp</dimen>
+    <dimen name="header_top">16dp</dimen>
+    <dimen name="section_top">24dp</dimen>
+    <dimen name="data_top">8dp</dimen>
 
 </resources>

doc/FAQ.md

@@ -5,12 +5,12 @@
 
 ## What features does it have?
 
-- Uses monero v0.11.0.0
+- Uses Monero v0.11.0.0
 - Support for Android >= 5.0 with ARM processor
 - Testnet and Mainnet
 - Generate new wallets
-- Recover wallets form mnemonic seed or from keys
-- Create Watch Only wallets from address + viewkey
+- Recover wallets from mnemonic seed or from keys
+- Create *Watch Only* wallets from address + viewkey
 - Multiple wallets
 - View wallet details (address, keys, etc.)
 - View transactions including details and copy to clipboard
@@ -21,15 +21,15 @@
 - Only 5 decimal places shown in transactions (full amount in details - click on transaction)
 - All significant figures shown in balance
 - QR Code scanning - make sure to *ALWAYS* verify the scanned code is what it is advertised to be!
-- QR Code for receiving with conversion of XMR to USD/EUR and back through kraken API
+- QR Code for receiving with conversion of XMR to USD/EUR and back through Kraken API
 - Backup wallets to `backups` folder in main wallet folder (old backups are overwritten)
 - Rename wallets
 - Archive (=Backup and delete)
 - 3 Default nodes + History of last 5 used nodes
 
 ## My new testnet wallet does not update
-Since testnet block times are very variable, the algorithm calculating block height does not
-produce good results - so in general you testnet wallet will not work out of the box.
+Since testnet block times are highly variable, the algorithm calculating block height does not
+produce good results - so in general your testnet wallet will not work out of the box.
 
 The remedy is simple: restore from seed and the correct / current block height. Take the block number
 of your first transaction or the current block height from the
@@ -64,7 +64,13 @@ WalletName.keys
 
 ### From where?
 
-This depends on your installation - you could search for them in your home directory or check the settings of your current client. Places to try are `C:\Users\<YOURUSERNAME>\Documents\Monero\wallets` for Windows or `~/.bitmonero/wallet` in Linux. Or just search for `WalletName.keys`.
+This depends on your installation - you could search for them in your home directory or check the settings of your current client. Places to try are:
+
+- Windows: `%USERPROFILE%\Documents\Monero\wallets`
+- Mac: `~/Monero/wallets` (for the GUI) or `~/.bitmonero/wallets` for the daemon.
+- Linux: `~/.bitmonero/wallet`
+
+...or just search for `WalletName.keys`.
 
 ### What if don't have these files?