rottenwheel/mysu
1
0
Fork 0
mirror of https://codeberg.org/r4v3r23/mysu.git synced 2024-11-09 23:50:02 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make UI look better

Browse source
This commit is contained in:
pokkst 2022-09-25 23:52:56 -05:00
parent 2884024e8f
commit bb5abb9fc2
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
12 changed files with 125 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/res/drawable/button_bg_disabled.xml
View file

@ -5,5 +5,5 @@
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/button_disabled_bg_color" />
<corners android:radius="8dp" />
<corners android:radius="16dp" />
</shape>

10
app/src/main/res/drawable/button_bg_disabled_left.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/button_disabled_bg_color" />
<corners android:topLeftRadius="16dp"
android:bottomLeftRadius="16dp"/>
</shape>

10
app/src/main/res/drawable/button_bg_disabled_right.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/button_disabled_bg_color" />
<corners android:topRightRadius="16dp"
android:bottomRightRadius="16dp"/>
</shape>

2
app/src/main/res/drawable/button_bg_enabled.xml
View file

@ -5,5 +5,5 @@
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/oled_colorSecondary" />
<corners android:radius="8dp" />
<corners android:radius="16dp" />
</shape>

10
app/src/main/res/drawable/button_bg_enabled_left.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/oled_colorSecondary" />
<corners android:topLeftRadius="16dp"
android:bottomLeftRadius="16dp"/>
</shape>

10
app/src/main/res/drawable/button_bg_enabled_right.xml Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<padding
android:left="8dp"
android:right="8dp" />
<solid android:color="@color/oled_colorSecondary" />
<corners android:topRightRadius="16dp"
android:bottomRightRadius="16dp"/>
</shape>

7
app/src/main/res/drawable/button_bg_left.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Color when the row is selected -->
<item android:drawable="@drawable/button_bg_enabled_left" android:state_enabled="true" />
<!-- Standard background color -->
<item android:drawable="@drawable/button_bg_disabled_left" />
</selector>

7
app/src/main/res/drawable/button_bg_right.xml Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Color when the row is selected -->
<item android:drawable="@drawable/button_bg_enabled_right" android:state_enabled="true" />
<!-- Standard background color -->
<item android:drawable="@drawable/button_bg_disabled_right" />
</selector>

13
app/src/main/res/layout/fragment_home.xml
View file

@ -99,10 +99,7 @@
android:id="@+id/receive_send_buttons_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="24dp"
android:paddingTop="128dp"
android:paddingEnd="24dp"
android:paddingBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
@ -111,9 +108,10 @@
android:id="@+id/receive_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="4dp"
android:background="@drawable/button_bg"
android:background="@drawable/button_bg_left"
android:text="@string/receive"
android:layout_marginBottom="16dp"
android:layout_marginStart="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/send_button"
app:layout_constraintStart_toStartOf="parent" />
@ -122,9 +120,10 @@
android:id="@+id/send_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:background="@drawable/button_bg"
android:background="@drawable/button_bg_right"
android:text="@string/send"
android:layout_marginBottom="16dp"
android:layout_marginEnd="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/receive_button" />

24
app/src/main/res/layout/fragment_settings.xml
View file

@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="24dp"
tools:context="net.mynero.wallet.fragment.settings.SettingsFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
@ -15,6 +14,8 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:text="@string/settings"
android:layout_marginTop="24dp"
android:layout_marginStart="24dp"
android:textSize="32sp"
android:textStyle="bold"
app:layout_constraintEnd_toStartOf="@id/status_textview"
@ -27,6 +28,7 @@
android:layout_height="wrap_content"
android:text="@string/disconnected"
android:textSize="12sp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/settings_textview"
app:layout_constraintBottom_toBottomOf="@id/settings_textview"
@ -39,6 +41,8 @@
android:layout_marginTop="32dp"
android:text="@string/wallet"
android:textSize="24sp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
@ -50,6 +54,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/button_bg"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:text="@string/display_recovery_phrase"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@ -62,6 +68,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/button_bg"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:text="@string/view_utxos"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
@ -74,6 +82,8 @@
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:text="@string/appearance"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintEnd_toEndOf="parent"
@ -86,6 +96,7 @@
android:layout_height="wrap_content"
android:text="@string/night_mode"
android:textSize="16sp"
android:layout_marginStart="24dp"
app:layout_constraintBottom_toBottomOf="@id/day_night_switch"
app:layout_constraintEnd_toStartOf="@id/day_night_switch"
app:layout_constraintStart_toStartOf="parent"
@ -96,6 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/appearance_settings_textview" />
@ -104,6 +116,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:text="@string/network"
android:textSize="24sp"
android:textStyle="bold"
@ -116,6 +130,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:singleLine="true"
android:ellipsize="middle"
android:background="@drawable/button_bg"
@ -130,6 +146,7 @@
android:layout_height="wrap_content"
android:text="@string/tor_switch_label"
android:textSize="16sp"
android:layout_marginStart="24dp"
app:layout_constraintBottom_toBottomOf="@id/tor_switch"
app:layout_constraintEnd_toStartOf="@id/tor_switch"
app:layout_constraintStart_toStartOf="parent"
@ -140,6 +157,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/select_node_button" />
@ -157,6 +175,8 @@
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:background="@drawable/edittext_bg"
android:hint="@string/wallet_proxy_address_hint"
app:layout_constraintBottom_toTopOf="@id/wallet_proxy_port_edittext"
@ -170,6 +190,8 @@
android:layout_height="wrap_content"
android:background="@drawable/edittext_bg"
android:hint="@string/wallet_proxy_port_hint"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:inputType="number"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"

