cleanup padding and margins and other UI stuff

This commit is contained in:
pokkst 2022-09-12 22:36:25 -05:00
parent 765ff8f291
commit 4f580cbda8
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
9 changed files with 37 additions and 64 deletions

View file

@ -2,10 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:bottom="12dp"
android:left="12dp"
android:right="12dp"
android:top="12dp" />
android:left="8dp"
android:right="8dp" />
<solid
android:color="@color/button_disabled_bg_color"/>
<corners

View file

@ -2,10 +2,8 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:bottom="12dp"
android:left="12dp"
android:right="12dp"
android:top="12dp" />
android:left="8dp"
android:right="8dp"/>
<solid
android:color="@color/oled_colorSecondary"/>
<corners

View file

@ -5,14 +5,12 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.settings.SettingsFragment"
android:padding="16dp">
android:padding="24dp">
<TextView
android:id="@+id/create_wallet_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/create_wallet"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="32dp"
android:textSize="24sp"
android:textStyle="bold"
@ -24,8 +22,6 @@
android:id="@+id/wallet_password_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:hint="@string/password_optional"
@ -40,8 +36,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/more_options"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="8dp"
android:textStyle="bold"
app:layout_constraintHorizontal_bias="0.0"
@ -61,8 +55,6 @@
android:id="@+id/wallet_seed_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="12dp"
android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:hint="@string/recovery_phrase_optional"
@ -76,8 +68,6 @@
android:id="@+id/wallet_restore_height_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="12dp"
android:hint="@string/restore_height_optional"
android:background="@drawable/edittext_bg"
android:inputType="number"
@ -91,8 +81,6 @@
android:id="@+id/create_wallet_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/create_wallet"

View file

@ -4,7 +4,20 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".fragment.settings.SettingsFragment">
tools:context=".fragment.settings.SettingsFragment"
android:padding="24dp">
<TextView
android:id="@+id/settings_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/settings"
android:layout_marginBottom="32dp"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/display_seed_button"/>
<ImageView
android:id="@+id/monero_logo_imageview"
@ -25,7 +38,7 @@
android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toBottomOf="@id/settings_textview" />
<TextView
android:id="@+id/day_night_textview"

View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="16dp">
android:padding="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
@ -17,8 +17,6 @@
android:id="@+id/information_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="16sp"
@ -33,7 +31,8 @@
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:padding="8dp"
android:layout_marginEnd="24dp"
android:minHeight="24dp"
android:minWidth="24dp"
android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintTop_toTopOf="@id/information_textview"
app:layout_constraintBottom_toBottomOf="@id/information_textview"

View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="16dp">
android:padding="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
@ -17,8 +17,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/enter_password"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="32dp"
android:textSize="24sp"
android:textStyle="bold"
@ -30,7 +28,6 @@
android:id="@+id/wallet_password_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginBottom="32dp"
android:hint="@string/password"
android:inputType="textPassword"
@ -45,9 +42,9 @@
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:src="@drawable/ic_content_paste_24dp"
android:layout_marginEnd="24dp"
android:minWidth="48dp"
android:minHeight="48dp"
android:layout_marginStart="8dp"
android:minWidth="24dp"
android:minHeight="24dp"
android:padding="8dp"
app:layout_constraintStart_toEndOf="@id/wallet_password_edittext"
app:layout_constraintTop_toTopOf="@id/wallet_password_edittext"
@ -57,8 +54,6 @@
android:id="@+id/unlock_wallet_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/unlock"

View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="16dp">
android:padding="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
@ -17,8 +17,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/recv_monero"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="32dp"
android:textSize="24sp"
android:textStyle="bold"
@ -51,7 +49,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="16sp"
@ -66,7 +63,8 @@
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:padding="8dp"
android:layout_marginEnd="24dp"
android:minHeight="24dp"
android:minWidth="24dp"
android:src="@drawable/ic_content_copy_24dp"
app:layout_constraintTop_toTopOf="@id/address_textview"
app:layout_constraintBottom_toBottomOf="@id/address_textview"

View file

@ -6,7 +6,7 @@
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="16dp">
android:padding="24dp">
<androidx.constraintlayout.widget.ConstraintLayout
@ -18,8 +18,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/send_monero"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="32dp"
android:textSize="24sp"
android:textStyle="bold"
@ -32,7 +30,6 @@
android:id="@+id/address_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:singleLine="true"
@ -49,8 +46,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:minWidth="24dp"
android:minHeight="24dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:padding="8dp"
@ -65,10 +62,9 @@
android:id="@+id/scan_address_imagebutton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:minWidth="24dp"
android:minHeight="24dp"
android:padding="8dp"
android:src="@drawable/ic_scan"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
@ -81,8 +77,7 @@
android:id="@+id/amount_edittext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="12dp"
android:layout_marginEnd="8dp"
android:background="@drawable/edittext_bg"
android:hint="@string/amount"
android:inputType="numberDecimal"
@ -94,7 +89,6 @@
android:id="@+id/sending_all_textview"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="12dp"
android:padding="12dp"
android:text="@string/sending_all"
@ -109,7 +103,6 @@
android:id="@+id/send_max_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:background="@drawable/button_bg"
android:text="@string/send_max"
app:layout_constraintEnd_toEndOf="parent"
@ -121,8 +114,6 @@
android:id="@+id/create_tx_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/create"
@ -140,8 +131,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tx_address_text"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:textSize="16sp"
android:textStyle="bold"
@ -158,8 +147,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tx_amount_text"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:textSize="16sp"
android:textStyle="bold"
@ -174,8 +161,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/tx_fee_text"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:textSize="16sp"
android:textStyle="bold"
@ -190,8 +175,6 @@
android:id="@+id/send_tx_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/send"

View file

@ -572,4 +572,5 @@
<string name="sending_tx">Sending transaction…</string>
<string name="sent_tx">Sent transaction!</string>
<string name="no_camera_permission">No camera permission</string>
<string name="settings">Settings</string>
</resources>