fix betsmart tap issue, 264b

wagerr · Mar 30, 2020 · 8c51d06 · 8c51d06
1 parent c281174
commit 8c51d06
Show file tree

Hide file tree

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

diff --git a/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java b/app/src/main/java/com/wagerrwallet/presenter/fragments/FragmentEventDetails.java
@@ -734,7 +734,12 @@ public void updateUi() {
             mTxHomeTeam.setText( (item.getTxHomeTeam()!=null)?item.getTxHomeTeam():"Home N/A" );
             mTxAwayTeam.setText( (item.getTxAwayTeam()!=null)?item.getTxAwayTeam():"Away N/A" );
             mTxHomeOdds.setText( (item.getHomeOdds()>0)?item.getTxHomeOdds():"N/A" );
-            mTxDrawOdds.setText( (item.getDrawOdds()>0)?item.getTxDrawOdds():"N/A" );
+
+            String strDraw = (item.getDrawOdds()>0)?item.getTxDrawOdds():"N/A";
+            mTxDrawOdds.setText( strDraw );
+            if ( "N/A".equals(strDraw)) {
+                mTxDrawOdds.setVisibility(View.INVISIBLE);
+            }
             mTxAwayOdds.setText( (item.getAwayOdds()>0)?item.getTxAwayOdds():"N/A" );
             rlLastContainer = mMoneyLineContainer;      // default...
 

diff --git a/app/src/main/java/com/wagerrwallet/tools/adapter/EventListAdapter.java b/app/src/main/java/com/wagerrwallet/tools/adapter/EventListAdapter.java
@@ -188,7 +188,13 @@ private void setTexts(final EventHolder convertView, int position) {
         convertView.transactionHomeTeam.setText( (item.getTxHomeTeam()!=null)?item.getTxHomeTeam():"Home Team N/A" );
         convertView.transactionAwayTeam.setText( (item.getTxAwayTeam()!=null)?item.getTxAwayTeam():"Away Team N/A" );
         convertView.transactionHomeOdds.setText( (item.getTxHomeOdds()!=null)?item.getTxHomeOdds():"N/A" );
-        convertView.transactionDrawOdds.setText( (item.getTxDrawOdds()!=null)?item.getTxDrawOdds():"N/A" );
+
+        String strDraw = (item.getTxDrawOdds()!=null)?item.getTxDrawOdds():"N/A";
+        convertView.transactionDrawOdds.setText( strDraw );
+        if ( strDraw.equals("N/A")) {
+            convertView.transactionDrawOdds.setVisibility(View.GONE);
+            convertView.separator1.setVisibility(View.GONE);
+        }
         convertView.transactionAwayOdds.setText( (item.getTxAwayOdds()!=null)?item.getTxAwayOdds():"N/A" );
 
         String homeScore = item.getTxHomeScore();
@@ -347,7 +353,7 @@ private class EventHolder extends RecyclerView.ViewHolder {
         public BRText transactionDrawOdds;
         public Button transactionFailed;
         public ProgressBar transactionProgress;
-
+        public BRText separator1;
 
         public EventHolder(View view) {
             super(view);
@@ -365,7 +371,7 @@ public EventHolder(View view) {
             transactionDrawOdds = view.findViewById(R.id.tx_draw_odds);
             transactionFailed = view.findViewById(R.id.tx_failed_button);
             transactionProgress = view.findViewById(R.id.tx_progress);
-
+            separator1 = view.findViewById(R.id.tx_odds_separator1);
         }
     }
 

diff --git a/app/src/main/res/layout/event_details.xml b/app/src/main/res/layout/event_details.xml
@@ -86,14 +86,15 @@
 
         <ImageButton
             android:id="@+id/betsmart_button_home"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
             android:layout_below="@id/tx_home"
             android:layout_marginLeft="12dp"
             android:layout_marginTop="1dp"
-            android:padding="2dp"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
             android:backgroundTint="@color/white"
-            android:focusableInTouchMode="true"
+            android:focusableInTouchMode="false"
             android:src="@drawable/betsmart_widget" />
 
         <com.wagerrwallet.presenter.customviews.BRText
@@ -126,14 +127,15 @@
 
         <ImageButton
             android:id="@+id/betsmart_button_away"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginRight="20dp"
+            android:layout_width="48dp"
+            android:layout_height="48dp"
+            android:layout_marginRight="26dp"
             android:layout_alignParentRight="true"
             android:layout_marginTop="4dp"
-            android:padding="2dp"
+            android:padding="8dp"
+            android:scaleType="fitCenter"
             android:backgroundTint="@color/white"
-            android:focusableInTouchMode="true"
+            android:focusableInTouchMode="false"
             android:layout_below="@id/tx_away"
             android:src="@drawable/betsmart_widget" />
 
@@ -207,7 +209,7 @@
             android:layout_height="wrap_content"
             android:layout_centerHorizontal="true"
             android:orientation="vertical"
-            android:layout_marginTop="15dp"
+            android:layout_marginTop="5dp"
             >
 
             <RelativeLayout

diff --git a/app/src/main/secp/secp256k1 b/app/src/main/secp/secp256k1
+1 −0		.gitignore
+55 −13		.travis.yml
+17 −48		Makefile.am
+54 −11		README.md
+15 −0		SECURITY.md
+0 −145		build-aux/m4/ax_jni_include_dir.m4
+148 −77		configure.ac
+3 −3		contrib/lax_der_parsing.c
+75 −19		include/secp256k1.h
+36 −5		include/secp256k1_ecdh.h
+128 −0		include/secp256k1_preallocated.h
+1 −1		libsecp256k1.pc.in
+0 −6		src/asm/field_10x26_arm.s
+5 −0		src/basic-config.h
+74 −23		src/bench.h
+11 −6		src/bench_ecdh.c
+43 −25		src/bench_ecmult.c
+115 −101		src/bench_internal.c
+5 −3		src/bench_recover.c
+5 −3		src/bench_sign.c
+9 −6		src/bench_verify.c
+45 −42		src/ecdsa_impl.h
+4 −5		src/eckey_impl.h
+6 −5		src/ecmult.h
+5 −2		src/ecmult_const.h
+23 −16		src/ecmult_const_impl.h
+18 −11		src/ecmult_gen.h
+48 −50		src/ecmult_gen_impl.h
+291 −102		src/ecmult_impl.h
+4 −2		src/field.h
+3 −1		src/field_10x26.h
+14 −10		src/field_10x26_impl.h
+3 −1		src/field_5x52.h
+12 −9		src/field_5x52_impl.h
+3 −1		src/field_5x52_int128_impl.h
+5 −0		src/field_impl.h
+23 −10		src/gen_context.c
+6 −12		src/group.h
+63 −61		src/group_impl.h
+2 −1		src/hash_impl.h
+0 −446		src/java/org/bitcoin/NativeSecp256k1.java
+0 −226		src/java/org/bitcoin/NativeSecp256k1Test.java
+0 −45		src/java/org/bitcoin/NativeSecp256k1Util.java
+0 −51		src/java/org/bitcoin/Secp256k1Context.java
+0 −377		src/java/org_bitcoin_NativeSecp256k1.c
+0 −119		src/java/org_bitcoin_NativeSecp256k1.h
+0 −15		src/java/org_bitcoin_Secp256k1Context.c
+0 −22		src/java/org_bitcoin_Secp256k1Context.h
+43 −26		src/modules/ecdh/main_impl.h
+42 −15		src/modules/ecdh/tests_impl.h
+1 −1		src/modules/recovery/main_impl.h
+1 −1		src/modules/recovery/tests_impl.h
+8 −1		src/scalar.h
+13 −3		src/scalar_4x64_impl.h
+14 −0		src/scalar_8x32_impl.h
+4 −1		src/scalar_impl.h
+2 −0		src/scalar_low.h
+11 −1		src/scalar_low_impl.h
+17 −14		src/scratch.h
+47 −45		src/scratch_impl.h
+185 −68		src/secp256k1.c
+340 −93		src/tests.c
+3 −3		src/tests_exhaustive.c
+58 −1		src/util.h
+100 −0		src/valgrind_ctime_test.c