Updated on 2026-08-14

This commit is contained in:
Tangem 2019-03-30 14:42:26 +03:00
parent 424c9f8898
commit 8e2f4095c5
13 changed files with 82 additions and 20 deletions

View file

@ -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

View file

@ -0,0 +1,4 @@
package com.tangem;
public class Test {
}

View file

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">DEV</string>
<string name="log_file_provider_authorities">com.tangem.data.LogFileProvider.debug</string>
<string name="app_name">DEBUG</string>
</resources>

View file

@ -29,12 +29,12 @@
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<provider
android:name="com.tangem.data.LogFileProvider"
android:authorities="@string/log_file_provider_authorities"
android:enabled="true"
android:exported="false"
android:grantUriPermissions="true" />
<!--<provider-->
<!--android:name="com.tangem.data.LogFileProvider"-->
<!--android:authorities="@string/log_file_provider_authorities"-->
<!--android:enabled="true"-->
<!--android:exported="false"-->
<!--android:grantUriPermissions="true" />-->
<activity
android:name="com.tangem.ui.activity.LogoActivity"

View file

@ -4,6 +4,9 @@ import android.app.Activity
object Constant {
const val FLAVOR_TANGEM_ACCESS = "tangemAccess"
const val FLAVOR_TANGEM_CARDANO = "tangemCardano"
const val URL_TANGEM = "https://play.google.com/store/apps/details?id=com.tangem.wallet"
const val EXTRA_BLOCKCHAIN_DATA = "BLOCKCHAIN_DATA"

View file

@ -37,7 +37,8 @@ public class LogFileProvider extends ContentProvider {
// 'content://it.my.app.LogFileProvider/*'
// and return 1 in the case that the incoming Uri matches this pattern
uriMatcher.addURI(Objects.requireNonNull(getContext()).getString(R.string.log_file_provider_authorities), "*", 1);
// uriMatcher.addURI(Objects.requireNonNull(getContext()).getString(R.string.log_file_provider_authorities), "*", 1);
// uriMatcher.addURI(Objects.requireNonNull("com.tangem.data.LogFileProvider"), "*", 1);
return true;
}

View file

@ -1,9 +1,9 @@
package com.tangem.ui.activity
import android.annotation.SuppressLint
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.view.View
import androidx.appcompat.app.AppCompatActivity
import com.tangem.App
import com.tangem.Constant
@ -36,14 +36,25 @@ class LogoActivity : AppCompatActivity() {
ivLogo.setOnClickListener { hide() }
}
@SuppressLint("SetTextI18n")
override fun onPostCreate(savedInstanceState: Bundle?) {
super.onPostCreate(savedInstanceState)
// set beta version name
if (BuildConfig.DEBUG)
tvAppVersion.text = "BETA v." + BuildConfig.VERSION_NAME + "\n" + "dev" + "\n" + "build " + BuildConfig.VERSION_CODE
tvAppVersion.text = String.format(getString(R.string.version_name_debug), BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
else
tvAppVersion.text = "BETA v." + BuildConfig.VERSION_NAME
tvAppVersion.text = String.format(getString(R.string.version_name_release), BuildConfig.VERSION_NAME)
// set flavor app name
when (BuildConfig.FLAVOR) {
Constant.FLAVOR_TANGEM_CARDANO -> {
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())

View file

@ -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()
}

View file

@ -7,6 +7,25 @@
tools:context="com.tangem.ui.activity.LogoActivity"
tools:ignore="contentDescription">
<TextView
android:id="@+id/tvExtension"
android:layout_width="wrap_content"
android:layout_height="13dp"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:fontFamily="@font/maax"
android:textAlignment="center"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="@android:color/holo_red_light"
android:textSize="@dimen/text_size_small"
android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivLogo"
tools:text="@string/cardano"
tools:visibility="visible" />
<ImageView
android:id="@+id/ivLogo"
android:layout_width="match_parent"
@ -32,7 +51,7 @@
android:textSize="@dimen/text_size_small"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/ivLogo" />
app:layout_constraintTop_toBottomOf="@+id/tvExtension" />
<TextView
android:layout_width="wrap_content"

View file

@ -7,7 +7,6 @@
<string name="no_connection">No connection with blockchain nodes</string>
<string name="contin">Continue</string>
<string name="not_found">Not found</string>
<!--<string name="wrong_tag_err">Not ISO tag!</string>-->
<string name="msgCardMustBeLoaded">Card must be loaded first!</string>
<string name="tag_lost_err">Tag lost!</string>
<string name="cmd_suffix">command</string>
@ -56,6 +55,7 @@
<string name="load_via_qr">Show QR-code</string>
<string name="show_wallet_qr_code">LOAD</string>
<string name="beta">BETA</string>
<string name="cardano">Cardano</string>
<!-- dialogs -->
<string name="device_is_rooted">Your Android device is rooted. Security at risk!</string>
@ -84,6 +84,12 @@
<string name="reset_pins_to_default">Reset PINs to default</string>
<string name="erase_wallet">Erase wallet</string>
<!-- LogoActivity -->
<string name="version_name_debug">BETA v.%1$s \n dev \n build %2$s</string>
<string name="version_name_release">BETA v.%1$s</string>
<string name="welcome_messages">Hello, %1$s! You have %2$d new messages.</string>
<!-- MainActivity -->
<string name="tap_tangem_card">Tap Tangem card with your smartphone</string>
<string name="scan_banknote">Scan a banknote with your \n %1$s \n as shown above</string>

View file

@ -20,6 +20,7 @@
<string name="_9">9</string>
<string name="_0">0</string>
<string name="log_file_provider_authorities">com.tangem.data.LogFileProvider</string>
<string name="ex_cant_create_coinEngine">Can\'t create CoinEngine!</string>
</resources>

View file

@ -2,6 +2,5 @@
<resources>
<string name="app_name">Tangem Access</string>
<string name="log_file_provider_authorities">com.tangem.data.LogFileProvider</string>
</resources>

View file

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_name">Cardano</string>
</resources>