Styled the receive spinners.

Reformatted fragment_send_success. Chenaged the eye's color on the password prompt.
arqma · Dec 31, 2020 · e00ea50 · e00ea50
1 parent 5d45d8f
commit e00ea50
Show file tree

Hide file tree

Showing 28 changed files with 119 additions and 68 deletions.
diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java b/app/src/main/java/com/m2049r/xmrwallet/WalletActivity.java
@@ -221,10 +221,10 @@ public boolean onPrepareOptionsMenu(Menu menu) {
         MenuItem streetmodeItem = menu.findItem(R.id.action_streetmode);
         if (streetmodeItem != null)
             if (isStreetMode()) {
-                toolbar.setBackgroundResource(R.drawable.backgound_toolbar_streetmode);
+                toolbar.setBackgroundResource(R.drawable.toolbar_background_streetmode);
                 streetmodeItem.setIcon(R.drawable.ic_logo_secondary_light_32dp);
             } else {
-                toolbar.setBackgroundResource(R.drawable.backgound_toolbar_normalmode);
+                toolbar.setBackgroundResource(R.drawable.toolbar_background_normalmode);
                 streetmodeItem.setIcon(R.drawable.ic_logo_brand_32dp);
             }
         return super.onPrepareOptionsMenu(menu);
@@ -274,9 +274,9 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     private void updateStreetMode() {
         if (isStreetMode()) {
-            toolbar.setBackgroundResource(R.drawable.backgound_toolbar_streetmode);
+            toolbar.setBackgroundResource(R.drawable.toolbar_background_streetmode);
         } else {
-            toolbar.setBackgroundResource(R.drawable.backgound_toolbar_normalmode);
+            toolbar.setBackgroundResource(R.drawable.toolbar_background_normalmode);
             showNet();
         }
         invalidateOptionsMenu();

diff --git a/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java b/app/src/main/java/com/m2049r/xmrwallet/WalletFragment.java
@@ -106,8 +106,8 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         ivSynced = view.findViewById(R.id.ivSynced);
 
         sCurrency = view.findViewById(R.id.sCurrency);
-        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner_balance);
-        currencyAdapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
+        ArrayAdapter currencyAdapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.spinner_item_balance);
+        currencyAdapter.setDropDownViewResource(R.layout.spinner_item_dropdown_item);
         sCurrency.setAdapter(currencyAdapter);
 
         bSend = view.findViewById(R.id.bSend);

diff --git a/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java b/app/src/main/java/com/m2049r/xmrwallet/widget/ExchangeView.java
@@ -166,12 +166,18 @@ protected void onFinishInflate() {
         super.onFinishInflate();
         etAmount = findViewById(R.id.etAmount);
         tvAmountB = findViewById(R.id.tvAmountB);
+
+        ArrayAdapter adapterA = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.spinner_item_receive_primary_dark);
+
+        adapterA.setDropDownViewResource(R.layout.spinner_item_dropdown_item);
         sCurrencyA = findViewById(R.id.sCurrencyA);
-        ArrayAdapter adapter = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.item_spinner);
-        adapter.setDropDownViewResource(R.layout.item_spinner_dropdown_item);
-        sCurrencyA.setAdapter(adapter);
+        sCurrencyA.setAdapter(adapterA);
+
+        ArrayAdapter adapterB = ArrayAdapter.createFromResource(getContext(), R.array.currency, R.layout.spinner_item_receive_secondary_dark);
+        adapterB.setDropDownViewResource(R.layout.spinner_item_dropdown_item);
         sCurrencyB = findViewById(R.id.sCurrencyB);
-        sCurrencyB.setAdapter(adapter);
+        sCurrencyB.setAdapter(adapterB);
+
         evExchange = findViewById(R.id.evExchange);
         pbExchange = findViewById(R.id.pbExchange);
 
@@ -199,9 +205,6 @@ public void onItemSelected(final AdapterView<?> parentView, View selectedItemVie
                 if (position != 0) { // if not XMR, select XMR on other
                     sCurrencyA.setSelection(0, true);
                 }
-                parentView.post(() -> {
-                    ((TextView) parentView.getChildAt(0)).setTextColor(ContextCompat.getColor(getContext(), R.color.colorSec));
-                });
                 doExchange();
             }
 

