From 028133a2c62e9e349d0d765f6e4b0858d6a32441 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 16:56:02 +0300 Subject: [PATCH 1/3] Updated on 2026-08-14 --- .idea/codeStyles/codeStyleConfig.xml | 5 + app/src/main/res/layout/activity_logo.xml | 134 +++++++++--------- app/src/main/res/layout/fr_verify_card.xml | 4 +- app/src/main/res/values/strings.xml | 2 +- .../tangem/card_common/data/Manufacturer.java | 6 +- 5 files changed, 78 insertions(+), 73 deletions(-) create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000000..a55e7a179b --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_logo.xml b/app/src/main/res/layout/activity_logo.xml index cf3bb0afc9..7c7e1de15a 100644 --- a/app/src/main/res/layout/activity_logo.xml +++ b/app/src/main/res/layout/activity_logo.xml @@ -1,68 +1,68 @@ - - - - - - - - - - + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fr_verify_card.xml b/app/src/main/res/layout/fr_verify_card.xml index d7a6e84a44..5df73b15e4 100644 --- a/app/src/main/res/layout/fr_verify_card.xml +++ b/app/src/main/res/layout/fr_verify_card.xml @@ -93,7 +93,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/smart_cash_ag" + android:text="@string/tangem_ag" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_medium" android:textStyle="normal|bold" /> @@ -317,7 +317,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:fontFamily="@font/maax" - android:text="@string/smart_cash_ag" + android:text="@string/tangem_ag" android:textColor="@color/primary_dark" android:textSize="@dimen/text_size_medium" android:textStyle="normal|bold" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 35a6a77e84..9d013d2f3b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -40,7 +40,7 @@ Amount BTC Scan again to verify the card - Smart Cash AG + Tangem AG Wallet Scan again to verify the card READING… diff --git a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java b/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java index ac1db1094c..680a3f3fb5 100644 --- a/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java +++ b/card-common/src/main/java/com/tangem/card_common/data/Manufacturer.java @@ -7,9 +7,9 @@ package com.tangem.card_common.data; public enum Manufacturer { Unknown("", "Unknown"), - SMARTCASH_AG("SMART CASH AG", "SMART CASH AG"), - DEVELOPERS_SMARTCASH_AG("DEVELOP CASH AG", "SMART CASH AG (DEVELOPERS)"), - SMARTCASH("SMART CASH", "SMART CASH"); + SMARTCASH_AG("SMART CASH AG", "TANGEM AG"), + DEVELOPERS_SMARTCASH_AG("DEVELOP CASH AG", "TANGEM AG (DEVELOPERS)"), + SMARTCASH("SMART CASH", "TANGEM"); private String ID; private String officialName; From 1f24cc73cd5605817ac64ada9889cefae665856f Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 18:17:02 +0300 Subject: [PATCH 2/3] Updated on 2026-08-14 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index a75b0ef2c6..1c56bd651c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -36,8 +36,8 @@ android { flavorDimensions "" productFlavors { tangemAccess { - versionCode 109 - versionName "0.905.1." + generateVersionName() + versionCode 110 + versionName "0.906.1." + generateVersionName() applicationId "com.tangem.wallet" signingConfig signingConfigs.debug } From 7b08cb337bc139d835001f11a60e1bf46aab05a4 Mon Sep 17 00:00:00 2001 From: Tangem Date: Wed, 5 Jun 2019 18:18:28 +0300 Subject: [PATCH 3/3] Updated on 2026-08-14 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index a07f7985d1..ba5d47436c 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' }