diff --git a/.idea/misc.xml b/.idea/misc.xml
index 7a38548f2d..c0f68eddd7 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -28,4 +28,7 @@
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index 7920e424ef..6a5936aa12 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ apply plugin: 'kotlin-android-extensions'
static def generateVersionName() {
def gitCommitsCount = "git rev-list HEAD --count".execute().text.trim()
def gitCurrentBranch = "git rev-parse --abbrev-ref HEAD".execute().text.trim()
- return gitCommitsCount.toInteger() + 831 + "\\n" + gitCurrentBranch
+ return gitCommitsCount.toInteger() + 831// + "\\n" + gitCurrentBranch
}
android {
@@ -16,7 +16,7 @@ android {
minSdkVersion 21
targetSdkVersion 27
versionCode 51
- versionName "0.87.1." + generateVersionName()
+ versionName "0.87.3." + generateVersionName()
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
diff --git a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
index 097f64da93..792edb6d56 100644
--- a/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
+++ b/app/src/main/java/com/tangem/presentation/fragment/LoadedWallet.kt
@@ -167,8 +167,16 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
startActivity(browserIntent)
}
+ tvLookup.setOnClickListener {
+ val engineClick = CoinEngineFactory.Create(mCard!!.blockchain)
+ val browserIntent = Intent(Intent.ACTION_VIEW, engineClick!!.getShareWalletURIExplorer(mCard))
+ startActivity(browserIntent)
+ }
+
ivCopy.setOnClickListener { doShareWallet(false) }
+ tvCopy.setOnClickListener { doShareWallet(false) }
+
tvWallet.setOnClickListener { doShareWallet(false) }
ivQR.setOnClickListener { doShareWallet(true) }
@@ -190,11 +198,23 @@ class LoadedWallet : Fragment(), NfcAdapter.ReaderCallback, CardProtocol.Notific
Toast.makeText(context, R.string.need_attach_card_again, Toast.LENGTH_LONG).show()
}
+ tvInfo.setOnClickListener {
+ if (mCardProtocol != null)
+ openVerifyCard(mCardProtocol!!)
+ else
+ Toast.makeText(context, R.string.need_attach_card_again, Toast.LENGTH_LONG).show()
+ }
+
fabNFC.setOnClickListener {
val intent = Intent(context, MainActivity::class.java)
startActivity(intent)
}
+ tvNFC.setOnClickListener {
+ val intent = Intent(context, MainActivity::class.java)
+ startActivity(intent)
+ }
+
btnExtract.setOnClickListener {
if (!mCard!!.hasBalanceInfo())
Toast.makeText(context, R.string.cannot_obtain_data_from_blockchain, Toast.LENGTH_LONG).show()
diff --git a/app/src/main/res/layout/fr_loaded_wallet.xml b/app/src/main/res/layout/fr_loaded_wallet.xml
index bc437fe857..a60ba1b7f4 100644
--- a/app/src/main/res/layout/fr_loaded_wallet.xml
+++ b/app/src/main/res/layout/fr_loaded_wallet.xml
@@ -64,9 +64,11 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:alpha="0.8"
+ android:fontFamily="@font/maaxmedium"
android:text="@string/verifying"
android:textColor="@color/colorPrimary"
- android:textStyle="bold"/>
+ android:textSize="@dimen/text_size_small"
+ android:textStyle="bold" />
+ tools:text="0.05 BTC" />
+ tools:text="Bitcoin" />
@@ -126,21 +128,21 @@
android:id="@+id/tvBalanceLine1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginTop="5dp"
- android:fontFamily="@font/montserrat_light"
+ android:layout_marginTop="10dp"
+ android:fontFamily="@font/maaxmedium"
android:textAlignment="center"
android:textColor="@color/msg_err"
- android:textSize="18sp"
- tools:text="Verification field"/>
+ android:textSize="@dimen/text_size_medium"
+ tools:text="Verification field" />
+ tools:text="Do not accept! Wallet verification field. Tap again." />
@@ -155,7 +157,7 @@
+ android:layout_height="@dimen/size_qr_image" />
+ tools:text="1DoQdnSYshhZ5Tqt5Sk6svZt29jqoYVwQY" />
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -210,14 +249,14 @@
android:layout_height="wrap_content"
android:background="#BF7FF27F"
android:elevation="2dp"
- android:fontFamily="@font/montserrat_light"
+ android:fontFamily="@font/maax"
android:padding="4dp"
android:text="@string/message"
android:textAlignment="center"
android:textColor="@color/black"
android:textStyle="normal|bold"
android:visibility="gone"
- tools:visibility="visible"/>
+ tools:visibility="visible" />
+ tools:visibility="visible" />
@@ -244,42 +283,89 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
- app:layout_constraintBottom_toBottomOf="parent">
+ app:layout_constraintBottom_toBottomOf="parent"
+ app:layout_constraintBottom_toTopOf="@+id/rlAuxButtons">
-
-
-
-
+ android:fontFamily="@font/saira_condensed_bold"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:text="@string/load"
+ android:textSize="@dimen/text_size_large" />
+ android:layout_width="0dp"
+ android:layout_height="45dp"
+ android:layout_marginBottom="5dp"
+ android:layout_marginTop="5dp"
+ android:layout_weight="1"
+ android:elevation="15dp"
+ android:fontFamily="@font/saira_condensed_bold"
+ android:paddingLeft="20dp"
+ android:paddingRight="20dp"
+ android:text="@string/extract"
+ android:textSize="@dimen/text_size_large" />
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 54cc238043..a046716244 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -24,7 +24,7 @@
24sp
32sp
- 220dp
+ 200dp
30dp
135dp