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

update ui a little

Browse source
This commit is contained in:
pokkst 2022-09-12 03:02:07 -05:00
parent 73ff5082c9
commit 074b608b5d
No known key found for this signature in database
GPG key ID: 90C2ED85E67A50FF
13 changed files with 104 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
app/src/main/res/drawable/button_bg.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-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" />
<solid
android:color="@color/oled_colorSecondary"/>
<corners
android:radius="8dp"/>
</shape>

13
app/src/main/res/drawable/edittext_bg.xml Normal file
View file

@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-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" />
<solid
android:color="@color/edittext_bg_color"/>
<corners
android:radius="8dp"/>
</shape>

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

@ -9,11 +9,14 @@
<ProgressBar <ProgressBar
android:id="@+id/sync_progress_bar" android:id="@+id/sync_progress_bar"
style="?android:attr/progressBarStyleHorizontal" style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent" android:layout_width="0dp"
android:indeterminate="true"
android:layout_height="4dp" android:layout_height="4dp"
android:indeterminate="true"
android:indeterminateTint="@color/oled_colorSecondary"
android:progressDrawable="@drawable/sync_progress_bar_drawable" android:progressDrawable="@drawable/sync_progress_bar_drawable"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/balance_unlocked_textview" android:id="@+id/balance_unlocked_textview"
@ -58,6 +61,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="@drawable/button_bg"
android:text="Receive" android:text="Receive"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/send_button" app:layout_constraintEnd_toStartOf="@id/send_button"
@ -70,6 +74,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="16dp"
android:background="@drawable/button_bg"
android:text="Send" android:text="Send"
app:layout_constraintStart_toEndOf="@id/receive_button" app:layout_constraintStart_toEndOf="@id/receive_button"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

4
app/src/main/res/layout/fragment_onboarding.xml
View file

@ -13,6 +13,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:hint="Password (optional)" android:hint="Password (optional)"
android:inputType="textPassword" android:inputType="textPassword"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@ -27,6 +28,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:background="@drawable/edittext_bg"
android:hint="Recovery phrase (optional)" android:hint="Recovery phrase (optional)"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -39,6 +41,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:hint="Restore height (optional)" android:hint="Restore height (optional)"
android:background="@drawable/edittext_bg"
android:inputType="number" android:inputType="number"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -51,6 +54,7 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:background="@drawable/button_bg"
android:text="@string/create_wallet" android:text="@string/create_wallet"
app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_edittext" app:layout_constraintTop_toBottomOf="@id/wallet_restore_height_edittext"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>

17
app/src/main/res/layout/receive_bottom_sheet_dialog.xml
View file

@ -12,14 +12,27 @@
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
android:id="@+id/recv_monero_textview"
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"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/monero_qr_imageview"/>
<ImageView <ImageView
android:id="@+id/monero_qr_imageview" android:id="@+id/monero_qr_imageview"
android:layout_width="256dp" android:layout_width="256dp"
android:layout_height="256dp" android:layout_height="256dp"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:src="@drawable/ic_fingerprint" android:src="@drawable/ic_fingerprint"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toBottomOf="@id/recv_monero_textview"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>

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

@ -13,33 +13,59 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<EditText <TextView
android:id="@+id/address_edittext" android:id="@+id/send_monero_textview"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/send_monero"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginBottom="32dp" android:layout_marginBottom="32dp"
android:hint="Address" android:textSize="24sp"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@id/address_edittext"/>
<EditText
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"
android:ellipsize="middle"
android:hint="@string/address"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/send_monero_textview"
app:layout_constraintEnd_toStartOf="@id/paste_address_imagebutton"
app:layout_constraintBottom_toTopOf="@id/amount_edittext"/> app:layout_constraintBottom_toTopOf="@id/amount_edittext"/>
<ImageButton <ImageButton
android:id="@+id/paste_address_imagebutton" android:id="@+id/paste_address_imagebutton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="24dp"
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="48dp"
android:minHeight="48dp"
android:padding="8dp" android:padding="8dp"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintTop_toTopOf="@id/address_edittext"
app:layout_constraintBottom_toBottomOf="@id/address_edittext" app:layout_constraintBottom_toBottomOf="@id/address_edittext"
app:layout_constraintEnd_toEndOf="@id/address_edittext"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/address_edittext"
app:layout_constraintTop_toTopOf="@id/address_edittext"
tools:ignore="SpeakableTextPresentCheck" />
<EditText <EditText
android:id="@+id/amount_edittext" android:id="@+id/amount_edittext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:hint="Amount" android:background="@drawable/edittext_bg"
android:hint="@string/amount"
android:inputType="numberDecimal" android:inputType="numberDecimal"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/send_max_button" app:layout_constraintEnd_toStartOf="@id/send_max_button"
@ -51,18 +77,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="12dp" android:layout_marginEnd="12dp"
android:text="SENDING ALL" android:padding="12dp"
android:text="@string/sending_all"
android:textStyle="bold" android:textStyle="bold"
android:visibility="gone" android:visibility="gone"
app:layout_constraintTop_toTopOf="@id/amount_edittext" app:layout_constraintTop_toTopOf="@id/amount_edittext"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/send_max_button" app:layout_constraintEnd_toStartOf="@id/send_max_button"
app:layout_constraintBottom_toBottomOf="@id/amount_edittext"/> app:layout_constraintBottom_toBottomOf="@id/amount_edittext"
tools:visibility="visible"/>
<Button <Button
android:id="@+id/send_max_button" android:id="@+id/send_max_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:background="@drawable/button_bg"
android:text="@string/send_max" android:text="@string/send_max"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@id/amount_edittext" app:layout_constraintTop_toTopOf="@id/amount_edittext"
@ -75,7 +104,8 @@
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" android:layout_marginEnd="24dp"
android:layout_marginTop="32dp" android:layout_marginTop="32dp"
android:text="Send" android:background="@drawable/button_bg"
android:text="@string/send"
app:layout_constraintTop_toBottomOf="@id/amount_edittext" app:layout_constraintTop_toBottomOf="@id/amount_edittext"
app:layout_constraintStart_toStartOf="parent"/> app:layout_constraintStart_toStartOf="parent"/>