15
app/src/main/res/layout/password_bottom_sheet_dialog.xml
View file

@ -2,10 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="24dp">
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
@ -18,6 +15,9 @@
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:text="@string/enter_password"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginTop="24dp"
android:textSize="32sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/wallet_password_edittext"
@ -31,6 +31,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:layout_marginStart="24dp"
android:hint="@string/password"
android:inputType="textPassword"
app:layout_constraintBottom_toTopOf="@id/unlock_wallet_button"
@ -46,6 +47,7 @@
android:background="@android:color/transparent"
android:minWidth="24dp"
android:minHeight="24dp"
android:layout_marginEnd="24dp"
android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/wallet_password_edittext"
@ -57,9 +59,12 @@
android:id="@+id/unlock_wallet_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/unlock"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/wallet_password_edittext" />

38
app/src/main/res/layout/send_bottom_sheet_dialog.xml
View file

@ -4,9 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:fitsSystemWindows="true"
android:padding="24dp">
android:fitsSystemWindows="true">
<androidx.constraintlayout.widget.ConstraintLayout
@ -18,6 +16,9 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/send_monero"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:textSize="32sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/selected_utxos_value_textview"
@ -28,6 +29,8 @@
android:id="@+id/selected_utxos_value_textview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:text="@string/selected_utxos_value"
android:textSize="16sp"
android:visibility="gone"
@ -42,6 +45,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@drawable/edittext_bg"
android:layout_marginStart="24dp"
android:ellipsize="middle"
android:hint="@string/address"
android:singleLine="true"
@ -77,6 +81,7 @@
android:minWidth="48dp"
android:minHeight="48dp"
android:padding="8dp"
android:layout_marginEnd="24dp"
android:src="@drawable/ic_scan"
app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="parent"
@ -91,6 +96,7 @@
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginBottom="16dp"
android:layout_marginStart="24dp"
android:background="@drawable/edittext_bg"
android:hint="@string/amount"
android:inputType="numberDecimal"
@ -106,6 +112,7 @@
android:layout_marginEnd="12dp"
android:padding="12dp"
android:text="@string/sending_all"
android:layout_marginStart="24dp"
android:textStyle="bold"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
@ -120,6 +127,7 @@
android:layout_height="wrap_content"
android:background="@drawable/button_bg"
android:text="@string/send_max"
android:layout_marginEnd="24dp"
app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/amount_edittext"
@ -131,6 +139,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fee_priority"
android:layout_marginStart="24dp"
android:textSize="16sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/tx_fee_radiogroup"
@ -143,6 +152,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="8dp"
android:layout_marginEnd="24dp"
app:layout_constraintTop_toBottomOf="@id/send_max_button"
app:layout_constraintBottom_toTopOf="@id/create_tx_button"
app:layout_constraintStart_toEndOf="@id/tx_fee_radiogroup_label_textview"
@ -174,9 +184,11 @@
android:id="@+id/create_tx_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/button_bg"
android:text="@string/create"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tx_fee_radiogroup"
tools:visibility="visible" />
@ -194,11 +206,13 @@
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app:layout_constraintBottom_toTopOf="@id/amount_pending_textview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/send_monero_textview"
tools:visibility="gone" />
tools:visibility="visible" />
<TextView
android:id="@+id/amount_pending_textview"
@ -209,11 +223,13 @@
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app:layout_constraintBottom_toTopOf="@id/fee_textview"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/address_pending_textview"
tools:visibility="gone" />
tools:visibility="visible" />
<TextView
android:id="@+id/fee_textview"
@ -224,23 +240,29 @@
android:textSize="16sp"
android:textStyle="bold"
android:visibility="gone"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
app:layout_constraintBottom_toTopOf="@id/send_tx_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/amount_pending_textview"
tools:visibility="gone" />
tools:visibility="visible" />
<Button
android:id="@+id/send_tx_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:background="@drawable/button_bg"
android:text="@string/send"
android:visibility="gone"
android:layout_marginBottom="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fee_textview"
tools:visibility="gone" />
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>