0.5.4: Wording changes, adds trusted textview to node in list (if trusted)

This commit is contained in:
pokkst 2023-12-07 20:57:41 -06:00
parent 911c813a7e
commit dc178f10d9
No known key found for this signature in database
GPG key ID: EC4FAAA66859FAA4
7 changed files with 33 additions and 13 deletions

View file

@ -10,8 +10,8 @@ android {
applicationId "net.mynero.wallet" applicationId "net.mynero.wallet"
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 34 targetSdkVersion 34
versionCode 50300 versionCode 50400
versionName "0.5.3 'Fluorine Fermi'" versionName "0.5.4 'Fluorine Fermi'"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
externalNativeBuild { externalNativeBuild {
cmake { cmake {

View file

@ -101,11 +101,15 @@ class NodeSelectionAdapter(val listener: NodeSelectionAdapterListener?) :
val nodeNameTextView = itemView.findViewById<TextView>(R.id.node_name_textview) val nodeNameTextView = itemView.findViewById<TextView>(R.id.node_name_textview)
val nodeAddressTextView = itemView.findViewById<TextView>(R.id.node_uri_textview) val nodeAddressTextView = itemView.findViewById<TextView>(R.id.node_uri_textview)
val authTextView = itemView.findViewById<TextView>(R.id.authenticated_textview) val authTextView = itemView.findViewById<TextView>(R.id.authenticated_textview)
val trustedTextView = itemView.findViewById<TextView>(R.id.trusted_node_textview)
nodeNameTextView.text = node.name nodeNameTextView.text = node.name
nodeAddressTextView.text = node.address nodeAddressTextView.text = node.address
if (node.password.isNotEmpty()) { if (node.password.isNotEmpty()) {
authTextView.visibility = View.VISIBLE authTextView.visibility = View.VISIBLE
} }
if(node.trusted) {
trustedTextView.visibility = View.VISIBLE
}
val nodeAnonymityNetworkImageView = val nodeAnonymityNetworkImageView =
itemView.findViewById<ImageView>(R.id.anonymity_network_imageview) itemView.findViewById<ImageView>(R.id.anonymity_network_imageview)
if (node.isOnion) { if (node.isOnion) {

View file

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

View file

@ -140,7 +140,7 @@
android:background="@drawable/edittext_bg" android:background="@drawable/edittext_bg"
android:hint="@string/node_password_hint" android:hint="@string/node_password_hint"
android:inputType="textPassword" android:inputType="textPassword"
android:visibility="visible" android:visibility="gone"
app:layout_constraintBottom_toTopOf="@id/add_node_button" app:layout_constraintBottom_toTopOf="@id/add_node_button"
app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton" app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@ -152,7 +152,7 @@
android:background="@android:color/transparent" android:background="@android:color/transparent"
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:visibility="visible" android:visibility="gone"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/password_edittext" app:layout_constraintBottom_toBottomOf="@id/password_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -130,7 +130,7 @@
android:background="@drawable/edittext_bg" android:background="@drawable/edittext_bg"
android:hint="@string/node_password_hint" android:hint="@string/node_password_hint"
android:inputType="textPassword" android:inputType="textPassword"
android:visibility="visible" android:visibility="gone"
app:layout_constraintTop_toBottomOf="@id/username_edittext" app:layout_constraintTop_toBottomOf="@id/username_edittext"
app:layout_constraintBottom_toTopOf="@id/delete_node_button" app:layout_constraintBottom_toTopOf="@id/delete_node_button"
app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton" app:layout_constraintEnd_toStartOf="@id/paste_password_imagebutton"
@ -144,7 +144,7 @@
android:minWidth="48dp" android:minWidth="48dp"
android:minHeight="48dp" android:minHeight="48dp"
android:padding="8dp" android:padding="8dp"
android:visibility="visible" android:visibility="gone"
android:src="@drawable/ic_content_paste_24dp" android:src="@drawable/ic_content_paste_24dp"
app:layout_constraintBottom_toBottomOf="@id/password_edittext" app:layout_constraintBottom_toBottomOf="@id/password_edittext"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -35,21 +35,36 @@
android:text="NODE::" android:text="NODE::"
android:ellipsize="middle" android:ellipsize="middle"
app:layout_constraintTop_toBottomOf="@id/node_name_textview" app:layout_constraintTop_toBottomOf="@id/node_name_textview"
app:layout_constraintBottom_toTopOf="@id/authenticated_textview"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
android:singleLine="true" /> android:singleLine="true" />
<TextView <TextView
android:id="@+id/authenticated_textview" android:id="@+id/authenticated_textview"
android:layout_width="0dp" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/auth" android:text="@string/auth"
android:textColor="@color/oled_addressListColor" android:textColor="@color/oled_addressListColor"
android:ellipsize="middle" android:ellipsize="middle"
android:visibility="gone" android:visibility="gone"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
app:layout_constraintTop_toBottomOf="@id/node_uri_textview" app:layout_constraintTop_toBottomOf="@id/node_uri_textview"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toStartOf="@id/trusted_node_textview"
android:singleLine="true" />
<TextView
android:id="@+id/trusted_node_textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/trusted"
android:textColor="@color/oled_addressListColor"
android:ellipsize="middle"
android:visibility="gone"
android:layout_marginStart="4dp"
android:layout_marginEnd="4dp"
app:layout_constraintTop_toBottomOf="@id/node_uri_textview"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@id/authenticated_textview"
android:singleLine="true" /> android:singleLine="true" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

View file

@ -36,7 +36,7 @@
<string name="street_mode">Street mode (hide balances)</string> <string name="street_mode">Street mode (hide balances)</string>
<string name="option_hide_xmrchan">Show Monerochan</string> <string name="option_hide_xmrchan">Show Monerochan</string>
<string name="option_donate_per_tx">Add occasional donation</string> <string name="option_donate_per_tx">Add occasional donation</string>
<string name="option_donate_per_tx_desc">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.</string> <string name="option_donate_per_tx_desc">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.</string>
<string name="display_recovery_phrase">Display wallet keys</string> <string name="display_recovery_phrase">Display wallet keys</string>
<string name="tor_switch_label">SOCKS Proxy</string> <string name="tor_switch_label">SOCKS Proxy</string>
<string name="connection_failed">Connection failed</string> <string name="connection_failed">Connection failed</string>
@ -111,7 +111,7 @@
<string name="low">Low</string> <string name="low">Low</string>
<string name="medium">Medium</string> <string name="medium">Medium</string>
<string name="high">High</string> <string name="high">High</string>
<string name="view_utxos">View UTXOs</string> <string name="view_utxos">View outputs</string>
<string name="selected_utxos_value">Selected value: %1$s XMR</string> <string name="selected_utxos_value">Selected value: %1$s XMR</string>
<string name="selected_utxos_value_churning">Selected value: %1$s XMR\n\nThe anonymity benefits of churning are still being researched. Only proceed if you know what you are doing.</string> <string name="selected_utxos_value_churning">Selected value: %1$s XMR\n\nThe anonymity benefits of churning are still being researched. Only proceed if you know what you are doing.</string>
<string name="global_index_text">%1$d</string> <string name="global_index_text">%1$d</string>
@ -141,6 +141,7 @@
<string name="donate_label">Donate to Mysu</string> <string name="donate_label">Donate to Mysu</string>
<string name="transactions">Transactions</string> <string name="transactions">Transactions</string>
<string name="auth">[ auth ]</string> <string name="auth">[ auth ]</string>
<string name="trusted">[ trusted ]</string>
<string name="to">To</string> <string name="to">To</string>
<string name="max_outputs_allowed">Maximum allowed outputs</string> <string name="max_outputs_allowed">Maximum allowed outputs</string>
<string name="paymentid_paytomany">Cannot send to integrated addresses in a pay-to-many transaction</string> <string name="paymentid_paytomany">Cannot send to integrated addresses in a pay-to-many transaction</string>