From 8e2f4095c543e4a2a2082f12889db233ec30aabf Mon Sep 17 00:00:00 2001 From: Tangem Date: Sat, 30 Mar 2019 14:42:26 +0300 Subject: [PATCH] Updated on 2026-08-14 --- app/build.gradle | 18 +++++++++++++--- app/src/debug/java/com/tangem/Test.java | 4 ++++ app/src/debug/res/values/strings.xml | 3 +-- app/src/main/AndroidManifest.xml | 12 +++++------ app/src/main/java/com/tangem/Constant.kt | 3 +++ .../java/com/tangem/data/LogFileProvider.java | 3 ++- .../com/tangem/ui/activity/LogoActivity.kt | 19 +++++++++++++---- .../com/tangem/ui/activity/MainActivity.kt | 3 ++- app/src/main/res/layout/activity_logo.xml | 21 ++++++++++++++++++- app/src/main/res/values/strings.xml | 8 ++++++- .../res/values/strings_untranslatable.xml | 1 + .../res/values/strings.xml | 1 - app/src/tangemCardano/res/values/strings.xml | 6 ++++++ 13 files changed, 82 insertions(+), 20 deletions(-) create mode 100644 app/src/debug/java/com/tangem/Test.java rename app/src/{release => tangemAccess}/res/values/strings.xml (56%) create mode 100644 app/src/tangemCardano/res/values/strings.xml diff --git a/app/build.gradle b/app/build.gradle index ab63c2525b..59599b9cfa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -12,11 +12,8 @@ static def generateVersionName() { android { compileSdkVersion 28 defaultConfig { - applicationId "com.tangem.wallet" minSdkVersion 21 targetSdkVersion 28 - versionCode 106 - versionName "0.903.2." + generateVersionName() testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } androidExtensions { @@ -36,6 +33,21 @@ android { signingConfig signingConfigs.debug } } + flavorDimensions "" + productFlavors { + tangemAccess { + versionName "0.903.2." + generateVersionName() + versionCode 106 + applicationId "com.tangem.wallet" + signingConfig signingConfigs.debug + } + tangemCardano { + versionName "0.1.0" + versionCode 1 + applicationId "com.tangem.cardano" + signingConfig signingConfigs.debug + } + } compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/app/src/debug/java/com/tangem/Test.java b/app/src/debug/java/com/tangem/Test.java new file mode 100644 index 0000000000..df5872e621 --- /dev/null +++ b/app/src/debug/java/com/tangem/Test.java @@ -0,0 +1,4 @@ +package com.tangem; + +public class Test { +} diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml index 700e32affc..9ef8838437 100644 --- a/app/src/debug/res/values/strings.xml +++ b/app/src/debug/res/values/strings.xml @@ -1,7 +1,6 @@ - DEV - com.tangem.data.LogFileProvider.debug + DEBUG \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0758bd9d3e..fbc7175cf5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -29,12 +29,12 @@ android:supportsRtl="true" android:theme="@style/AppTheme" tools:ignore="GoogleAppIndexingWarning"> - + + + + + + { + tvExtension.visibility = View.VISIBLE + tvExtension.text = getString(R.string.cardano) + } + else -> { + tvExtension.visibility = View.GONE + } + } if (intent.getBooleanExtra(Constant.EXTRA_AUTO_HIDE, true)) ivLogo.postDelayed(hideRunnable, Constant.MILLIS_AUTO_HIDE.toLong()) diff --git a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt index 4ee6e16658..41138e9327 100644 --- a/app/src/main/java/com/tangem/ui/activity/MainActivity.kt +++ b/app/src/main/java/com/tangem/ui/activity/MainActivity.kt @@ -142,7 +142,8 @@ class MainActivity : AppCompatActivity(), NfcAdapter.ReaderCallback, CardProtoco val responseBuildVersion = responseVersionName.split('.').last() val appBuildVersion = BuildConfig.VERSION_NAME.split('.').last() if (responseBuildVersion.toInt() > appBuildVersion.toInt()) - toastHelper.showSnackbarUpdateVersion(this, cl, responseVersionName) + if (BuildConfig.FLAVOR.equals(Constant.FLAVOR_TANGEM_ACCESS)) + toastHelper.showSnackbarUpdateVersion(this, cl, responseVersionName) } catch (E: Exception) { E.printStackTrace() } diff --git a/app/src/main/res/layout/activity_logo.xml b/app/src/main/res/layout/activity_logo.xml index 97397e9d4d..cf3bb0afc9 100644 --- a/app/src/main/res/layout/activity_logo.xml +++ b/app/src/main/res/layout/activity_logo.xml @@ -7,6 +7,25 @@ tools:context="com.tangem.ui.activity.LogoActivity" tools:ignore="contentDescription"> + + + app:layout_constraintTop_toBottomOf="@+id/tvExtension" /> No connection with blockchain nodes Continue Not found - Card must be loaded first! Tag lost! command @@ -56,6 +55,7 @@ Show QR-code LOAD BETA + Cardano Your Android device is rooted. Security at risk! @@ -84,6 +84,12 @@ Reset PINs to default Erase wallet + + BETA v.%1$s \n dev \n build %2$s + BETA v.%1$s + + Hello, %1$s! You have %2$d new messages. + Tap Tangem card with your smartphone Scan a banknote with your \n %1$s \n as shown above diff --git a/app/src/main/res/values/strings_untranslatable.xml b/app/src/main/res/values/strings_untranslatable.xml index 78b9c55461..13279d3f9c 100644 --- a/app/src/main/res/values/strings_untranslatable.xml +++ b/app/src/main/res/values/strings_untranslatable.xml @@ -20,6 +20,7 @@ 9 0 + com.tangem.data.LogFileProvider Can\'t create CoinEngine! diff --git a/app/src/release/res/values/strings.xml b/app/src/tangemAccess/res/values/strings.xml similarity index 56% rename from app/src/release/res/values/strings.xml rename to app/src/tangemAccess/res/values/strings.xml index 0b18bb17aa..7999593bc8 100644 --- a/app/src/release/res/values/strings.xml +++ b/app/src/tangemAccess/res/values/strings.xml @@ -2,6 +2,5 @@ Tangem Access - com.tangem.data.LogFileProvider \ No newline at end of file diff --git a/app/src/tangemCardano/res/values/strings.xml b/app/src/tangemCardano/res/values/strings.xml new file mode 100644 index 0000000000..7086e50661 --- /dev/null +++ b/app/src/tangemCardano/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + Cardano + + \ No newline at end of file