Merge pull request #2 from wavesplatform/bug-fixing

Bug fixing
wavesplatform · Feb 7, 2018 · eecf814 · eecf814
2 parents 1d3cf8e + 612719f
commit eecf814
Show file tree

Hide file tree

Showing 25 changed files with 819 additions and 150 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,19 +1,20 @@
 apply plugin: 'com.android.application'
-apply plugin: 'me.tatarka.retrolambda'
+//apply plugin: 'me.tatarka.retrolambda'
 apply from: 'environment.gradle'
 apply plugin: 'realm-android'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '25.0.2'
+    buildToolsVersion '26.0.2'
+    flavorDimensions "default"
     dexOptions {
         javaMaxHeapSize "3g"
     }
     defaultConfig {
         applicationId "com.wavesplatform.wallet"
         targetSdkVersion 25
         versionCode 325
-        versionName "1.1.3"
+        versionName "1.1.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         archivesBaseName = "waves-wallet-$versionName"
@@ -94,6 +95,7 @@ ext {
 }
 
 dependencies {
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile "com.android.support:appcompat-v7:$supportVersion"
     compile "com.android.support:recyclerview-v7:$supportVersion"
@@ -103,7 +105,7 @@ dependencies {
     compile "com.android.support:preference-v7:$supportVersion"
     compile "com.android.support:preference-v14:$supportVersion"
     // Enable crash reporting only for release version
-    compile 'com.google.firebase:firebase-database:10.0.0'
+    compile 'com.google.firebase:firebase-database:10.0.1'
     releaseCompile "com.google.firebase:firebase-crash:$googleServicesVersion"
     compile "com.google.firebase:firebase-messaging:$googleServicesVersion"
     compile 'commons-io:commons-io:2.4'
@@ -176,21 +178,34 @@ dependencies {
 buildscript {
     repositories {
         jcenter()
+        google()
     }
 
-    dependencies {
-        classpath 'me.tatarka:gradle-retrolambda:3.4.0'
-    }
+//    dependencies {
+//        classpath 'me.tatarka:gradle-retrolambda:3.4.0'
+//    }
 }
 
 // Required for RetroLambda && CountryPicker
 repositories {
     jcenter()
+    google()
     maven { url "https://jitpack.io" }
+    maven {
+        url 'https://maven.google.com'
+    }
     maven {
         url = "https://oss.sonatype.org/content/repositories/snapshots/"
     }
 }
 
+//allprojects {
+//    respositories {
+//        maven {
+//            url 'https://maven.google.com'
+//        }
+//    }
+//}
+
 // This must remain at the bottom of this file until Google work out a better way to do this
 apply plugin: 'com.google.gms.google-services'
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -87,7 +87,6 @@
 
 # Specific to Blockchain
 -keep class android.support.design.widget.NavigationView { *; }
--keep class com.wavesplatform.wallet.ui.customviews.AnimatedPasswordInputLayout { *; }
 
 # Retrolambda
 -dontwarn java.lang.invoke.*

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -4,132 +4,111 @@
     package="com.wavesplatform.wallet"
     android:installLocation="auto">
 
+    <uses-sdk tools:overrideLibrary="com.mtramin.rxfingerprint" />
+
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.CAMERA" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
 
-    <uses-sdk tools:overrideLibrary="com.mtramin.rxfingerprint" />
-
     <application
         android:name=".BlockchainApplication"
         android:allowBackup="false"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config">
-
+        android:networkSecurityConfig="@xml/network_security_config"
+        android:theme="@style/AppTheme">
         <activity
             android:name=".ui.launcher.LauncherActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleTask">
-
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
-
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <data android:scheme="waves" />
 
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
             </intent-filter>
         </activity>
-
         <activity
             android:name=".ui.home.MainActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:theme="@style/AppTheme.MainActivity"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.dex.markets.add.AddMarketActivity"
-            android:configChanges="keyboardHidden|orientation|screenSize"/>
-
+            android:configChanges="keyboardHidden|orientation|screenSize" />
         <activity
             android:name=".ui.auth.PinEntryActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.dex.markets.MarketsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.auth.LandingActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.pairing.ImportOrCreateWalletActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.auth.PasswordWalletActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.auth.SeedWalletActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.auth.ChooseWalletActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="adjustResize" />
-
         <activity
             android:name=".ui.assets.AssetsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.backup.BackupWalletActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.auth.LogoutActivity"
             android:excludeFromRecents="true"
             android:noHistory="true"
             android:theme="@android:style/Theme.NoDisplay" />
-
         <activity
             android:name=".ui.zxing.CaptureActivity"
             android:configChanges="keyboardHidden|orientation|screenSize" />
-
         <activity
             android:name=".ui.transactions.TransactionDetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".ui.assets.IssueAssetsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
-            android:windowSoftInputMode="adjustResize"/>
-
+            android:windowSoftInputMode="adjustResize" />
         <activity
             android:name=".ui.transactions.IssueDetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".ui.transactions.ReissueDetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".ui.transactions.UnknownDetailActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".ui.dex.details.DexDetailsActivity"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:windowSoftInputMode="stateHidden" />
-
         <activity
             android:name=".ui.dex.details.order.PlaceOrderActivity"
             android:windowSoftInputMode="stateHidden" />
@@ -148,6 +127,7 @@
                 android:resource="@xml/provider_paths" />
         </provider>
 
+        <activity android:name=".ui.transactions.ExchangeTransactionActivity"></activity>
     </application>
 
-</manifest>
+</manifest>
diff --git a/app/src/main/java/com/wavesplatform/wallet/injection/DataManagerComponent.java b/app/src/main/java/com/wavesplatform/wallet/injection/DataManagerComponent.java
@@ -1,6 +1,7 @@
 package com.wavesplatform.wallet.injection;
 
 import com.wavesplatform.wallet.data.datamanagers.AddressBookManager;
+import com.wavesplatform.wallet.payload.ExchangeTransaction;
 import com.wavesplatform.wallet.ui.assets.IssueViewModel;
 import com.wavesplatform.wallet.ui.auth.LandingViewModel;
 import com.wavesplatform.wallet.ui.auth.PinEntryViewModel;
@@ -20,6 +21,7 @@
 import com.wavesplatform.wallet.ui.dex.details.order.PlaceOrderViewModel;
 import com.wavesplatform.wallet.ui.receive.ReceiveViewModel;
 import com.wavesplatform.wallet.ui.send.SendViewModel;
+import com.wavesplatform.wallet.ui.transactions.ExchangeTransactionDetailViewModel;
 import com.wavesplatform.wallet.ui.transactions.IssueDetailViewModel;
 import com.wavesplatform.wallet.ui.transactions.ReissueDetailViewModel;
 import com.wavesplatform.wallet.ui.transactions.TransactionDetailViewModel;
@@ -74,6 +76,8 @@ public interface DataManagerComponent {
 
     void inject(ReissueDetailViewModel reissueDetailViewModel);
 
+    void inject(ExchangeTransactionDetailViewModel exchangeTransactionDetailViewModel);
+
     void inject(UnknownDetailViewModel unknownDetailViewModel);
 
     void inject(PlaceOrderViewModel placeOrderViewModel);