From fe73873b2bd9f1b35cf514c9b5260c832fd59a99 Mon Sep 17 00:00:00 2001
From: MIPPL <mip.pl@hotmail.com>
Date: Fri, 25 Oct 2019 11:42:18 +0200
Subject: [PATCH] Several UI fixes, b 239

---
 .idea/caches/build_file_checksums.ser         | Bin 539 -> 539 bytes
 .idea/caches/gradle_models.ser                | Bin 236832 -> 236832 bytes
 app/build.gradle                              |   4 ++--
 .../presenter/activities/EventsActivity.java  |   6 ++----
 .../presenter/activities/LoginActivity.java   |  14 ++++++++++++--
 .../fragments/FragmentEventDetails.java       |  14 ++++++++++++++
 .../tools/adapter/TransactionListAdapter.java |   7 ++++---
 app/src/main/res/layout/event_details.xml     |  13 +++++++++++++
 app/src/main/res/values/strings.xml           |   2 +-
 9 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index 844c25b123727d74bbee099e51801ad17c527d76..a9d6827e1228c3395fb7da83dbc13a47ff91d390 100644
GIT binary patch
delta 36
ucmV+<0NekY1e*kqmj!MC{!O)!oOcjDn-FhkbWhl2tmzm-@J0NSBLVmp<`5nL

delta 36
ucmV+<0NekY1e*kqmj!L~9PU7ooOcjtY6z%?O_~QM*F&0<axh$zBLVml-45FT

diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
index eb571000e86446daac36dea74c831ccac84f14b2..3be3e1346e935d6f82b1ab560f1f3d1acd29b54e 100644
GIT binary patch
delta 1133
zcmZWoeN0nV6z}c1+BOv`Y7{z*d`vW(FDp=>-4YQ;9D@W=T-b_HUZKzpYD+;I5j#Mj
z>)fEr6AvJa3e!0qv-;c~!!S4EAG!?;S+XUtB_=pC+=@E4>{GK_>Vj<VkDHu(ejn%D
zbDn=V(mxy-m{mp;k&4T*&{yM>rC_58)`<x!Wg?x_+pR)o{z@@>L(vlY#pgeKDfSum
z$rZP2Wss6;6l0&6QP5S36;BDr|IiAVc}5|yB~7@Wqro0GSr)nw16$rF;wR6S5^-ma
znb7OA=PS=YmrKOLY!?yZ^K#cwi(a~Q$nNymokX%b<w-oX^xEsCuCL^xg4RcjejpW0
z$$du3HMv#NjTK;$$38viyvM2yR?FP7EOtP14LjA{vri8FiKbO>fdo+#4O;r!&AJBU
zqM?~C-Q2%i`Y;;)%3fL+r#Mk7Q}Iq)x}Mu-;PI{xvXJb85&DF|QYMY=f)YY|<4ij-
z?lrJtTM1|%FVm;<28+(XWtjEloZezFaz=A{DW}t=@+mqa&u1i?ae{{yx@OPJw;0vR
zh$B37(aYDnQUzYrVnZqHz$<3xrl;kO$8cLaLyVWgG5XT>q~dwRR2f5zwT`#oIUBr!
z(-!EV>Z^QSSn|hmCOOmo&3kyZie-PUfFty8@1BS-_!lb!U#pwGDcm2{;-(TPzy~jb
zpO!a8-4c3c9$qb}gbw<ww0dutq^V*gdMS81B>8|Y-+v}aV%CcZjk(i05VlRUGuwiM
znp)x9^qfjQ-Z==1kaMtNt41fic-%zh6Y;pC8hYtqm*#ss*uNm*c0wmD9*$j!0T+02
zpoW?M-v03kysLZ!mw;onth31VaTWhnp54ooEsDu;jN%_*#ACFJF>KzU6p1OXB{c2D
zGu>em^L}P>WcQ}6;qY)B3!B`XcGUP6D6oVYFCBoRRN}U_p|A7**<d{&tv9b|7mB~0
z@AoqrrHs+ywc-VYjjuAS{@27JA^E3=*sKP4hsyhu-hT&_kJ}odpL(}1nh3x2?k4uq
zIpm}K&@`-Ac8FEu`1H!)+=A#lP>7YyY-d(GRQk{g+0fO(5F0P5swK8_gwVj|7++|x
zR&;ydZF)2~<doPN%L(-qrQOCx0=ek$!bR$eIXQ;OY8IAwAQ5|B2Z0XcUcD#yzSH8I
zlm9Sl!2N=CB<ytR4d!$~%XNfB=2&OnWaDhhJTMvhRctua##U>h<J}C2)wV%SyVu;9
Kk{aKFKJ`DeB&@6e

