From dc178f10d9d7fbf2b9b0792a78add59f5729e149 Mon Sep 17 00:00:00 2001 From: pokkst Date: Thu, 7 Dec 2023 20:57:41 -0600 Subject: [PATCH] 0.5.4: Wording changes, adds trusted textview to node in list (if trusted) --- app/build.gradle | 4 ++-- .../wallet/adapter/NodeSelectionAdapter.kt | 4 ++++ .../res/drawable/button_bg_enabled_left.xml | 4 ++-- .../layout/add_node_bottom_sheet_dialog.xml | 4 ++-- .../layout/edit_node_bottom_sheet_dialog.xml | 4 ++-- .../main/res/layout/node_selection_item.xml | 21 ++++++++++++++++--- app/src/main/res/values/strings.xml | 5 +++-- 7 files changed, 33 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5344364..1ed048e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "net.mynero.wallet" minSdkVersion 21 targetSdkVersion 34 - versionCode 50300 - versionName "0.5.3 'Fluorine Fermi'" + versionCode 50400 + versionName "0.5.4 'Fluorine Fermi'" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" externalNativeBuild { cmake { diff --git a/app/src/main/java/net/mynero/wallet/adapter/NodeSelectionAdapter.kt b/app/src/main/java/net/mynero/wallet/adapter/NodeSelectionAdapter.kt index c38b893..75bac5b 100644 --- a/app/src/main/java/net/mynero/wallet/adapter/NodeSelectionAdapter.kt +++ b/app/src/main/java/net/mynero/wallet/adapter/NodeSelectionAdapter.kt @@ -101,11 +101,15 @@ class NodeSelectionAdapter(val listener: NodeSelectionAdapterListener?) : val nodeNameTextView = itemView.findViewById(R.id.node_name_textview) val nodeAddressTextView = itemView.findViewById(R.id.node_uri_textview) val authTextView = itemView.findViewById(R.id.authenticated_textview) + val trustedTextView = itemView.findViewById(R.id.trusted_node_textview) nodeNameTextView.text = node.name nodeAddressTextView.text = node.address if (node.password.isNotEmpty()) { authTextView.visibility = View.VISIBLE } + if(node.trusted) { + trustedTextView.visibility = View.VISIBLE + } val nodeAnonymityNetworkImageView = itemView.findViewById(R.id.anonymity_network_imageview) if (node.isOnion) { 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 e3cb9e9..21b26c5 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/layout/add_node_bottom_sheet_dialog.xml b/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml index 25c1896..75d55b9 100644 --- a/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/add_node_bottom_sheet_dialog.xml @@ -140,7 +140,7 @@ android:background="@drawable/edittext_bg" android:hint="@string/node_password_hint" android:inputType="textPassword" - android:visibility="visible" + android:visibility="gone" app:layout_constraintBottom_toTopOf="@id/add_node_button" app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton" app:layout_constraintStart_toStartOf="parent" /> @@ -152,7 +152,7 @@ android:background="@android:color/transparent" android:minWidth="48dp" android:minHeight="48dp" - android:visibility="visible" + android:visibility="gone" android:src="@drawable/ic_content_paste_24dp" app:layout_constraintBottom_toBottomOf="@id/password_edittext" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml b/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml index a2f7483..4ab31d7 100644 --- a/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml +++ b/app/src/main/res/layout/edit_node_bottom_sheet_dialog.xml @@ -130,7 +130,7 @@ android:background="@drawable/edittext_bg" android:hint="@string/node_password_hint" android:inputType="textPassword" - android:visibility="visible" + android:visibility="gone" app:layout_constraintTop_toBottomOf="@id/username_edittext" app:layout_constraintBottom_toTopOf="@id/delete_node_button" app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton" @@ -144,7 +144,7 @@ android:minWidth="48dp" android:minHeight="48dp" android:padding="8dp" - android:visibility="visible" + android:visibility="gone" android:src="@drawable/ic_content_paste_24dp" app:layout_constraintBottom_toBottomOf="@id/password_edittext" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/layout/node_selection_item.xml b/app/src/main/res/layout/node_selection_item.xml index 3673805..3d9054f 100644 --- a/app/src/main/res/layout/node_selection_item.xml +++ b/app/src/main/res/layout/node_selection_item.xml @@ -35,21 +35,36 @@ android:text="NODE::" android:ellipsize="middle" app:layout_constraintTop_toBottomOf="@id/node_name_textview" - app:layout_constraintBottom_toTopOf="@id/authenticated_textview" app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent" android:singleLine="true" /> + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 367172d..8f3c43e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -36,7 +36,7 @@ Street mode (hide balances) Show Monerochan Add occasional donation - Randomly adds a 0.5%-1.5% Mysu donation to Txns. It\'s random so Txns don\'t have a consistently uncommon fingerprint, and the % is random so Mysu doesn\'t know the exact Txn amount. + When enabled, there is a 10% chance when sending coins to add a 0.5%-1.5% donation to Mysu. These transaction fingerprints and donation amounts are randomized to preserve anonymity and privacy. Display wallet keys SOCKS Proxy Connection failed @@ -111,7 +111,7 @@ Low Medium High - View UTXOs + View outputs Selected value: %1$s XMR Selected value: %1$s XMR\n\nThe anonymity benefits of churning are still being researched. Only proceed if you know what you are doing. %1$d @@ -141,6 +141,7 @@ Donate to Mysu Transactions [ auth ] + [ trusted ] To Maximum allowed outputs Cannot send to integrated addresses in a pay-to-many transaction