diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index f5952dda1b..1257b1e56c 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/app/build.gradle b/app/build.gradle index c7f95c1e96..c60a3b80f4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,15 +8,23 @@ android { applicationId "com.tangem.wallet" minSdkVersion 23 targetSdkVersion 27 - versionCode 1 + versionCode 26 versionName "0.85.5.831.dev" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { release { + debuggable false minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug + } + debug { + debuggable true + minifyEnabled false +// applicationIdSuffix ".debug" + signingConfig signingConfigs.debug } } @@ -29,7 +37,6 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support:design:27.1.1' implementation 'com.android.support:support-compat:27.1.1' @@ -40,11 +47,11 @@ dependencies { implementation 'com.google.dagger:dagger:2.13' implementation 'com.madgag.spongycastle:core:1.56.0.0' implementation 'com.madgag.spongycastle:prov:1.56.0.0' + implementation 'com.scottyab:rootbeer-lib:0.0.6' + implementation 'com.skyfishjy.ripplebackground:library:1.0.1' implementation 'org.bitcoinj:bitcoinj-parent:0.14.4' implementation 'org.bitcoinj:bitcoinj-core:0.14.4' implementation 'me.dm7.barcodescanner:zxing:1.9.8' - implementation 'com.scottyab:rootbeer-lib:0.0.6' - implementation 'com.skyfishjy.ripplebackground:library:1.0.1' implementation 'info.hoang8f:android-segmented:1.0.6' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.2' diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml new file mode 100644 index 0000000000..3012451cdf --- /dev/null +++ b/app/src/debug/res/values/strings.xml @@ -0,0 +1,6 @@ + + + + Tangem Access DEV + + \ No newline at end of file diff --git a/app/src/main/java/com/tangem/LogFileProvider.java b/app/src/main/java/com/tangem/LogFileProvider.java index 8a0a3efd35..27ca312499 100644 --- a/app/src/main/java/com/tangem/LogFileProvider.java +++ b/app/src/main/java/com/tangem/LogFileProvider.java @@ -20,7 +20,7 @@ public class LogFileProvider extends ContentProvider { private static final String CLASS_NAME = "LogFileProvider"; // The authority is the symbolic name for the provider class - public static final String AUTHORITY = "com.tangem.wallet.LogFileProvider"; + public static final String AUTHORITY = "com.tangem.LogFileProvider"; // UriMatcher used to match against incoming requests private UriMatcher uriMatcher; diff --git a/app/src/main/res/layout/activity_card_info.xml b/app/src/main/res/layout/activity_card_info.xml index 228a73d245..434e6a4a2c 100644 --- a/app/src/main/res/layout/activity_card_info.xml +++ b/app/src/main/res/layout/activity_card_info.xml @@ -1,12 +1,13 @@ - + tools:context="com.tangem.presentation.activity.CardInfoActivity"> - - - - - - + + + + + + + android:layout_height="wrap_content"/> @@ -36,14 +37,14 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - app:layout_behavior="@string/appbar_scrolling_view_behavior" /> + app:layout_behavior="@string/appbar_scrolling_view_behavior"/> - - - - - - + + + + + + diff --git a/app/src/main/res/layout/activity_confirm_payment.xml b/app/src/main/res/layout/activity_confirm_payment.xml index d0085c2bf7..5270149e44 100644 --- a/app/src/main/res/layout/activity_confirm_payment.xml +++ b/app/src/main/res/layout/activity_confirm_payment.xml @@ -1,10 +1,11 @@ - + tools:context="com.tangem.presentation.activity.ConfirmPaymentActivity"> + app:layout_constraintTop_toTopOf="parent"/> + android:textSize="@dimen/font_normal"/> + android:textStyle="bold"/> + android:textSize="@dimen/font_normal"/> + android:textStyle="bold"/> + android:textSize="14dp"/> @@ -117,7 +118,7 @@ android:textSize="@dimen/font_normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> + android:textStyle="bold"/> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintLeft_toRightOf="@+id/textView3"/> @@ -195,7 +196,7 @@ app:layout_constraintHorizontal_bias="0.0" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toLeftOf="@+id/tvCurrency" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> @@ -253,7 +254,7 @@ android:textSize="@dimen/font_normal" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent"/> @@ -292,16 +293,16 @@ + android:id="@+id/rgFee" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:checkedButton="@+id/rbNormalFee" + android:gravity="center" + android:orientation="horizontal" + app:sc_border_width="2dp" + app:sc_corner_radius="10dp" + app:sc_tint_color="@color/colorPrimary"> + android:textSize="18dp"/> + android:textSize="18dp"/> + android:textSize="18dp"/> @@ -356,7 +357,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintWidth_min="150dp" /> + app:layout_constraintWidth_min="150dp"/> + app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent"/> @@ -404,7 +405,7 @@ android:textSize="@dimen/font_large" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" - app:layout_constraintRight_toRightOf="parent" /> + app:layout_constraintRight_toRightOf="parent"/> + app:layout_constraintTop_toTopOf="@+id/llFee"/> diff --git a/app/src/main/res/layout/activity_create_new_wallet.xml b/app/src/main/res/layout/activity_create_new_wallet.xml index 7cd072630e..8ab3b402d4 100644 --- a/app/src/main/res/layout/activity_create_new_wallet.xml +++ b/app/src/main/res/layout/activity_create_new_wallet.xml @@ -1,16 +1,17 @@ - + tools:context="com.tangem.presentation.activity.CreateNewWalletActivity"> + + android:orientation="vertical"> + android:textSize="@dimen/font_normal"/> + android:textSize="@dimen/font_large"/> + android:textSize="@dimen/font_normal"/> + - - + app:layout_constraintBottom_toBottomOf="parent"/> diff --git a/app/src/main/res/layout/activity_empty_wallet.xml b/app/src/main/res/layout/activity_empty_wallet.xml index 5d4d38702f..b5aab69e59 100644 --- a/app/src/main/res/layout/activity_empty_wallet.xml +++ b/app/src/main/res/layout/activity_empty_wallet.xml @@ -1,5 +1,6 @@ - + tools:context="com.tangem.presentation.activity.EmptyWalletActivity"> + android:layout_marginBottom="20dp" + android:layout_marginTop="20dp"> + android:textAlignment="center" + android:textSize="@dimen/empty_wallet_font_normal"/>