delta 1116
zcmZWodrVVj6z{#~V3Ajq8E8740&WmzwG>i{&oS5_5D_BFmexQY6g#n2O9z=7j4F;P
zOgpc7KyfV$hsz#-*X0@(vxk~MvKKg=8GHO8LD_)KWq(Y~x_#xkAlv=pOU`$Gk8{3r
zZg3zjI1tx29T}T@y>gWz{MC3Adh(edRZN~AnSw*=-ZWujae|n)^4S<XvQFJ928^}5
za>}a!eMXkJc<qEz+*)v%$HaNc)k5bTjj*vOTilwvmd7If3Ws1RC>1y7$8sV)W#`1C
zqQX?{zV&X!KDVdY?cpT1hkwk98#1qtNbOg6QHh%xhtyKZDDTh4w(No^X>1Xg_{FEj
zmGP{&$=!+uMGiZlsfL}=C#D}ie}_zoaE_ZKl^Qf?UK$r5ts0u}nmBw#`cMt`@)jIR
zb>H(U=36~3L#DRYXr<eJ$RVyAE?`xlrCs{094s8BN0bfIve&>#hb*93Zqw;A^hUi+
zYp62nw3!a0U2C%$99ms=hS6cnux1(zb{e+AeiXNimD0jj8S#P@+VQ!|!WqFTYN*i;
zWi)7m6S)57c0ZLKW{5BCa1y7omVG^o7_DRoYxUq=>UY6*y5WEh418ezM3(%eib>Xc
zM;@Wx9W49%HaLp@ozA^7_zx!o+be!F3x5r0=m`syQ0RFG;@xdA6+*|v{i~R2IELSL
zB>pUuR67`{t^3x}uw)2(%1@t^nDsmk-@ocp%eE<QW;>>IO$hxrW>kvlw|a;m?JicV
zqUW0sb(*-@L=u(lhEtf+5M`qJt~rSY547R0frJ+7tAhjdRt+<6^`6tv?Z^jk$@GPn
zb=DQD`ToDk(=RaPKPRu|(n9M4j3iRmF$TBuY>&j0ALVdp{o5+p#P%XHNy}SvNe)}~
zurR@XWQ<h7ISMQhO&`Am$FV5B5Xj&5|LoMuK)4`Zg@XCoY`>pk_tZm&=_~Ub!iHBE
zcJR9;p9|@e_pv#R(2d8N_|U%tDyC8&bm5XL#nbXjSL|gkJv!cZF+2??RqkWe;OUFW
zGYg_?hAmXx#CE3t8F(kWLN2P?&k!R)7?;@2aUABQE{X^b)=3S`@FuPpIeSxLYs_=_
z@H$;3`8X(~T?gPJj0$x=N$Jrnv@}BsbsPi%vsPbn3jQB7G~*O(VGYEuvFl~0Gp)=i
v|L?RYS!9OQ`#KwE^77iv;a|l?=MS;fa_s4RPhz#L<Z%`LR3iD_fI##=7KWkQ

diff --git a/app/build.gradle b/app/build.gradle
index 749e17b2e..373bf6b32 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId = 'com.wagerrwallet'
         minSdkVersion 23
         targetSdkVersion 28
-        versionCode 237
-        versionName "237"
+        versionCode 239
+        versionName "239"
         multiDexEnabled true
 
         // Similar to other properties in the defaultConfig block,
diff --git a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
index 6acc7d8ff..52378b85e 100644
--- a/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
+++ b/app/src/main/java/com/wagerrwallet/presenter/activities/EventsActivity.java
@@ -271,15 +271,13 @@ public void onClick(View v) {
         boolean cryptoPreferred = BRSharedPrefs.isCryptoPreferred(this);
 
         if (cryptoPreferred) {
-            swap();
+            setPriceTags(cryptoPreferred, false);
+            //swap();   // buggy when restoring activity
         }
 
         // Check if the "Twilight" screen altering app is currently running
         if (checkIfScreenAlteringAppIsRunning("com.urbandroid.lux")) {
-
             BRDialog.showSimpleDialog(this, getString(R.string.Dialog_screenAlteringTitle), getString(R.string.Dialog_screenAlteringMessage));
-
-
         }
 
     }
diff --git a/app/src/main/java/com/wagerrwallet/presenter/activities/LoginActivity.java b/app/src/main/java/com/wagerrwallet/presenter/activities/LoginActivity.java
index e213c2ffc..e73715ffe 100644
--- a/app/src/main/java/com/wagerrwallet/presenter/activities/LoginActivity.java
+++ b/app/src/main/java/com/wagerrwallet/presenter/activities/LoginActivity.java
@@ -8,6 +8,7 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.graphics.drawable.GradientDrawable;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.NonNull;
@@ -239,14 +240,23 @@ public void checkLatestVersion(final Activity app)    {
 
             JSONObject jsonObject = new JSONObject(jsonString);
             String sTag = jsonObject.getString("tag_name");
-            int tag = Integer.parseInt((sTag!=null)?sTag:"");
+            final int tag = Integer.parseInt((sTag!=null)?sTag:"");
 
             PackageInfo pInfo = app.getPackageManager().getPackageInfo(app.getPackageName(), 0);
             String version = pInfo.versionName;
             int versionCode = pInfo.versionCode;
             Log.d("MyApp", "Version Name : "+version + "\n Version Code : "+versionCode);
             if (versionCode < tag)   {
-                BRDialog.showSimpleDialog(app, "New version available", "A new version of Wagerr Bet app is available");
+                //BRDialog.showSimpleDialog(app, "New version available", "A new version of Wagerr Bet app is available");
+                BRDialog.showCustomDialog(app, "New version available", "A new version of Wagerr Bet app is available", app.getString(R.string.Button_ok), null, new BRDialogView.BROnClickListener() {
+                    @Override
+                    public void onClick(BRDialogView brDialogView) {
+                        brDialogView.dismiss();
+                        Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(String.format("https://github.com/wagerr/WagerrWalletAndroid/releases/tag/%d", tag)));
+                        app.startActivity(browserIntent);
+                        app.overridePendingTransition(R.anim.enter_from_bottom, R.anim.empty_300);
+                    }
+                }, null, null, 0);
             }
         } catch(PackageManager.NameNotFoundException e) {
             e.printStackTrace();
diff --git a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java
index 788211c42..3cd588014 100644
--- a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java
+++ b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java
@@ -3,6 +3,8 @@
 import android.app.Dialog;
 import android.app.DialogFragment;
 import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.Nullable;
@@ -70,6 +72,7 @@ public class FragmentEventDetails extends DialogFragment implements View.OnClick
 
     private BRText mTxEventHeader;
     private BRText mTxEventDate;
+    private BRText mTxEventId;
     private BRText mTxHomeTeam;
     private BRText mTxAwayTeam;
     //private BRText mTxHomeResult;
@@ -171,6 +174,16 @@ public void onClick(View v) {
         mMainLayout = rootView.findViewById(R.id.dynamic_container);
         mTxEventHeader = rootView.findViewById(R.id.tx_eventheader);
         mTxEventDate= rootView.findViewById(R.id.tx_eventdate);
+        mTxEventId= rootView.findViewById(R.id.tx_eventid);
+        final long evID = mTransaction.getEventID();
+        mTxEventId.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse(String.format("https://explorer.wagerr.com/#/bet/event/%d", evID)));
+                startActivity(browserIntent);
+                getActivity().overridePendingTransition(R.anim.enter_from_bottom, R.anim.empty_300);
+            }
+        });
         mTxHomeTeam = rootView.findViewById(R.id.tx_home);
         mTxAwayTeam= rootView.findViewById(R.id.tx_away);
         //mTxHomeResult = rootView.findViewById(R.id.tx_home_result);
@@ -636,6 +649,7 @@ public void updateUi() {
 
             mTxEventHeader.setText(item.getTxEventHeader());
             mTxEventDate.setText( item.getTxEventDate() );
+            mTxEventId.setText( String.format("Event #%d",item.getEventID()) );
 
             // timestamp is 0 if it's not confirmed in a block yet so make it now
             mTxDate.setText(BRDateUtil.getEventDate(mTransaction.getTimestamp() == 0 ? System.currentTimeMillis() : (mTransaction.getTimestamp() * 1000)));
diff --git a/app/src/main/java/com/wagerrwallet/tools/adapter/TransactionListAdapter.java b/app/src/main/java/com/wagerrwallet/tools/adapter/TransactionListAdapter.java
index 660845d7b..109deaca7 100644
--- a/app/src/main/java/com/wagerrwallet/tools/adapter/TransactionListAdapter.java
+++ b/app/src/main/java/com/wagerrwallet/tools/adapter/TransactionListAdapter.java
@@ -4,6 +4,7 @@
 import android.content.Context;
 import android.support.constraint.ConstraintLayout;
 import android.support.v7.widget.RecyclerView;
+import android.text.Html;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -254,7 +255,7 @@ else if (confirms == 3)
         if (item.getBetEntity()==null)  {
             if (item.isCoinbase() && item.getBlockHeight() != Integer.MAX_VALUE) {       // then payout reward
                 boolean immature = (nCurrentHeight - item.getBlockHeight()) <= PAYOUT_MATURITY;
-                String strMatureInfo = String.format("%d/%d", (nCurrentHeight - item.getBlockHeight()), PAYOUT_MATURITY);
+                String strMatureInfo = String.format("<b>%d/%d</b>", (nCurrentHeight - item.getBlockHeight()), PAYOUT_MATURITY);
                 int amountColor = (!immature) ? R.color.transaction_amount_payout_color : R.color.transaction_amount_inmature_color;
                 convertView.transactionAmount.setTextColor(mContext.getResources().getColor(amountColor, null));
                 BetResultTxDataStore brds = BetResultTxDataStore.getInstance(mContext);
@@ -273,7 +274,7 @@ else if (confirms == 3)
                     txDate = "PAYOUT";
                 }
                 isNormalTx = false;
-                if (immature) txDate += " " + strMatureInfo;
+                if (immature)   txDate += " " + strMatureInfo;
             }
             else {
                 if (level > 4) {
@@ -296,7 +297,7 @@ else if (confirms == 3)
         }
 
         convertView.transactionDetail.setText(txDescription);
-        convertView.transactionDate.setText(shortDate + " " + txDate);
+        convertView.transactionDate.setText(Html.fromHtml(shortDate + " " + txDate));
     }
 
     private void showTransactionProgress(TxHolder holder, int progress) {
diff --git a/app/src/main/res/layout/event_details.xml b/app/src/main/res/layout/event_details.xml
index b203f3773..c90b4e814 100644
--- a/app/src/main/res/layout/event_details.xml
+++ b/app/src/main/res/layout/event_details.xml
@@ -59,6 +59,19 @@
             android:textSize="18sp"
             app:customTFont="CircularPro-Book.otf" />
 
+        <com.wagerrwallet.presenter.customviews.BRText
+            android:id="@+id/tx_eventid"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@id/tx_eventheader"
+            android:layout_marginRight="22dp"
+            android:layout_alignParentEnd="true"
+            android:layout_marginTop="10dp"
+            android:text="Event #77777"
+            android:textColor="@color/blue"
+            android:textSize="18sp"
+            app:customTFont="CircularPro-Book.otf" />
+
         <com.wagerrwallet.presenter.customviews.BRText
             android:id="@+id/tx_home_label"
             android:layout_width="165dp"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2940eff86..a533a68e5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -287,7 +287,7 @@
   <!-- No Passcode set warning title -->
   <string name="Prompts.NoPasscode.title">Turn device passcode on</string>
   <!-- Instruction how to enable device encryption -->
-  <string name="Prompts.NoScreenLock.body.android">A device screen lock is needed to safeguard your wallet. Go to \"Settings\" &gt; \"Security\" &gt; \"Screen lock\" and enable to continue.</string>
+  <string name="Prompts.NoScreenLock.body.android">A device screen lock is mandatory to use the Wagerr wallet. Please enable the screen lock in your device settings and reinstall the application to enable wallet encryption</string>
   <!-- Warn user key store data has been invalidate because the user changed their security settings. The user must wipe their app data. -->
     <!-- Warn user key store data has been invalidate because the user changed their security settings. The user must uninstall. -->
   <string name="Alert.keystore.invalidated.uninstall.android">We can\'t proceed because your screen lock settings have been changed (e.g. password was disabled, fingerprints were changed). For security purposes, Android has permanently locked your key store. Therefore, your Wagerr app data must be wiped by uninstalling. Don’t worry, your funds are still secure! Reinstall the app and recover your wallet using your paper key.</string>