diff --git a/app/src/main/res/drawable/arqma_notification.png b/app/src/main/res/drawable/arqma_notification.png
diff --git a/app/src/main/res/drawable/backgound_all.xml → app/src/main/res/drawable/background_all.xml b/app/src/main/res/drawable/backgound_all.xml → app/src/main/res/drawable/background_all.xml
diff --git a/app/src/main/res/drawable/backgound_seed.xml → ...src/main/res/drawable/background_seed.xml b/app/src/main/res/drawable/backgound_seed.xml → ...src/main/res/drawable/background_seed.xml
diff --git a/...rc/main/res/drawable/gradient_primary.xml → ...s/drawable/gradient_rectangle_primary.xml b/...rc/main/res/drawable/gradient_primary.xml → ...s/drawable/gradient_rectangle_primary.xml
diff --git a/.../main/res/drawable/gradient_secondary.xml → ...drawable/gradient_rectangle_secondary.xml b/.../main/res/drawable/gradient_secondary.xml → ...drawable/gradient_rectangle_secondary.xml
diff --git a/app/src/main/res/drawable/texture_cash.png → ...rc/main/res/drawable/img_texture_cash.png b/app/src/main/res/drawable/texture_cash.png → ...rc/main/res/drawable/img_texture_cash.png
diff --git a/...awable/backgound_spinner_primary_dark.xml → ...wable/spinner_background_primary_dark.xml b/...awable/backgound_spinner_primary_dark.xml → ...wable/spinner_background_primary_dark.xml
diff --git a/...n/res/drawable/backgound_spinner_gray.xml → ...ble/spinner_background_secondary_dark.xml b/...n/res/drawable/backgound_spinner_gray.xml → ...ble/spinner_background_secondary_dark.xml
@@ -8,5 +8,5 @@
         android:top="8dp" />
     <stroke
         android:width="2dp"
-        android:color="@color/grey" />
+        android:color="@color/colorSecDark" />
 </shape>
diff --git a/...drawable/backgound_toolbar_normalmode.xml → ...rawable/toolbar_background_normalmode.xml b/...drawable/backgound_toolbar_normalmode.xml → ...rawable/toolbar_background_normalmode.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/gradient_primary" />
+    <item android:drawable="@drawable/gradient_rectangle_primary" />
     <item
         android:height="?attr/actionBarSize"
-        android:drawable="@drawable/texture_cash" />
+        android:drawable="@drawable/img_texture_cash" />
 </layer-list>
diff --git a/...drawable/backgound_toolbar_streetmode.xml → ...rawable/toolbar_background_streetmode.xml b/...drawable/backgound_toolbar_streetmode.xml → ...rawable/toolbar_background_streetmode.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/gradient_secondary" />
+    <item android:drawable="@drawable/gradient_rectangle_secondary" />
     <item
         android:height="?attr/actionBarSize"
-        android:drawable="@drawable/texture_cash" />
+        android:drawable="@drawable/img_texture_cash" />
 </layer-list>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@drawable/backgound_all"
+    android:background="@drawable/background_all"
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
@@ -11,7 +11,7 @@
         style="@style/ToolBarStyle.Event"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        android:background="@drawable/backgound_toolbar_normalmode"
+        android:background="@drawable/toolbar_background_normalmode"
         android:minHeight="?attr/actionBarSize" />
 
     <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/layout/activity_wallet.xml b/app/src/main/res/layout/activity_wallet.xml
@@ -9,7 +9,7 @@
     <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:background="@drawable/backgound_all"
+        android:background="@drawable/background_all"
         android:gravity="center_horizontal"
         android:orientation="vertical">
 
@@ -18,7 +18,7 @@
             style="@style/ToolBarStyle.Event"
             android:layout_width="match_parent"
             android:layout_height="?android:attr/actionBarSize"
-            android:background="@drawable/backgound_toolbar_normalmode"
+            android:background="@drawable/toolbar_background_normalmode"
             android:minHeight="?android:attr/actionBarSize" />
 
         <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"

diff --git a/app/src/main/res/layout/fragment_review.xml b/app/src/main/res/layout/fragment_review.xml
@@ -72,7 +72,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/data_top"
-                android:background="@drawable/backgound_seed"
+                android:background="@drawable/background_seed"
                 android:textAlignment="center"
                 tools:text="tucks slackens vehicle doctor oaks aloof balding knife rays wise haggled cuisine navy ladder suitcase dusted last thorn pixels karate ticket nibs violin zapped slackens" />
         </LinearLayout>

diff --git a/app/src/main/res/layout/fragment_send_confirm.xml b/app/src/main/res/layout/fragment_send_confirm.xml
@@ -13,6 +13,7 @@
             style="@style/MoneroText.Confirm.Label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
             android:text="@string/label_send_address"
             android:textAlignment="textStart" />
 
@@ -21,7 +22,9 @@
             style="@style/MoneroText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="16dp"
             android:layout_marginTop="8dp"
             android:textAlignment="textStart"
             tools:text="ar46iCiw5uB7SjnYhL5EJLP1LpqGkZbCcWhWgdbLL1c4DicNuYi3ZeRJPi8FFmEhYnagbxRyaQKyTYBA95JqmPcr1XZytK9o3" />
@@ -30,12 +33,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:layout_marginBottom="16dp"
             android:orientation="horizontal">
 
             <TextView
                 style="@style/MoneroText.Confirm.Label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
                 android:text="@string/label_send_payment_id"
                 android:textAlignment="textStart" />
 
@@ -53,12 +58,14 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
+            android:layout_marginBottom="16dp"
             android:orientation="horizontal">
 
             <TextView
                 style="@style/MoneroText.Confirm.Label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
                 android:text="@string/label_send_notes"
                 android:textAlignment="textStart" />
 
@@ -112,6 +119,7 @@
                     style="@style/MoneroLabel.Gray"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
                     android:layout_weight="1"
                     android:text="@string/send_amount_label"
                     android:textAlignment="textStart" />
