diff --git a/app/src/main/java/net/mynero/wallet/fragment/dialog/InformationBottomSheetDialog.java b/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.java similarity index 90% rename from app/src/main/java/net/mynero/wallet/fragment/dialog/InformationBottomSheetDialog.java rename to app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.java index 2c21839..c27ea2d 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/dialog/InformationBottomSheetDialog.java +++ b/app/src/main/java/net/mynero/wallet/fragment/dialog/WalletKeysBottomSheetDialog.java @@ -15,13 +15,13 @@ import com.google.android.material.bottomsheet.BottomSheetDialogFragment; import net.mynero.wallet.R; import net.mynero.wallet.util.Helper; -public class InformationBottomSheetDialog extends BottomSheetDialogFragment { +public class WalletKeysBottomSheetDialog extends BottomSheetDialogFragment { public boolean showCopyButton = false; public String information = ""; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.information_bottom_sheet_dialog, null); + return inflater.inflate(R.layout.wallet_keys_bottom_sheet_dialog, null); } @Override diff --git a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java index 21a46e4..1eac1a9 100644 --- a/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java +++ b/app/src/main/java/net/mynero/wallet/fragment/settings/SettingsFragment.java @@ -27,7 +27,7 @@ import net.mynero.wallet.R; import net.mynero.wallet.data.DefaultNodes; import net.mynero.wallet.data.Node; import net.mynero.wallet.fragment.dialog.AddNodeBottomSheetDialog; -import net.mynero.wallet.fragment.dialog.InformationBottomSheetDialog; +import net.mynero.wallet.fragment.dialog.WalletKeysBottomSheetDialog; import net.mynero.wallet.fragment.dialog.NodeSelectionBottomSheetDialog; import net.mynero.wallet.fragment.dialog.PasswordBottomSheetDialog; import net.mynero.wallet.model.Wallet; @@ -38,9 +38,6 @@ import net.mynero.wallet.util.Constants; import net.mynero.wallet.util.DayNightMode; import net.mynero.wallet.util.NightmodeHelper; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; - public class SettingsFragment extends Fragment implements PasswordBottomSheetDialog.PasswordListener, NodeSelectionBottomSheetDialog.NodeSelectionDialogListener, AddNodeBottomSheetDialog.AddNodeListener { private SettingsViewModel mViewModel; @@ -184,7 +181,7 @@ public class SettingsFragment extends Fragment implements PasswordBottomSheetDia } private void displaySeedDialog() { - InformationBottomSheetDialog informationDialog = new InformationBottomSheetDialog(); + WalletKeysBottomSheetDialog informationDialog = new WalletKeysBottomSheetDialog(); informationDialog.showCopyButton = false; informationDialog.information = WalletManager.getInstance().getWallet().getSeed(""); informationDialog.show(getActivity().getSupportFragmentManager(), "information_seed_dialog"); diff --git a/app/src/main/res/drawable/button_bg_disabled.xml b/app/src/main/res/drawable/button_bg_disabled.xml index c3f6f13..2cb456d 100644 --- a/app/src/main/res/drawable/button_bg_disabled.xml +++ b/app/src/main/res/drawable/button_bg_disabled.xml @@ -5,5 +5,5 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/drawable/button_bg_disabled_left.xml b/app/src/main/res/drawable/button_bg_disabled_left.xml index ca8b60c..9430bf2 100644 --- a/app/src/main/res/drawable/button_bg_disabled_left.xml +++ b/app/src/main/res/drawable/button_bg_disabled_left.xml @@ -5,6 +5,6 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/drawable/button_bg_disabled_right.xml b/app/src/main/res/drawable/button_bg_disabled_right.xml index ff22811..e21d405 100644 --- a/app/src/main/res/drawable/button_bg_disabled_right.xml +++ b/app/src/main/res/drawable/button_bg_disabled_right.xml @@ -5,6 +5,6 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/drawable/button_bg_enabled.xml b/app/src/main/res/drawable/button_bg_enabled.xml index dce9809..89538d3 100644 --- a/app/src/main/res/drawable/button_bg_enabled.xml +++ b/app/src/main/res/drawable/button_bg_enabled.xml @@ -5,5 +5,5 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/drawable/button_bg_enabled_left.xml b/app/src/main/res/drawable/button_bg_enabled_left.xml index 21b26c5..f58bdc7 100644 --- a/app/src/main/res/drawable/button_bg_enabled_left.xml +++ b/app/src/main/res/drawable/button_bg_enabled_left.xml @@ -5,6 +5,6 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/drawable/button_bg_enabled_right.xml b/app/src/main/res/drawable/button_bg_enabled_right.xml index 62f9073..e0848b5 100644 --- a/app/src/main/res/drawable/button_bg_enabled_right.xml +++ b/app/src/main/res/drawable/button_bg_enabled_right.xml @@ -5,6 +5,6 @@ android:left="8dp" android:right="8dp" /> - + diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml index 6c6ce3f..45f60d1 100644 --- a/app/src/main/res/layout/fragment_home.xml +++ b/app/src/main/res/layout/fragment_home.xml @@ -110,6 +110,7 @@ android:layout_height="wrap_content" android:background="@drawable/button_bg_left" android:text="@string/receive" + android:layout_marginEnd="1dp" android:layout_marginBottom="16dp" android:layout_marginStart="24dp" app:layout_constraintBottom_toBottomOf="parent" @@ -122,6 +123,7 @@ android:layout_height="wrap_content" android:background="@drawable/button_bg_right" android:text="@string/send" + android:layout_marginStart="1dp" android:layout_marginBottom="16dp" android:layout_marginEnd="24dp" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml index 11f8d86..ae615fa 100644 --- a/app/src/main/res/layout/fragment_settings.xml +++ b/app/src/main/res/layout/fragment_settings.xml @@ -108,6 +108,7 @@ android:layout_height="wrap_content" android:layout_marginTop="16dp" android:layout_marginEnd="24dp" + android:minHeight="48dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@id/appearance_settings_textview" /> @@ -129,16 +130,20 @@ android:id="@+id/select_node_button" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginStart="24dp" android:layout_marginTop="16dp" android:layout_marginEnd="24dp" - android:layout_marginStart="24dp" - android:singleLine="true" - android:ellipsize="middle" + android:paddingStart="16dp" + android:paddingEnd="16dp" + tools:text="aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa" android:background="@drawable/button_bg" + android:ellipsize="middle" + android:singleLine="true" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@id/network_settings_textview" /> + app:layout_constraintTop_toBottomOf="@id/network_settings_textview" + tools:ignore="SpeakableTextPresentCheck" /> diff --git a/app/src/main/res/layout/fragment_utxos.xml b/app/src/main/res/layout/fragment_utxos.xml index 43c9a90..5a0f86f 100644 --- a/app/src/main/res/layout/fragment_utxos.xml +++ b/app/src/main/res/layout/fragment_utxos.xml @@ -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.home.HomeFragment"> @@ -23,6 +25,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:layout_marginTop="16dp" + android:layout_marginStart="24dp" + android:layout_marginEnd="24dp" android:clipToPadding="false" android:paddingBottom="128dp" app:layout_constraintBottom_toBottomOf="parent" @@ -37,6 +41,8 @@ android:layout_height="wrap_content" android:background="@drawable/button_bg" android:visibility="gone" + android:layout_marginBottom="24dp" + android:layout_marginEnd="24dp" android:text="@string/send" tools:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" diff --git a/app/src/main/res/layout/information_bottom_sheet_dialog.xml b/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml similarity index 73% rename from app/src/main/res/layout/information_bottom_sheet_dialog.xml rename to app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml index f08014a..6ccf79c 100644 --- a/app/src/main/res/layout/information_bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/wallet_keys_bottom_sheet_dialog.xml @@ -13,6 +13,19 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> + + + %1$s confirming Please enter an amount Please enter a valid amount - Send Max + Max Undo Error sending tx Error creating tx @@ -39,7 +39,7 @@ Invalid mnemonic Copied to clipboard Night mode - Display recovery phrase + Display wallet keys Enable proxy Connection failed 87MRtZPrWUCVUgcFHdsVb5MoZUcLtqfD3FvQVGwftFb8eSdMnE39JhAJcbuSW8X2vRaRsB9RQfuCpFciybJFHaz3QYPhCLw @@ -97,4 +97,5 @@ Global Idx: %1$d Outpoint: %1$s Create wallet failed: %1$s + Wallet Keys