Adjusted Layout files (#118)

* Adjusted layout files with correct sizes.

* Added password visibility toggle
merge-requests/3/head
Stephan Hagios 7 years ago committed by m2049r
parent b28a140b48
commit 3b1c3d564b

@ -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

@ -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

@ -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"

@ -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

@ -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"

@ -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

@ -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>

@ -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" />

@ -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"

@ -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" />

@ -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"

@ -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"

@ -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,29 @@
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">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="32dp"
android:layout_marginRight="32dp"
android:orientation="vertical"
android:padding="16dp">
android:background="@drawable/selector_login">
<TextView
android:id="@+id/tvName"
android:layout_marginStart="32dp"
android:layout_toStartOf="@+id/ibOptions"
style="@style/MoneroText.Label"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="My Wallet" />
tools:text="My Wallet" />
<TextView
android:layout_toStartOf="@+id/ibOptions"
android:id="@+id/tvAddress"
android:layout_marginStart="32dp"
style="@style/MoneroText.Small"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/tvName"
android:text="4AdkPJox...g3viqCuk" />
</RelativeLayout>
tools:text="4AdkPJox...g3viqCuk" />
<ImageButton
android:id="@+id/ibOptions"

@ -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

@ -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"

@ -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"

@ -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>

Loading…
Cancel
Save