@@ -137,6 +145,7 @@
                     style="@style/MoneroLabel.Gray"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
                     android:layout_weight="1"
                     android:text="@string/send_fee_label"
                     android:textAlignment="textStart" />
@@ -162,6 +171,7 @@
                     style="@style/MoneroLabel.Caps.Black"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
+                    android:paddingLeft="8dp"
                     android:layout_weight="1"
                     android:text="@string/send_total_label"
                     android:textAlignment="textStart" />

diff --git a/app/src/main/res/layout/fragment_send_success.xml b/app/src/main/res/layout/fragment_send_success.xml
@@ -31,15 +31,15 @@
                 android:orientation="vertical">
 
                 <TextView
-                    style="@style/MoneroText.Success"
+                    style="@style/MoneroText.SuccessPrimary"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_vertical"
                     android:text="@string/label_send_success" />
 
                 <TextView
                     android:id="@+id/tvTxAmount"
-                    style="@style/MoneroText.Balance.PriDark"
+                    style="@style/MoneroText.SuccessPrimary"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_weight="2"
@@ -68,6 +68,7 @@
                 style="@style/MoneroText.Confirm.Label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
                 android:text="@string/label_send_txid"
                 android:textAlignment="textStart" />
 
@@ -86,7 +87,9 @@
             style="@style/MoneroText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="16dp"
             android:layout_marginTop="4dp"
             android:textAlignment="textStart"
             tools:text="fcb12cbe9f43d4e8b9ee54f48d450a89a6937946db856506820df0539571801d" />
@@ -95,6 +98,8 @@
             style="@style/MoneroText.Confirm.Label"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
             android:text="@string/label_send_address"
             android:textAlignment="textStart" />
 
@@ -103,7 +108,9 @@
             style="@style/MoneroText"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginBottom="8dp"
+            android:paddingLeft="8dp"
+            android:paddingRight="8dp"
+            android:layout_marginBottom="16dp"
             android:layout_marginTop="4dp"
             android:textAlignment="textStart"
             tools:text="ar46iCiw5uB7SjnYhL5EJLP1LpqGkZbCcWhWgdbLL1c4DicNuYi3ZeRJPi8FFmEhYnagbxRyaQKyTYBA95JqmPcr1XZytK9o3" />
@@ -119,6 +126,8 @@
                 style="@style/MoneroText.Confirm.Label"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="8dp"
+
                 android:text="@string/label_send_payment_id" />
 
             <TextView

diff --git a/app/src/main/res/layout/fragment_wallet.xml b/app/src/main/res/layout/fragment_wallet.xml
@@ -68,6 +68,7 @@
 
                 <Spinner
                     android:id="@+id/sCurrency"
+                    style="@style/SpinnerPrimaryDark"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginStart="8dp"
@@ -78,7 +79,7 @@
                     android:paddingTop="0dp"
                     android:paddingEnd="4dp"
                     android:paddingBottom="2dp"
-                    tools:listitem="@layout/item_spinner_balance" />
+                    tools:listitem="@layout/spinner_item_balance" />
             </LinearLayout>
         </FrameLayout>
 

diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="192dp"
-    android:background="@drawable/backgound_toolbar_normalmode"
+    android:background="@drawable/toolbar_background_normalmode"
     android:orientation="vertical"
     android:padding="16dp">
 

diff --git a/app/src/main/res/layout/prompt_password.xml b/app/src/main/res/layout/prompt_password.xml
@@ -11,6 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:passwordToggleEnabled="true"
+        app:passwordToggleTint="@color/colorPri"
         app:errorEnabled="true">
 
         <com.google.android.material.textfield.TextInputEditText

diff --git a/.../main/res/layout/item_spinner_balance.xml → .../main/res/layout/spinner_item_balance.xml b/.../main/res/layout/item_spinner_balance.xml → .../main/res/layout/spinner_item_balance.xml
@@ -2,7 +2,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
-    style="@style/MoneroSpinnerItem.Balance"
+    style="@style/SpinnerItemBalancePrimaryDark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"

diff --git a/...res/layout/item_spinner_dropdown_item.xml → ...res/layout/spinner_item_dropdown_item.xml b/...res/layout/item_spinner_dropdown_item.xml → ...res/layout/spinner_item_dropdown_item.xml
diff --git a/app/src/main/res/layout/item_spinner.xml → ...out/spinner_item_receive_primary_dark.xml b/app/src/main/res/layout/item_spinner.xml → ...out/spinner_item_receive_primary_dark.xml
@@ -2,10 +2,10 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@android:id/text1"
-    style="?android:attr/spinnerItemStyle"
+    style="@style/SpinnerItemReceivePrimaryDark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:ellipsize="marquee"
-    android:gravity="center"
     android:singleLine="true"
+    android:textAlignment="center"
     tools:text="ARQ" />
diff --git a/app/src/main/res/layout/spinner_item_receive_secondary_dark.xml b/app/src/main/res/layout/spinner_item_receive_secondary_dark.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@android:id/text1"
+    style="@style/SpinnerItemReceiveSecondaryDark"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:ellipsize="marquee"
+    android:singleLine="true"
+    android:textAlignment="center"
+    tools:text="ARQ" />