adjust instaswap home labels, remove refund address for non crypto, b…

… 279
wagerr · Aug 4, 2020 · 80965b3 · 80965b3
1 parent 1571424
commit 80965b3
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 27 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId = 'com.wagerrwallet'
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 278
-        versionName "278"
+        versionCode 279
+        versionName "279"
         multiDexEnabled true
 
         // Similar to other properties in the defaultConfig block,

diff --git a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentSendSwap.java b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentSendSwap.java
@@ -169,6 +169,10 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         mListDepositCoins.add(selectedIso);
         isoButton.setText(selectedIso);
 
+        //is the chosen ISO a crypto (could be also a fiat currency)
+        boolean isIsoCrypto = isISOCrypto(selectedIso);
+        refunddAddressLayout.setVisibility( (isIsoCrypto) ? View.VISIBLE : View.GONE );
+
         BRExecutor.getInstance().forLightWeightBackgroundTasks().execute(new Runnable() {
             @Override
             public void run() {

diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
@@ -91,31 +91,13 @@
                     android:textColor="@color/white"
                     app:customTFont="CircularPro-Book.otf" />
 
-                <com.wagerrwallet.presenter.customviews.BRText
-                    android:id="@+id/swap_labelwgr"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginTop="16dp"
-                    android:clickable="false"
-                    android:drawablePadding="8dp"
-                    android:focusable="false"
-                    android:paddingBottom="4dp"
-                    android:text="> WGR"
-                    android:layout_alignParentEnd="true"
-                    android:layout_alignBottom="@id/swap_label"
-                    android:textSize="15sp"
-                    android:textColor="@color/white"
-                    app:customTFont="CircularPro-Book.otf" />
-
 
                 <com.wagerrwallet.presenter.customviews.BRText
                     android:id="@+id/swap_labelbtc"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginRight="4dp"
+                    android:layout_marginRight="8dp"
                     android:layout_marginLeft="10dp"
                     android:layout_marginTop="16dp"
                     android:clickable="true"
@@ -124,7 +106,7 @@
                     android:focusable="false"
                     android:paddingBottom="4dp"
                     android:text="BTC"
-                    android:layout_toRightOf="@id/swap_label"
+                    android:layout_toLeftOf="@id/swap_labeleur"
                     android:layout_alignBottom="@id/swap_label"
                     android:textSize="15sp"
                     android:textColor="@color/white"
@@ -136,14 +118,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:layout_marginRight="4dp"
+                android:layout_marginRight="8dp"
                 android:layout_marginTop="16dp"
                 android:clickable="true"
                 android:drawablePadding="8dp"
                     android:background="@drawable/tx_rounded_rect"
                 android:focusable="false"
                 android:paddingBottom="4dp"
-                    android:layout_toRightOf="@id/swap_labelbtc"
+                    android:layout_toLeftOf="@id/swap_labelusd"
                 android:text="EUR"
 
                 android:layout_alignBottom="@id/swap_label"
@@ -156,15 +138,15 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center"
-                    android:layout_marginRight="10dp"
+                    android:layout_marginRight="20dp"
                     android:layout_marginTop="16dp"
                     android:clickable="true"
                     android:drawablePadding="8dp"
                     android:focusable="false"
                     android:background="@drawable/tx_rounded_rect"
                     android:paddingBottom="4dp"
                     android:text="USD"
-                    android:layout_toRightOf="@id/swap_labeleur"
+                    android:layout_alignParentEnd="true"
                     android:layout_alignBottom="@id/swap_label"
                     android:textSize="15sp"
                     android:textColor="@color/white"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -763,7 +763,7 @@
     <string name="Portfolio">Portfolio</string>
     <string name="Wallets">Wallets</string>
     <string name="Admin">Admin</string>
-    <string name="BuySwap">Buy</string>
+    <string name="BuySwap">Buy WGR</string>
 
     <!-- One-time BCH dialog -->
     <string name="Dialog.welcomeBchTitle">Wagerr now supports Bitcoin Cash!</string>