3
app/src/main/res/values-night-v23/styles.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight"> <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowLightStatusBar">false</item> <item name="android:windowLightStatusBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="materialCardViewStyle">@style/AppCard</item> <item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values-night/colors.xml
View file

@ -28,6 +28,7 @@
<color name="oled_colorOnSecondary">@color/oled_colorOnPrimary</color> <color name="oled_colorOnSecondary">@color/oled_colorOnPrimary</color>
<color name="oled_colorError">@color/oled_favouriteColor</color> <color name="oled_colorError">@color/oled_favouriteColor</color>
<color name="oled_colorOnError">#ffffff</color> <color name="oled_colorOnError">#ffffff</color>
<color name="edittext_bg_color">#202020</color>
<!-- CLASSIC --> <!-- CLASSIC -->
<color name="classic_textColorPrimary">#ffffff</color> <color name="classic_textColorPrimary">#ffffff</color>

3
app/src/main/res/values-night/styles.xml
View file

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight"> <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="materialCardViewStyle">@style/AppCard</item> <item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
</style> </style>
<style name="AppCard" parent="Widget.MaterialComponents.CardView"> <style name="AppCard" parent="Widget.MaterialComponents.CardView">

3
app/src/main/res/values-v23/styles.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight"> <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowLightStatusBar">true</item> <item name="android:windowLightStatusBar">true</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="materialCardViewStyle">@style/AppCard</item> <item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values/colors.xml
View file

@ -28,6 +28,7 @@
<color name="oled_colorOnSecondary">@color/oled_colorOnBackground</color> <color name="oled_colorOnSecondary">@color/oled_colorOnBackground</color>
<color name="oled_colorError">@color/oled_negativeColor</color> <color name="oled_colorError">@color/oled_negativeColor</color>
<color name="oled_colorOnError">@color/oled_colorBackground</color> <color name="oled_colorOnError">@color/oled_colorBackground</color>
<color name="edittext_bg_color">#CCCCCC</color>
<!-- CLASSIC --> <!-- CLASSIC -->
<color name="classic_textColorPrimary">#0C080C</color> <color name="classic_textColorPrimary">#0C080C</color>

6
app/src/main/res/values/strings.xml
View file

@ -549,4 +549,10 @@
<string name="display_recovery_phrase">Display recovery phrase</string> <string name="display_recovery_phrase">Display recovery phrase</string>
<string name="tor_switch_label">Enable Tor (requires Orbot or similar app)</string> <string name="tor_switch_label">Enable Tor (requires Orbot or similar app)</string>
<string name="connection_failed">Connection failed</string> <string name="connection_failed">Connection failed</string>
<string name="address">87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw</string>
<string name="amount">0.00</string>
<string name="sending_all">SENDING ALL</string>
<string name="send">Send</string>
<string name="send_monero">Send Monero</string>
<string name="recv_monero">Receive Monero</string>
</resources> </resources>

3
app/src/main/res/values/styles.xml
View file

@ -1,11 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="MyMaterialTheme" parent="Theme.MaterialComponents.DayNight"> <style name="MyMaterialTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="materialCardViewStyle">@style/AppCard</item> <item name="materialCardViewStyle">@style/AppCard</item>
<item name="materialButtonStyle">@style/AppButton</item>
</style> </style>
<style name="MyMaterialThemeOled" parent="MyMaterialTheme"> <style name="MyMaterialThemeOled" parent="MyMaterialTheme">