agorise/crystal-wallet-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: agorise:bfe65ac1a7223d6145250edd878e49e978cc3a50
Branches Tags
agorise:master
agorise:develop
agorise:feat_androidx_migration
..
compare: agorise:be8dce818e27dbbf5aeca2e5e225435a4ae0794b
Branches Tags
agorise:develop
agorise:master
agorise:feat_androidx_migration

3 commits
bfe65ac1a7 ... be8dce818e

Author SHA1 Message Date
Severiano Jaramillo
be8dce818e Rearrange Gradle libraries. 2018-11-29 20:17:25 -06:00
Severiano Jaramillo
e2f3761a82 Migrate Crystal's theme to the new MaterialComponents style. Also update all buttons in the app to use the new MaterialButton. 2018-11-29 13:14:45 -06:00
Severiano Jaramillo
37ace257bd Migrate app to AndroidX and solve a bunch of conflicts. 2018-11-29 12:20:25 -06:00
168 changed files with 1002 additions and 1256 deletions
Show stats Expand all files Collapse all files

50
app/build.gradle
View file

@ -14,6 +14,7 @@ kapt {
repositories { repositories {
mavenCentral() mavenCentral()
maven { url 'https://maven.google.com' } maven { url 'https://maven.google.com' }
maven { url "https://jitpack.io" }
} }
android { android {
@ -24,7 +25,7 @@ android {
targetSdkVersion 28 targetSdkVersion 28
versionCode 5 versionCode 5
versionName "0.5M.alpha" versionName "0.5M.alpha"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables { vectorDrawables {
useSupportLibrary true useSupportLibrary true
} }
@ -54,12 +55,20 @@ android {
exclude 'lib/x86_64/freebsd/libscrypt.so' exclude 'lib/x86_64/freebsd/libscrypt.so'
exclude 'lib/x86_64/linux/libscrypt.so' exclude 'lib/x86_64/linux/libscrypt.so'
} }
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
} }
dependencies { dependencies {
def lifecycle_version = "2.0.0"
def room_version = "2.1.0-alpha02"
def paging_version = "2.1.0-beta01"
implementation fileTree(dir: 'libs', include: ['*.jar']) implementation fileTree(dir: 'libs', include: ['*.jar'])
//androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { //androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { androidTestImplementation('androidx.test.espresso:espresso-core:3.1.1-alpha01', {
exclude group: 'com.android.support', module: 'support-annotations' exclude group: 'com.android.support', module: 'support-annotations'
}) })
implementation( 'com.github.thekhaeng:pushdown-anim-click:1.1.1' ){ implementation( 'com.github.thekhaeng:pushdown-anim-click:1.1.1' ){
@ -67,40 +76,37 @@ dependencies {
} }
implementation 'com.jaredrummler:material-spinner:1.2.5' implementation 'com.jaredrummler:material-spinner:1.2.5'
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
//testCompile 'com.android.support.test:runner:1.0.1'
implementation 'com.afollestad.material-dialogs:core:0.9.6.0' implementation 'com.afollestad.material-dialogs:core:0.9.6.0'
implementation 'com.android.support:appcompat-v7:28.0.0' implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'com.android.support:support-v4:28.0.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.android.support:design:28.0.0' implementation 'com.google.android.material:material:1.1.0-alpha01'
implementation 'com.android.support:cardview-v7:28.0.0' implementation 'androidx.cardview:cardview:1.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3' implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
implementation 'android.arch.lifecycle:runtime:1.1.1'
implementation 'android.arch.lifecycle:extensions:1.1.1'
implementation 'android.arch.paging:runtime:1.0.1'
implementation 'com.idescout.sql:sqlscout-server:2.0' implementation 'com.idescout.sql:sqlscout-server:2.0'
implementation 'com.google.code.gson:gson:2.8.4' implementation 'com.google.code.gson:gson:2.8.4'
implementation 'com.squareup.retrofit2:retrofit:2.2.0' implementation 'com.squareup.retrofit2:retrofit:2.2.0'
implementation 'com.squareup.retrofit2:converter-gson:2.1.0' implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
implementation 'org.bitcoinj:bitcoinj-core:0.14.3' implementation 'org.bitcoinj:bitcoinj-core:0.14.3'
implementation 'com.neovisionaries:nv-websocket-client:1.30' implementation 'com.neovisionaries:nv-websocket-client:1.30'
implementation 'com.jakewharton:butterknife:8.8.1'
implementation 'com.github.bilthon:graphenej:0.4.6' implementation 'com.github.bilthon:graphenej:0.4.6'
implementation 'me.dm7.barcodescanner:zxing:1.9.8' implementation 'me.dm7.barcodescanner:zxing:1.9.8'
implementation 'com.github.sjaramillo10:AnimatedTabLayout:1.0.3' // Fix errors related to AndroidX and ButterKnife incompatibility
implementation 'com.jakewharton:butterknife:9.0.0-SNAPSHOT'
kapt 'com.jakewharton:butterknife-compiler:9.0.0-SNAPSHOT'
implementation 'com.github.sjaramillo10:AnimatedTabLayout:1.1.0'
implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0' implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0'
implementation 'de.hdodenhof:circleimageview:2.2.0' implementation 'de.hdodenhof:circleimageview:2.2.0'
//testCompile 'junit:junit: 4.12' implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
testImplementation 'org.mockito:mockito-core:2.19.0' kapt "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
implementation 'android.arch.persistence.room:runtime:1.1.1'
kapt 'android.arch.persistence.room:runtime:1.1.1' implementation "androidx.room:room-runtime:$room_version"
kapt 'android.arch.persistence.room:compiler:1.1.1' kapt "androidx.room:room-compiler:$room_version"
kapt 'android.arch.lifecycle:compiler:1.1.1' implementation "androidx.paging:paging-runtime:$paging_version"
kapt 'com.jakewharton:butterknife-compiler:8.8.1'
implementation 'com.github.esafirm.android-image-picker:imagepicker:1.11.1' implementation 'com.github.esafirm.android-image-picker:imagepicker:1.11.1'
implementation 'id.zelory:compressor:2.1.0' implementation 'id.zelory:compressor:2.1.0'
@ -122,5 +128,9 @@ dependencies {
implementation 'com.google.zxing:core:3.3.1' implementation 'com.google.zxing:core:3.3.1'
implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar'
testImplementation 'org.testng:testng:6.9.6' testImplementation 'org.testng:testng:6.9.6'
testImplementation 'org.mockito:mockito-core:2.19.0'
//testCompile 'junit:junit: 4.12'
//testCompile 'com.android.support.test:runner:1.0.1'
} }

6
app/src/androidTest/java/cy/agorise/crystalwallet/Assertions/RecyclerViewItemsCountAssertion.java
View file

@ -1,8 +1,8 @@
package cy.agorise.crystalwallet.Assertions; package cy.agorise.crystalwallet.Assertions;
import android.support.test.espresso.NoMatchingViewException; import androidx.test.espresso.NoMatchingViewException;
import android.support.test.espresso.ViewAssertion; import androidx.test.espresso.ViewAssertion;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.View; import android.view.View;
import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.MatcherAssert.assertThat;

11
app/src/androidTest/java/cy/agorise/crystalwallet/TransactionListTest.java
View file

@ -6,20 +6,19 @@ import org.junit.Rule;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import android.support.test.InstrumentationRegistry; import androidx.test.InstrumentationRegistry;
import android.support.test.rule.ActivityTestRule; import androidx.test.rule.ActivityTestRule;
import android.support.test.runner.AndroidJUnit4; import androidx.test.runner.AndroidJUnit4;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.Assertions.RecyclerViewItemsCountAssertion; import cy.agorise.crystalwallet.Assertions.RecyclerViewItemsCountAssertion;
import cy.agorise.crystalwallet.activities.IntroActivity; import cy.agorise.crystalwallet.activities.IntroActivity;
import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCoinTransaction; import cy.agorise.crystalwallet.models.CryptoCoinTransaction;
import static android.support.test.espresso.Espresso.onView; import static androidx.test.espresso.Espresso.onView;
import static android.support.test.espresso.matcher.ViewMatchers.withId; import static androidx.test.espresso.matcher.ViewMatchers.withId;
/** /**

26
app/src/main/java/cy/agorise/crystalwallet/activities/AccountSeedSettingsActivity.java
View file

@ -1,17 +1,17 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@ -22,14 +22,10 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.fragments.BitsharesSettingsFragment;
import cy.agorise.crystalwallet.fragments.GeneralAccountSeedCoinSettingsFragment; import cy.agorise.crystalwallet.fragments.GeneralAccountSeedCoinSettingsFragment;
import cy.agorise.crystalwallet.fragments.GeneralAccountSeedFragment; import cy.agorise.crystalwallet.fragments.GeneralAccountSeedFragment;
import cy.agorise.crystalwallet.fragments.GeneralCryptoNetAccountSettingsFragment;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel; import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountViewModel;
/** /**
* Created by henry varona on 10/29/18. * Created by henry varona on 10/29/18.

9
app/src/main/java/cy/agorise/crystalwallet/activities/AccountSeedsManagementActivity.java
View file

@ -1,11 +1,11 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.widget.Button; import android.widget.Button;
import java.util.List; import java.util.List;
@ -14,7 +14,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.viewmodels.AccountSeedListViewModel; import cy.agorise.crystalwallet.viewmodels.AccountSeedListViewModel;
import cy.agorise.crystalwallet.views.AccountSeedListView; import cy.agorise.crystalwallet.views.AccountSeedListView;

18
app/src/main/java/cy/agorise/crystalwallet/activities/AccountSettingsActivity.java
View file

@ -1,16 +1,14 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.media.MediaPlayer;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;

26
app/src/main/java/cy/agorise/crystalwallet/activities/AccountsActivity.java
View file

@ -1,34 +1,27 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.Activity; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.Observer;
import android.arch.lifecycle.Observer; import androidx.lifecycle.ViewModelProviders;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.Intent; import android.content.Intent;
import android.content.pm.ResolveInfo;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.FileObserver; import android.os.FileObserver;
import android.os.Parcelable;
import android.provider.MediaStore; import androidx.annotation.Nullable;
import android.support.annotation.Nullable; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.design.widget.FloatingActionButton; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.esafirm.imagepicker.features.ImagePicker; import com.esafirm.imagepicker.features.ImagePicker;
import com.esafirm.imagepicker.model.Image; import com.esafirm.imagepicker.model.Image;
import com.thekhaeng.pushdownanim.PushDownAnim; import com.thekhaeng.pushdownanim.PushDownAnim;
//import com.nicdahlquist.pngquant.LibPngQuant;
import java.io.File; import java.io.File;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.List; import java.util.List;
import butterknife.BindView; import butterknife.BindView;
@ -36,16 +29,13 @@ import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.viewmodels.AccountSeedListViewModel; import cy.agorise.crystalwallet.viewmodels.AccountSeedListViewModel;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountListViewModel;
import cy.agorise.crystalwallet.views.AccountSeedListView; import cy.agorise.crystalwallet.views.AccountSeedListView;
import cy.agorise.crystalwallet.views.CryptoNetAccountListView;
import de.hdodenhof.circleimageview.CircleImageView; import de.hdodenhof.circleimageview.CircleImageView;
import id.zelory.compressor.Compressor; import id.zelory.compressor.Compressor;
/** /**
* Created by xd on 1/9/18. * Created by Seven on 1/9/18.
* *
*/ */

11
app/src/main/java/cy/agorise/crystalwallet/activities/BackupSeedActivity.java
View file

@ -1,15 +1,15 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.Button; import android.widget.Button;
@ -22,7 +22,6 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel; import cy.agorise.crystalwallet.viewmodels.AccountSeedViewModel;

18
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View file

@ -1,7 +1,7 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.ActivityOptions; import android.app.ActivityOptions;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.Intent; import android.content.Intent;
@ -9,14 +9,14 @@ import android.content.res.Resources;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory; import android.graphics.BitmapFactory;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.util.Pair; import android.util.Pair;
import android.view.View; import android.view.View;
import android.view.animation.LinearInterpolator; import android.view.animation.LinearInterpolator;

18
app/src/main/java/cy/agorise/crystalwallet/activities/CreateContactActivity.java
View file

@ -1,15 +1,15 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.TextInputEditText; import com.google.android.material.textfield.TextInputEditText;
import android.support.design.widget.TextInputLayout; import com.google.android.material.textfield.TextInputLayout;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;

2
app/src/main/java/cy/agorise/crystalwallet/activities/CreateSeedActivity.kt
View file

@ -3,7 +3,7 @@ package cy.agorise.crystalwallet.activities
import android.content.Context import android.content.Context
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.support.design.widget.TextInputEditText import com.google.android.material.textfield.TextInputEditText
import android.text.Editable import android.text.Editable
import android.text.TextWatcher import android.text.TextWatcher
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager

8
app/src/main/java/cy/agorise/crystalwallet/activities/CryptoCoinTransactionReceiptActivity.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.widget.TextView; import android.widget.TextView;
import java.text.SimpleDateFormat; import java.text.SimpleDateFormat;

31
app/src/main/java/cy/agorise/crystalwallet/activities/CryptoNetAccountSettingsActivity.java
View file

@ -1,20 +1,19 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.media.MediaPlayer;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
@ -25,12 +24,8 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.fragments.BackupsSettingsFragment;
import cy.agorise.crystalwallet.fragments.BitsharesSettingsFragment; import cy.agorise.crystalwallet.fragments.BitsharesSettingsFragment;
import cy.agorise.crystalwallet.fragments.CryptoNetAccountActivationSettingsFragment;
import cy.agorise.crystalwallet.fragments.GeneralCryptoNetAccountSettingsFragment; import cy.agorise.crystalwallet.fragments.GeneralCryptoNetAccountSettingsFragment;
import cy.agorise.crystalwallet.fragments.GeneralSettingsFragment;
import cy.agorise.crystalwallet.fragments.SecuritySettingsFragment;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountViewModel; import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountViewModel;

2
app/src/main/java/cy/agorise/crystalwallet/activities/CustomActivity.kt
View file

@ -2,7 +2,7 @@ package cy.agorise.crystalwallet.activities
import android.app.Activity import android.app.Activity
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import cy.agorise.crystalwallet.util.FieldsValidator import cy.agorise.crystalwallet.util.FieldsValidator
/* /*

20
app/src/main/java/cy/agorise/crystalwallet/activities/GeneralSettingsActivity.java
View file

@ -1,17 +1,13 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView;
import com.google.common.collect.BiMap;
import com.google.common.collect.HashBiMap;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -24,14 +20,8 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnItemSelected; import butterknife.OnItemSelected;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCoinBalance;
import cy.agorise.crystalwallet.models.CryptoCurrency;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.models.GrapheneAccount;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel; import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
import cy.agorise.crystalwallet.views.CryptoCurrencyAdapter;
public class GeneralSettingsActivity extends AppCompatActivity { public class GeneralSettingsActivity extends AppCompatActivity {

4
app/src/main/java/cy/agorise/crystalwallet/activities/ImportSeedActivity.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.Activity; import android.app.Activity;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.Editable; import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.View; import android.view.View;

6
app/src/main/java/cy/agorise/crystalwallet/activities/IntroActivity.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.ImageView; import android.widget.ImageView;

11
app/src/main/java/cy/agorise/crystalwallet/activities/LicenseActivity.java
View file

@ -2,8 +2,8 @@ package cy.agorise.crystalwallet.activities;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.view.View; import android.view.View;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.Button; import android.widget.Button;
@ -14,17 +14,14 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.application.CrystalApplication;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.enums.CryptoNet;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.network.CryptoNetManager;
public class LicenseActivity extends AppCompatActivity { public class LicenseActivity extends AppCompatActivity {
@BindView(R.id.wvEULA) WebView wvEULA; @BindView(R.id.wvEULA) WebView wvEULA;
@BindView(R.id.btnDisAgree) @BindView(R.id.btnDisagree)
Button btnDisAgree; Button btnDisAgree;
@BindView(R.id.btnAgree) @BindView(R.id.btnAgree)
@ -94,7 +91,7 @@ public class LicenseActivity extends AppCompatActivity {
finish(); finish();
} }
@OnClick(R.id.btnDisAgree) @OnClick(R.id.btnDisagree)
public void onDisagree() { public void onDisagree() {
finish(); finish();
} }

14
app/src/main/java/cy/agorise/crystalwallet/activities/PatternRequestActivity.java
View file

@ -1,16 +1,15 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.Activity; import android.app.Activity;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.Editable;
import android.view.View; import android.view.View;
import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import com.andrognito.patternlockview.PatternLockView; import com.andrognito.patternlockview.PatternLockView;
@ -22,7 +21,6 @@ import java.util.TimerTask;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnTextChanged;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor; import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
//import cy.agorise.crystalwallet.interfaces.OnResponse; //import cy.agorise.crystalwallet.interfaces.OnResponse;

18
app/src/main/java/cy/agorise/crystalwallet/activities/PinRequestActivity.java
View file

@ -1,21 +1,18 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.Activity; import android.app.Activity;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.Editable; import android.text.Editable;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import org.jetbrains.annotations.NotNull;
import java.util.List; import java.util.List;
import java.util.Timer; import java.util.Timer;
@ -27,12 +24,7 @@ import butterknife.OnClick;
import butterknife.OnTextChanged; import butterknife.OnTextChanged;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor; import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
import cy.agorise.crystalwallet.dialogs.material.NegativeResponse;
import cy.agorise.crystalwallet.dialogs.material.PositiveResponse;
import cy.agorise.crystalwallet.dialogs.material.QuestionDialog;
import cy.agorise.crystalwallet.interfaces.OnResponse; import cy.agorise.crystalwallet.interfaces.OnResponse;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.util.PasswordManager; import cy.agorise.crystalwallet.util.PasswordManager;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel; import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;

25
app/src/main/java/cy/agorise/crystalwallet/activities/PocketRequestActivity.java
View file

@ -1,9 +1,9 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.PendingIntent; import android.app.PendingIntent;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
@ -12,35 +12,20 @@ import android.nfc.tech.IsoDep;
import android.nfc.tech.MifareClassic; import android.nfc.tech.MifareClassic;
import android.nfc.tech.NdefFormatable; import android.nfc.tech.NdefFormatable;
import android.nfc.tech.NfcA; import android.nfc.tech.NfcA;
import android.nfc.tech.NfcF;
import android.nfc.tech.NfcV;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
import android.widget.Toast; import android.widget.Toast;
import com.andrognito.patternlockview.PatternLockView;
import com.andrognito.patternlockview.listener.PatternLockViewListener;
import org.apache.commons.codec.binary.Base32;
import java.io.IOException; import java.io.IOException;
import java.math.BigInteger;
import java.nio.ByteBuffer; import java.nio.ByteBuffer;
import java.util.List;
import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor; import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.util.PasswordManager; import cy.agorise.crystalwallet.util.PasswordManager;
import cy.agorise.crystalwallet.util.yubikey.Algorithm;
import cy.agorise.crystalwallet.util.yubikey.OathType;
import cy.agorise.crystalwallet.util.yubikey.TOTP;
import cy.agorise.crystalwallet.util.yubikey.YkOathApi; import cy.agorise.crystalwallet.util.yubikey.YkOathApi;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
public class PocketRequestActivity extends AppCompatActivity { public class PocketRequestActivity extends AppCompatActivity {

8
app/src/main/java/cy/agorise/crystalwallet/activities/ReceiveTransactionActivity.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.widget.TextView; import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;

14
app/src/main/java/cy/agorise/crystalwallet/activities/SendTransactionActivity.java
View file

@ -1,20 +1,16 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.app.Activity; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.Observer;
import android.arch.lifecycle.Observer;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.text.Editable; import android.text.Editable;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText; import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.jaredrummler.materialspinner.MaterialSpinner;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

16
app/src/main/java/cy/agorise/crystalwallet/activities/SettingsActivity.java
View file

@ -1,16 +1,14 @@
package cy.agorise.crystalwallet.activities; package cy.agorise.crystalwallet.activities;
import android.content.Intent; import android.content.Intent;
import android.media.MediaPlayer;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentStatePagerAdapter; import androidx.fragment.app.FragmentStatePagerAdapter;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.support.v7.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.support.v7.widget.Toolbar; import androidx.appcompat.widget.Toolbar;
import android.view.SurfaceHolder;
import android.view.SurfaceView;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;

11
app/src/main/java/cy/agorise/crystalwallet/application/CrystalSecurityMonitor.java
View file

@ -3,23 +3,16 @@ package cy.agorise.crystalwallet.application;
import android.app.Activity; import android.app.Activity;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.ViewModelProviders;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.fragment.app.FragmentActivity;
import android.support.v4.app.FragmentActivity;
import java.util.List;
import cy.agorise.crystalwallet.activities.PatternRequestActivity; import cy.agorise.crystalwallet.activities.PatternRequestActivity;
import cy.agorise.crystalwallet.activities.PinRequestActivity; import cy.agorise.crystalwallet.activities.PinRequestActivity;
import cy.agorise.crystalwallet.activities.PocketRequestActivity; import cy.agorise.crystalwallet.activities.PocketRequestActivity;
import cy.agorise.crystalwallet.fragments.PatternSecurityFragment;
import cy.agorise.crystalwallet.interfaces.OnResponse; import cy.agorise.crystalwallet.interfaces.OnResponse;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.notifiers.CrystalWalletNotifier;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel; import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
/** /**

12
app/src/main/java/cy/agorise/crystalwallet/dao/AccountSeedDao.java
View file

@ -1,16 +1,14 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.MutableLiveData; import androidx.room.Dao;
import android.arch.persistence.room.Dao; import androidx.room.Insert;
import android.arch.persistence.room.Insert; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.Query;
import android.arch.persistence.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetBalance;
/** /**
* Created by Henry Varona on 10/9/2017. * Created by Henry Varona on 10/9/2017.

12
app/src/main/java/cy/agorise/crystalwallet/dao/BitcoinAddressDao.java
View file

@ -1,14 +1,12 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import cy.agorise.crystalwallet.models.BitcoinAddress; import cy.agorise.crystalwallet.models.BitcoinAddress;
import cy.agorise.crystalwallet.models.BitcoinTransaction;
import cy.agorise.crystalwallet.models.BitcoinTransactionExtended;
/** /**
* Created by Henry Varona on 10/17/2018. * Created by Henry Varona on 10/17/2018.

10
app/src/main/java/cy/agorise/crystalwallet/dao/BitcoinTransactionDao.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;

11
app/src/main/java/cy/agorise/crystalwallet/dao/BitsharesAccountNameCacheDao.java
View file

@ -1,15 +1,14 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.BitsharesAccountNameCache; import cy.agorise.crystalwallet.models.BitsharesAccountNameCache;
import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
/** /**
* Created by Henry Varona on 6/15/2018. * Created by Henry Varona on 6/15/2018.

10
app/src/main/java/cy/agorise/crystalwallet/dao/BitsharesAssetDao.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;

18
app/src/main/java/cy/agorise/crystalwallet/dao/ContactDao.java
View file

@ -1,20 +1,18 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.DataSource; import androidx.paging.DataSource;
import android.arch.paging.LivePagedListProvider; import androidx.room.Dao;
import android.arch.persistence.room.Dao; import androidx.room.Delete;
import android.arch.persistence.room.Delete; import androidx.room.Insert;
import android.arch.persistence.room.Insert; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.Query;
import android.arch.persistence.room.Query; import androidx.room.Update;
import android.arch.persistence.room.Update;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.Contact; import cy.agorise.crystalwallet.models.Contact;
import cy.agorise.crystalwallet.models.ContactAddress; import cy.agorise.crystalwallet.models.ContactAddress;
import cy.agorise.crystalwallet.models.CryptoCoinTransaction;
/** /**
* Created by Henry Varona on 1/17/2018. * Created by Henry Varona on 1/17/2018.

12
app/src/main/java/cy/agorise/crystalwallet/dao/CryptoCoinBalanceDao.java
View file

@ -1,17 +1,15 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.CryptoCoinBalance; import cy.agorise.crystalwallet.models.CryptoCoinBalance;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.CryptoNetBalance; import cy.agorise.crystalwallet.models.CryptoNetBalance;
import cy.agorise.crystalwallet.enums.CryptoNet;
/** /**
* Created by Henry Varona on 10/9/2017. * Created by Henry Varona on 10/9/2017.

10
app/src/main/java/cy/agorise/crystalwallet/dao/CryptoCurrencyDao.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;

11
app/src/main/java/cy/agorise/crystalwallet/dao/CryptoCurrencyEquivalenceDao.java
View file

@ -1,14 +1,13 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.CryptoCurrency;
import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence; import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence;
/** /**

13
app/src/main/java/cy/agorise/crystalwallet/dao/CryptoNetAccountDao.java
View file

@ -1,17 +1,14 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoCoinBalance;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.CryptoNetBalance;
/** /**
* Created by Henry Varona on 10/9/2017. * Created by Henry Varona on 10/9/2017.

12
app/src/main/java/cy/agorise/crystalwallet/dao/CrystalDatabase.java
View file

@ -1,11 +1,11 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.persistence.db.SupportSQLiteDatabase; import androidx.sqlite.db.SupportSQLiteDatabase;
import android.arch.persistence.room.Database; import androidx.room.Database;
import android.arch.persistence.room.Room; import androidx.room.Room;
import android.arch.persistence.room.RoomDatabase; import androidx.room.RoomDatabase;
import android.arch.persistence.room.TypeConverters; import androidx.room.TypeConverters;
import android.arch.persistence.room.migration.Migration; import androidx.room.migration.Migration;
import android.content.Context; import android.content.Context;
import cy.agorise.crystalwallet.dao.converters.Converters; import cy.agorise.crystalwallet.dao.converters.Converters;

13
app/src/main/java/cy/agorise/crystalwallet/dao/GeneralSettingDao.java
View file

@ -1,15 +1,14 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Delete; import androidx.room.Delete;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
/** /**

12
app/src/main/java/cy/agorise/crystalwallet/dao/GrapheneAccountInfoDao.java
View file

@ -1,15 +1,13 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.persistence.room.Dao; import androidx.room.Dao;
import android.arch.persistence.room.Insert; import androidx.room.Insert;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.Query; import androidx.room.Query;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GrapheneAccount;
import cy.agorise.crystalwallet.models.GrapheneAccountInfo; import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
/** /**

13
app/src/main/java/cy/agorise/crystalwallet/dao/TransactionDao.java
View file

@ -1,12 +1,11 @@
package cy.agorise.crystalwallet.dao; package cy.agorise.crystalwallet.dao;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.DataSource; import androidx.paging.DataSource;
import android.arch.paging.LivePagedListProvider; import androidx.room.Dao;
import android.arch.persistence.room.Dao; import androidx.room.Insert;
import android.arch.persistence.room.Insert; import androidx.room.OnConflictStrategy;
import android.arch.persistence.room.OnConflictStrategy; import androidx.room.Query;
import android.arch.persistence.room.Query;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;

4
app/src/main/java/cy/agorise/crystalwallet/dao/converters/Converters.java
View file

@ -1,6 +1,6 @@
package cy.agorise.crystalwallet.dao.converters; package cy.agorise.crystalwallet.dao.converters;
import android.arch.persistence.room.TypeConverter; import androidx.room.TypeConverter;
import java.util.Date; import java.util.Date;
@ -10,8 +10,6 @@ import cy.agorise.crystalwallet.enums.SeedType;
import cy.agorise.crystalwallet.models.BitsharesAsset; import cy.agorise.crystalwallet.models.BitsharesAsset;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
import static cy.agorise.crystalwallet.R.string.account;
/** /**
* Created by Henry Varona on 13/9/2017. * Created by Henry Varona on 13/9/2017.
*/ */

10
app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsFragment.java
View file

@ -2,24 +2,20 @@ package cy.agorise.crystalwallet.fragments;
import android.app.Dialog; import android.app.Dialog;
import android.content.Intent; import android.content.Intent;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.GeneralSettingsActivity;
import cy.agorise.crystalwallet.activities.SettingsActivity; import cy.agorise.crystalwallet.activities.SettingsActivity;
public class AccountsFragment extends DialogFragment { public class AccountsFragment extends DialogFragment {

2
app/src/main/java/cy/agorise/crystalwallet/fragments/AccountsSettingsFragment.java
View file

@ -1,7 +1,7 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.view.LayoutInflater; import android.view.LayoutInflater;

24
app/src/main/java/cy/agorise/crystalwallet/fragments/BackupsSettingsFragment.java
View file

@ -1,18 +1,17 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.Manifest; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.Observer;
import android.arch.lifecycle.Observer;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.text.Spannable; import android.text.Spannable;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
import android.util.Log; import android.util.Log;
@ -25,26 +24,19 @@ import android.widget.Toast;
import com.thekhaeng.pushdownanim.PushDownAnim; import com.thekhaeng.pushdownanim.PushDownAnim;
import java.io.File;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.BackupSeedActivity; import cy.agorise.crystalwallet.activities.BackupSeedActivity;
import cy.agorise.crystalwallet.activities.IntroActivity;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.requestmanagers.CreateBackupRequest; import cy.agorise.crystalwallet.requestmanagers.CreateBackupRequest;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequest;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener; import cy.agorise.crystalwallet.requestmanagers.FileServiceRequestListener;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests; import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
/** /**
* Created by xd on 1/11/18. * Created by Seven on 1/11/18.
*/ */
public class BackupsSettingsFragment extends Fragment{ public class BackupsSettingsFragment extends Fragment{

14
app/src/main/java/cy/agorise/crystalwallet/fragments/BalanceFragment.java
View file

@ -1,13 +1,13 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

31
app/src/main/java/cy/agorise/crystalwallet/fragments/BitsharesSettingsFragment.java
View file

@ -1,45 +1,26 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.fragment.app.Fragment;
import android.support.v4.app.Fragment;
import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.thekhaeng.pushdownanim.PushDownAnim; import com.thekhaeng.pushdownanim.PushDownAnim;
import com.vincent.filepicker.Constant;
import com.vincent.filepicker.activity.AudioPickActivity;
import com.vincent.filepicker.filter.entity.AudioFile;
import java.io.File;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Currency;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.OnItemSelected;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.enums.Language;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.models.GrapheneAccount; import cy.agorise.crystalwallet.models.GrapheneAccount;
@ -48,10 +29,6 @@ import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests; import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
import cy.agorise.crystalwallet.requestmanagers.ValidateBitsharesLTMUpgradeRequest; import cy.agorise.crystalwallet.requestmanagers.ValidateBitsharesLTMUpgradeRequest;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel; import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
import cy.agorise.crystalwallet.views.TimeZoneAdapter;
import static android.app.Activity.RESULT_OK;
import static com.vincent.filepicker.activity.AudioPickActivity.IS_NEED_RECORDER;
/** /**

20
app/src/main/java/cy/agorise/crystalwallet/fragments/ContactSelectionFragment.java
View file

@ -1,18 +1,18 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Dialog; import android.app.Dialog;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.arch.paging.PagedList; import androidx.paging.PagedList;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

20
app/src/main/java/cy/agorise/crystalwallet/fragments/ContactsFragment.java
View file

@ -1,16 +1,16 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.arch.paging.PagedList; import androidx.paging.PagedList;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

2
app/src/main/java/cy/agorise/crystalwallet/fragments/CryptoNetAccountActivationSettingsFragment.java
View file

@ -5,7 +5,7 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

6
app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralAccountSeedCoinSettingsFragment.java
View file

@ -1,9 +1,9 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

3
app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralAccountSeedFragment.java
View file

@ -5,7 +5,7 @@ import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -21,7 +21,6 @@ import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
/** /**

7
app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralCryptoNetAccountSettingsFragment.java
View file

@ -1,12 +1,11 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Activity; import android.app.Activity;
import android.arch.lifecycle.LiveData;
import android.content.ClipData; import android.content.ClipData;
import android.content.ClipboardManager; import android.content.ClipboardManager;
import android.content.Context; import android.content.Context;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -16,8 +15,6 @@ import android.widget.Toast;
import com.thekhaeng.pushdownanim.PushDownAnim; import com.thekhaeng.pushdownanim.PushDownAnim;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
@ -25,8 +22,6 @@ import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
/** /**

17
app/src/main/java/cy/agorise/crystalwallet/fragments/GeneralSettingsFragment.java
View file

@ -1,22 +1,20 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Intent; import android.content.Intent;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.content.res.Resources; import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.ThemedSpinnerAdapter;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.EditText;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
@ -27,28 +25,23 @@ import com.vincent.filepicker.filter.entity.AudioFile;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections; import java.util.Collections;
import java.util.Currency; import java.util.Currency;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.OnItemSelected; import butterknife.OnItemSelected;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.enums.Language; import cy.agorise.crystalwallet.enums.Language;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel; import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
import cy.agorise.crystalwallet.views.TimeZoneAdapter; import cy.agorise.crystalwallet.views.TimeZoneAdapter;
import static android.app.Activity.RESULT_OK; import static android.app.Activity.RESULT_OK;
import static android.content.Context.CONSUMER_IR_SERVICE;
import static com.vincent.filepicker.activity.AudioPickActivity.IS_NEED_RECORDER; import static com.vincent.filepicker.activity.AudioPickActivity.IS_NEED_RECORDER;

17
app/src/main/java/cy/agorise/crystalwallet/fragments/ImportAccountOptionsFragment.java
View file

@ -2,23 +2,21 @@ package cy.agorise.crystalwallet.fragments;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
import android.graphics.PorterDuff;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v4.app.FragmentActivity; import androidx.fragment.app.FragmentActivity;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.Window; import android.view.Window;
@ -34,7 +32,6 @@ import java.net.URISyntaxException;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import butterknife.OnTouch;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.BoardActivity; import cy.agorise.crystalwallet.activities.BoardActivity;
import cy.agorise.crystalwallet.activities.ImportSeedActivity; import cy.agorise.crystalwallet.activities.ImportSeedActivity;

4
app/src/main/java/cy/agorise/crystalwallet/fragments/MerchantsFragment.java
View file

@ -1,8 +1,8 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

13
app/src/main/java/cy/agorise/crystalwallet/fragments/NoneSecurityFragment.java
View file

@ -1,12 +1,7 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.fragment.app.Fragment;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -15,21 +10,15 @@ import android.widget.Toast;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.List;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick; import butterknife.OnClick;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.activities.BoardActivity;
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor; import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
import cy.agorise.crystalwallet.dialogs.material.DialogMaterial; import cy.agorise.crystalwallet.dialogs.material.DialogMaterial;
import cy.agorise.crystalwallet.dialogs.material.NegativeResponse; import cy.agorise.crystalwallet.dialogs.material.NegativeResponse;
import cy.agorise.crystalwallet.dialogs.material.PositiveResponse; import cy.agorise.crystalwallet.dialogs.material.PositiveResponse;
import cy.agorise.crystalwallet.dialogs.material.QuestionDialog; import cy.agorise.crystalwallet.dialogs.material.QuestionDialog;
import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
import cy.agorise.crystalwallet.viewmodels.validators.PinSecurityValidator;
/** /**
* Created by xd on 1/18/18. * Created by xd on 1/18/18.

21
app/src/main/java/cy/agorise/crystalwallet/fragments/PatternSecurityFragment.java
View file

@ -1,21 +1,13 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Activity;
import android.arch.lifecycle.LiveData;
import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
import android.graphics.Color; import android.graphics.Color;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.Nullable; import androidx.fragment.app.Fragment;
import android.support.v4.app.Fragment;
import android.text.Editable;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.EditText;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.andrognito.patternlockview.PatternLockView; import com.andrognito.patternlockview.PatternLockView;
import com.andrognito.patternlockview.listener.PatternLockViewListener; import com.andrognito.patternlockview.listener.PatternLockViewListener;
@ -26,19 +18,10 @@ import java.util.TimerTask;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnTextChanged;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.application.CrystalSecurityMonitor; import cy.agorise.crystalwallet.application.CrystalSecurityMonitor;
import cy.agorise.crystalwallet.dialogs.material.CrystalDialog;
import cy.agorise.crystalwallet.interfaces.OnResponse;
import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
import cy.agorise.crystalwallet.util.ChildViewPager; import cy.agorise.crystalwallet.util.ChildViewPager;
import cy.agorise.crystalwallet.util.PasswordManager; import cy.agorise.crystalwallet.util.PasswordManager;
import cy.agorise.crystalwallet.viewmodels.GeneralSettingListViewModel;
import cy.agorise.crystalwallet.viewmodels.validators.PinSecurityValidator;
import cy.agorise.crystalwallet.viewmodels.validators.UIValidatorListener;
import cy.agorise.crystalwallet.viewmodels.validators.validationfields.ValidationField;
/** /**
* Created by xd on 1/18/18. * Created by xd on 1/18/18.

8
app/src/main/java/cy/agorise/crystalwallet/fragments/PinSecurityFragment.java
View file

@ -1,12 +1,10 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Activity; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.ViewModelProviders;
import android.arch.lifecycle.ViewModelProviders;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.text.Editable; import android.text.Editable;
import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

9
app/src/main/java/cy/agorise/crystalwallet/fragments/ProfileSettingsFragment.java
View file

@ -1,10 +1,9 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter;
import android.text.Editable; import android.text.Editable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
@ -13,10 +12,8 @@ import android.widget.EditText;
import butterknife.BindView; import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import butterknife.OnClick;
import butterknife.OnTextChanged; import butterknife.OnTextChanged;
import cy.agorise.crystalwallet.R; import cy.agorise.crystalwallet.R;
import cy.agorise.crystalwallet.util.ChildViewPager;
/** /**
* Created by henry varona on 4/17/18. * Created by henry varona on 4/17/18.

18
app/src/main/java/cy/agorise/crystalwallet/fragments/ReceiveTransactionFragment.java
View file

@ -1,9 +1,9 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.app.Dialog; import android.app.Dialog;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.DialogInterface; import android.content.DialogInterface;
@ -12,11 +12,11 @@ import android.graphics.BitmapFactory;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -30,7 +30,6 @@ import android.widget.ImageView;
import android.widget.ProgressBar; import android.widget.ProgressBar;
import android.widget.Spinner; import android.widget.Spinner;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
import com.google.zxing.BarcodeFormat; import com.google.zxing.BarcodeFormat;
import com.google.zxing.MultiFormatWriter; import com.google.zxing.MultiFormatWriter;
@ -44,7 +43,6 @@ import cy.agorise.crystalwallet.enums.CryptoNet;
import cy.agorise.crystalwallet.requestmanagers.CalculateBitcoinUriRequest; import cy.agorise.crystalwallet.requestmanagers.CalculateBitcoinUriRequest;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener; import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequestListener;
import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests; import cy.agorise.crystalwallet.requestmanagers.CryptoNetInfoRequests;
import cy.agorise.crystalwallet.requestmanagers.NextBitcoinAccountAddressRequest;
import cy.agorise.crystalwallet.util.CircularImageView; import cy.agorise.crystalwallet.util.CircularImageView;
import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountListViewModel; import cy.agorise.crystalwallet.viewmodels.CryptoNetAccountListViewModel;
import cy.agorise.crystalwallet.views.CryptoNetAccountAdapter; import cy.agorise.crystalwallet.views.CryptoNetAccountAdapter;

11
app/src/main/java/cy/agorise/crystalwallet/fragments/SecuritySettingsFragment.java
View file

@ -6,14 +6,11 @@ import android.content.IntentFilter;
import android.nfc.NfcAdapter; import android.nfc.NfcAdapter;
import android.nfc.Tag; import android.nfc.Tag;
import android.nfc.tech.IsoDep; import android.nfc.tech.IsoDep;
import android.nfc.tech.MifareClassic;
import android.nfc.tech.NdefFormatable;
import android.nfc.tech.NfcA;
import android.os.Bundle; import android.os.Bundle;
import android.support.design.widget.TabLayout; import com.google.android.material.tabs.TabLayout;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentManager; import androidx.fragment.app.FragmentManager;
import android.support.v4.app.FragmentPagerAdapter; import androidx.fragment.app.FragmentPagerAdapter;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

30
app/src/main/java/cy/agorise/crystalwallet/fragments/SendTransactionFragment.java
View file

@ -3,9 +3,9 @@ package cy.agorise.crystalwallet.fragments;
import android.Manifest; import android.Manifest;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.content.Context; import android.content.Context;
import android.content.ContextWrapper; import android.content.ContextWrapper;
import android.content.Intent; import android.content.Intent;
@ -15,15 +15,15 @@ import android.graphics.BitmapFactory;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v4.app.ActivityCompat; import androidx.core.app.ActivityCompat;
import android.support.v4.app.DialogFragment; import androidx.fragment.app.DialogFragment;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v4.app.FragmentTransaction; import androidx.fragment.app.FragmentTransaction;
import android.support.v4.content.ContextCompat; import androidx.core.content.ContextCompat;
import android.support.v7.app.AlertDialog; import androidx.appcompat.app.AlertDialog;
import android.text.Editable; import android.text.Editable;
import android.util.Log; import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
@ -45,6 +45,8 @@ import java.math.RoundingMode;
import java.text.DecimalFormat; import java.text.DecimalFormat;
import java.text.DecimalFormatSymbols; import java.text.DecimalFormatSymbols;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
@ -83,8 +85,6 @@ import cy.agorise.graphenej.Invoice;
import cy.agorise.graphenej.LineItem; import cy.agorise.graphenej.LineItem;
import me.dm7.barcodescanner.zxing.ZXingScannerView; import me.dm7.barcodescanner.zxing.ZXingScannerView;
import static butterknife.internal.Utils.listOf;
public class SendTransactionFragment extends DialogFragment implements UIValidatorListener, ZXingScannerView.ResultHandler { public class SendTransactionFragment extends DialogFragment implements UIValidatorListener, ZXingScannerView.ResultHandler {
private final String TAG = getClass().getName(); private final String TAG = getClass().getName();
@ -617,7 +617,7 @@ public class SendTransactionFragment extends DialogFragment implements UIValidat
public void beginScanQrCode(){ public void beginScanQrCode(){
//mScannerView = new ZXingScannerView(getContext()); //mScannerView = new ZXingScannerView(getContext());
mScannerView.setFormats(listOf(BarcodeFormat.QR_CODE)); mScannerView.setFormats(Collections.singletonList(BarcodeFormat.QR_CODE));
mScannerView.setAspectTolerance(0.5f); mScannerView.setAspectTolerance(0.5f);
mScannerView.setAutoFocus(true); mScannerView.setAutoFocus(true);
mScannerView.setLaserColor(R.color.colorAccent); mScannerView.setLaserColor(R.color.colorAccent);

20
app/src/main/java/cy/agorise/crystalwallet/fragments/TransactionsFragment.java
View file

@ -1,16 +1,16 @@
package cy.agorise.crystalwallet.fragments; package cy.agorise.crystalwallet.fragments;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders; import androidx.lifecycle.ViewModelProviders;
import android.arch.paging.PagedList; import androidx.paging.PagedList;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.design.widget.FloatingActionButton; import com.google.android.material.floatingactionbutton.FloatingActionButton;
import android.support.v4.app.Fragment; import androidx.fragment.app.Fragment;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.text.Editable; import android.text.Editable;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;

11
app/src/main/java/cy/agorise/crystalwallet/models/AccountSeed.java
View file

@ -1,13 +1,12 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.accounts.Account; import androidx.room.ColumnInfo;
import android.arch.persistence.room.ColumnInfo; import androidx.room.Entity;
import android.arch.persistence.room.Entity; import androidx.room.PrimaryKey;
import android.arch.persistence.room.PrimaryKey;
import android.content.Context; import android.content.Context;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import org.bitcoinj.core.Base58; import org.bitcoinj.core.Base58;
import org.bitcoinj.core.ECKey; import org.bitcoinj.core.ECKey;

8
app/src/main/java/cy/agorise/crystalwallet/models/BitcoinAddress.java
View file

@ -1,9 +1,9 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
/** /**
* Represents a Bitcoin derivated address * Represents a Bitcoin derivated address

14
app/src/main/java/cy/agorise/crystalwallet/models/BitcoinTransaction.java
View file

@ -1,15 +1,9 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Ignore; import androidx.annotation.NonNull;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import android.support.v7.util.DiffUtil;
import java.util.Date;
/** /**
* Represents a Bitcoin alike Transaction * Represents a Bitcoin alike Transaction

7
app/src/main/java/cy/agorise/crystalwallet/models/BitcoinTransactionExtended.java
View file

@ -1,10 +1,7 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.Embedded;
import android.arch.persistence.room.Embedded; import androidx.room.Relation;
import android.arch.persistence.room.Entity;
import android.arch.persistence.room.ForeignKey;
import android.arch.persistence.room.Relation;
import java.util.List; import java.util.List;

6
app/src/main/java/cy/agorise/crystalwallet/models/BitcoinTransactionGTxIO.java
View file

@ -1,8 +1,8 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
/** /**
* Represents a Bitcoin alike Transaction Inputs and Outputs * Represents a Bitcoin alike Transaction Inputs and Outputs

12
app/src/main/java/cy/agorise/crystalwallet/models/BitsharesAccountNameCache.java
View file

@ -1,12 +1,12 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
/** /**
* Represents a cache of a Bitshares Account name * Represents a cache of a Bitshares Account name

8
app/src/main/java/cy/agorise/crystalwallet/models/BitsharesAssetInfo.java
View file

@ -1,9 +1,9 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.TypeConverters; import androidx.room.TypeConverters;
import cy.agorise.crystalwallet.dao.converters.Converters; import cy.agorise.crystalwallet.dao.converters.Converters;

15
app/src/main/java/cy/agorise/crystalwallet/models/Contact.java
View file

@ -1,14 +1,13 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.Ignore;
import android.arch.persistence.room.Ignore; import androidx.room.Index;
import android.arch.persistence.room.Index; import androidx.room.PrimaryKey;
import android.arch.persistence.room.PrimaryKey; import androidx.annotation.NonNull;
import android.support.annotation.NonNull; import androidx.recyclerview.widget.DiffUtil;
import android.support.v7.util.DiffUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

12
app/src/main/java/cy/agorise/crystalwallet/models/ContactAddress.java
View file

@ -1,12 +1,12 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;

16
app/src/main/java/cy/agorise/crystalwallet/models/CryptoCoinBalance.java
View file

@ -1,15 +1,13 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import cy.agorise.crystalwallet.enums.CryptoCoin;
/** /**
* Represents a balance of a specific asset from a CryptoNet * Represents a balance of a specific asset from a CryptoNet

18
app/src/main/java/cy/agorise/crystalwallet/models/CryptoCoinTransaction.java
View file

@ -1,18 +1,16 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import java.util.Date; import java.util.Date;
import cy.agorise.crystalwallet.enums.CryptoCoin;
/** /**
* Represents a generic CryptoNet Transaction * Represents a generic CryptoNet Transaction
* *

14
app/src/main/java/cy/agorise/crystalwallet/models/CryptoCoinTransactionExtended.java
View file

@ -1,14 +1,10 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Embedded; import androidx.room.Embedded;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.annotation.NonNull;
import android.arch.persistence.room.Ignore; import androidx.recyclerview.widget.DiffUtil;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import android.support.v7.util.DiffUtil;
import java.util.Date; import java.util.Date;

10
app/src/main/java/cy/agorise/crystalwallet/models/CryptoCurrency.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.arch.persistence.room.TypeConverters; import androidx.room.TypeConverters;
import cy.agorise.crystalwallet.dao.converters.Converters; import cy.agorise.crystalwallet.dao.converters.Converters;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;

10
app/src/main/java/cy/agorise/crystalwallet/models/CryptoCurrencyEquivalence.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import java.util.Date; import java.util.Date;

16
app/src/main/java/cy/agorise/crystalwallet/models/CryptoNetAccount.java
View file

@ -1,14 +1,14 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Ignore; import androidx.room.Ignore;
import android.arch.persistence.room.Index; import androidx.room.Index;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;

16
app/src/main/java/cy/agorise/crystalwallet/models/CryptoNetBalance.java
View file

@ -1,21 +1,13 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.annotation.NonNull;
import android.arch.persistence.room.Ignore; import androidx.recyclerview.widget.DiffUtil;
import android.arch.persistence.room.Index;
import android.arch.persistence.room.PrimaryKey;
import android.support.annotation.NonNull;
import android.support.v7.util.DiffUtil;
import cy.agorise.crystalwallet.enums.CryptoCoin;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;
import static android.arch.persistence.room.ColumnInfo.INTEGER;
/** /**
* Created by Henry Varona on 6/9/2017. * Created by Henry Varona on 6/9/2017.
* *

4
app/src/main/java/cy/agorise/crystalwallet/models/CryptoNetSelection.java
View file

@ -1,7 +1,7 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;

12
app/src/main/java/cy/agorise/crystalwallet/models/GeneralSetting.java
View file

@ -1,13 +1,11 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.PrimaryKey; import androidx.room.PrimaryKey;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import android.support.v7.util.DiffUtil; import androidx.recyclerview.widget.DiffUtil;
import cy.agorise.crystalwallet.enums.SeedType;
/** /**
* Created by Henry Varona on 6/11/2017. * Created by Henry Varona on 6/11/2017.

7
app/src/main/java/cy/agorise/crystalwallet/models/GrapheneAccountInfo.java
View file

@ -1,9 +1,8 @@
package cy.agorise.crystalwallet.models; package cy.agorise.crystalwallet.models;
import android.arch.persistence.room.ColumnInfo; import androidx.room.ColumnInfo;
import android.arch.persistence.room.Entity; import androidx.room.Entity;
import android.arch.persistence.room.ForeignKey; import androidx.room.ForeignKey;
import android.arch.persistence.room.Index;
/** /**
* This represents the additional info of a bitshares account * This represents the additional info of a bitshares account

3
app/src/main/java/cy/agorise/crystalwallet/network/CryptoNetManager.java
View file

@ -1,9 +1,8 @@
package cy.agorise.crystalwallet.network; package cy.agorise.crystalwallet.network;
import android.support.annotation.NonNull; import androidx.annotation.NonNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;

198
app/src/main/java/cy/agorise/crystalwallet/service/CrystalWalletService.java
View file

@ -1,21 +1,20 @@
package cy.agorise.crystalwallet.service; package cy.agorise.crystalwallet.service;
import android.arch.lifecycle.LifecycleService; import androidx.lifecycle.LifecycleService;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.lifecycle.Observer; import androidx.lifecycle.Observer;
import android.content.Intent; import android.content.Intent;
import android.os.Handler; import android.os.Handler;
import android.os.IBinder; import android.os.IBinder;
import android.os.Looper; import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.util.Log; import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.apigenerator.GrapheneApiGenerator;
import cy.agorise.crystalwallet.enums.CryptoCoin; import cy.agorise.crystalwallet.enums.CryptoCoin;
import cy.agorise.crystalwallet.manager.FileBackupManager; import cy.agorise.crystalwallet.manager.FileBackupManager;
import cy.agorise.crystalwallet.manager.GeneralAccountManager; import cy.agorise.crystalwallet.manager.GeneralAccountManager;
@ -31,7 +30,6 @@ import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
import cy.agorise.crystalwallet.models.GrapheneAccount; import cy.agorise.crystalwallet.models.GrapheneAccount;
import cy.agorise.crystalwallet.models.GrapheneAccountInfo; import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequest;
import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests; import cy.agorise.crystalwallet.requestmanagers.FileServiceRequests;
import cy.agorise.crystalwallet.requestmanagers.GetBitsharesAccountNameCacheRequest; import cy.agorise.crystalwallet.requestmanagers.GetBitsharesAccountNameCacheRequest;
@ -71,80 +69,81 @@ public class CrystalWalletService extends LifecycleService {
} }
} }
// TODO Uncomment
public void loadBitsharesAccountNames(){ public void loadBitsharesAccountNames(){
final LifecycleService service = this; // final LifecycleService service = this;
final LiveData<List<BitsharesAccountNameCache>> uncachedBitsharesAccountNames = // final LiveData<List<BitsharesAccountNameCache>> uncachedBitsharesAccountNames =
CrystalDatabase.getAppDatabase(service).bitsharesAccountNameCacheDao().getUncachedBitsharesAccountName(); // CrystalDatabase.getAppDatabase(service).bitsharesAccountNameCacheDao().getUncachedBitsharesAccountName();
//
uncachedBitsharesAccountNames.observe(service, new Observer<List<BitsharesAccountNameCache>>() { // uncachedBitsharesAccountNames.observe(service, new Observer<List<BitsharesAccountNameCache>>() {
@Override // @Override
public void onChanged(@Nullable List<BitsharesAccountNameCache> bitsharesAccountNameCacheList) { // public void onChanged(@Nullable List<BitsharesAccountNameCache> bitsharesAccountNameCacheList) {
for (BitsharesAccountNameCache nextAccountId : bitsharesAccountNameCacheList){ // for (BitsharesAccountNameCache nextAccountId : bitsharesAccountNameCacheList){
GetBitsharesAccountNameCacheRequest request = new GetBitsharesAccountNameCacheRequest(service, nextAccountId.getAccountId()); // GetBitsharesAccountNameCacheRequest request = new GetBitsharesAccountNameCacheRequest(service, nextAccountId.getAccountId());
//
CryptoNetInfoRequests.getInstance().addRequest(request); // CryptoNetInfoRequests.getInstance().addRequest(request);
} // }
} // }
}); // });
} }
public void loadEquivalentsValues(){ public void loadEquivalentsValues(){
this.keepLoadingEquivalences = true; this.keepLoadingEquivalences = true;
final LifecycleService service = this; final LifecycleService service = this;
//getting the preferred currency of the user // TODO Uncomment
final LiveData<GeneralSetting> preferredCurrencySetting = // //getting the preferred currency of the user
CrystalDatabase.getAppDatabase(service).generalSettingDao().getByName(GeneralSetting.SETTING_NAME_PREFERRED_CURRENCY); // final LiveData<GeneralSetting> preferredCurrencySetting =
// CrystalDatabase.getAppDatabase(service).generalSettingDao().getByName(GeneralSetting.SETTING_NAME_PREFERRED_CURRENCY);
preferredCurrencySetting.observe(service, new Observer<GeneralSetting>() { //
@Override // preferredCurrencySetting.observe(service, new Observer<GeneralSetting>() {
public void onChanged(final @Nullable GeneralSetting generalSetting) { // @Override
if (generalSetting != null) { // public void onChanged(final @Nullable GeneralSetting generalSetting) {
CryptoCurrency preferredCurrency = CrystalDatabase.getAppDatabase(service).cryptoCurrencyDao().getByNameAndCryptoNet("EUR", CryptoNet.BITSHARES.name()); // if (generalSetting != null) {
// CryptoCurrency preferredCurrency = CrystalDatabase.getAppDatabase(service).cryptoCurrencyDao().getByNameAndCryptoNet("EUR", CryptoNet.BITSHARES.name());
if (preferredCurrency != null) { //
BitsharesAssetInfo preferredCurrencyBitsharesInfo = CrystalDatabase.getAppDatabase(service).bitsharesAssetDao().getBitsharesAssetInfoFromCurrencyId(preferredCurrency.getId()); // if (preferredCurrency != null) {
// BitsharesAssetInfo preferredCurrencyBitsharesInfo = CrystalDatabase.getAppDatabase(service).bitsharesAssetDao().getBitsharesAssetInfoFromCurrencyId(preferredCurrency.getId());
if (preferredCurrencyBitsharesInfo != null) { //
final BitsharesAsset preferredCurrencyBitshareAsset = new BitsharesAsset(preferredCurrency); // if (preferredCurrencyBitsharesInfo != null) {
preferredCurrencyBitshareAsset.loadInfo(preferredCurrencyBitsharesInfo); // final BitsharesAsset preferredCurrencyBitshareAsset = new BitsharesAsset(preferredCurrency);
// preferredCurrencyBitshareAsset.loadInfo(preferredCurrencyBitsharesInfo);
//Loading "from" currencies //
final LiveData<List<BitsharesAssetInfo>> bitsharesAssetInfo = // //Loading "from" currencies
CrystalDatabase.getAppDatabase(service).bitsharesAssetDao().getAll(); // final LiveData<List<BitsharesAssetInfo>> bitsharesAssetInfo =
// CrystalDatabase.getAppDatabase(service).bitsharesAssetDao().getAll();
bitsharesAssetInfo.observe(service, new Observer<List<BitsharesAssetInfo>>() { //
@Override // bitsharesAssetInfo.observe(service, new Observer<List<BitsharesAssetInfo>>() {
public void onChanged(@Nullable List<BitsharesAssetInfo> bitsharesAssetInfos) { // @Override
List<BitsharesAsset> bitsharesAssets = new ArrayList<BitsharesAsset>(); // public void onChanged(@Nullable List<BitsharesAssetInfo> bitsharesAssetInfos) {
List<Long> currenciesIds = new ArrayList<Long>(); // List<BitsharesAsset> bitsharesAssets = new ArrayList<BitsharesAsset>();
for (BitsharesAssetInfo bitsharesAssetInfo : bitsharesAssetInfos) { // List<Long> currenciesIds = new ArrayList<Long>();
currenciesIds.add(bitsharesAssetInfo.getCryptoCurrencyId()); // for (BitsharesAssetInfo bitsharesAssetInfo : bitsharesAssetInfos) {
} // currenciesIds.add(bitsharesAssetInfo.getCryptoCurrencyId());
; // }
List<CryptoCurrency> bitsharesCurrencies = CrystalDatabase.getAppDatabase(service).cryptoCurrencyDao().getByIds(currenciesIds); // List<CryptoCurrency> bitsharesCurrencies = CrystalDatabase.getAppDatabase(service).cryptoCurrencyDao().getByIds(currenciesIds);
//
BitsharesAsset nextAsset; // BitsharesAsset nextAsset;
for (int i = 0; i < bitsharesCurrencies.size(); i++) { // for (int i = 0; i < bitsharesCurrencies.size(); i++) {
CryptoCurrency nextCurrency = bitsharesCurrencies.get(i); // CryptoCurrency nextCurrency = bitsharesCurrencies.get(i);
BitsharesAssetInfo nextBitsharesInfo = bitsharesAssetInfos.get(i); // BitsharesAssetInfo nextBitsharesInfo = bitsharesAssetInfos.get(i);
nextAsset = new BitsharesAsset(nextCurrency); // nextAsset = new BitsharesAsset(nextCurrency);
nextAsset.loadInfo(nextBitsharesInfo); // nextAsset.loadInfo(nextBitsharesInfo);
bitsharesAssets.add(nextAsset); // bitsharesAssets.add(nextAsset);
} // }
//
if (LoadEquivalencesThread != null) { // if (LoadEquivalencesThread != null) {
LoadEquivalencesThread.stopLoadingEquivalences(); // LoadEquivalencesThread.stopLoadingEquivalences();
}; // };
LoadEquivalencesThread = new EquivalencesThread(service, generalSetting.getValue(), bitsharesAssets); // LoadEquivalencesThread = new EquivalencesThread(service, generalSetting.getValue(), bitsharesAssets);
LoadEquivalencesThread.start(); // LoadEquivalencesThread.start();
} // }
}); // });
} // }
} // }
} // }
} // }
}); // });
} }
public void loadAccountTransactions(){ public void loadAccountTransactions(){
@ -152,33 +151,34 @@ public class CrystalWalletService extends LifecycleService {
final CrystalWalletService thisService = this; final CrystalWalletService thisService = this;
final CrystalDatabase db = CrystalDatabase.getAppDatabase(this); final CrystalDatabase db = CrystalDatabase.getAppDatabase(this);
//final LiveData<List<CryptoNetAccount>> cryptoNetAccountList = db.cryptoNetAccountDao().getAll(); // TODO Uncomment
final LiveData<List<GrapheneAccountInfo>> grapheneAccountInfoList = db.grapheneAccountInfoDao().getAll(); // final LiveData<List<GrapheneAccountInfo>> grapheneAccountInfoList = db.grapheneAccountInfoDao().getAll();
grapheneAccountInfoList.observe(this, new Observer<List<GrapheneAccountInfo>>() { // grapheneAccountInfoList.observe(this, new Observer<List<GrapheneAccountInfo>>() {
@Override // @Override
public void onChanged(@Nullable List<GrapheneAccountInfo> grapheneAccountInfos) { // public void onChanged(@Nullable List<GrapheneAccountInfo> grapheneAccountInfos) {
GrapheneAccount nextGrapheneAccount; // GrapheneAccount nextGrapheneAccount;
for(GrapheneAccountInfo nextGrapheneAccountInfo : grapheneAccountInfos) { // for(GrapheneAccountInfo nextGrapheneAccountInfo : grapheneAccountInfos) {
CryptoNetAccount nextAccount = db.cryptoNetAccountDao().getById(nextGrapheneAccountInfo.getCryptoNetAccountId()); // CryptoNetAccount nextAccount = db.cryptoNetAccountDao().getById(nextGrapheneAccountInfo.getCryptoNetAccountId());
//GrapheneAccountInfo grapheneAccountInfo = db.grapheneAccountInfoDao().getByAccountId(nextAccount.getId()); // //GrapheneAccountInfo grapheneAccountInfo = db.grapheneAccountInfoDao().getByAccountId(nextAccount.getId());
nextGrapheneAccount = new GrapheneAccount(nextAccount); // nextGrapheneAccount = new GrapheneAccount(nextAccount);
nextGrapheneAccount.loadInfo(nextGrapheneAccountInfo); // nextGrapheneAccount.loadInfo(nextGrapheneAccountInfo);
//
//
// bitsharesAccountManager.loadAccountFromDB(nextGrapheneAccount,thisService);
// }
// }
// });
// TODO Uncomment
bitsharesAccountManager.loadAccountFromDB(nextGrapheneAccount,thisService); // final LiveData<List<CryptoNetAccount>> cryptoNetAccountList = db.cryptoNetAccountDao().getAllBitcoins();
} // cryptoNetAccountList.observe(this, new Observer<List<CryptoNetAccount>>() {
} // @Override
}); // public void onChanged(@Nullable List<CryptoNetAccount> cryptoNetAccounts) {
// for(CryptoNetAccount nextCryptoNetAccount : cryptoNetAccounts) {
final LiveData<List<CryptoNetAccount>> cryptoNetAccountList = db.cryptoNetAccountDao().getAllBitcoins(); // generalAccountManager.loadAccountFromDB(nextCryptoNetAccount,thisService);
cryptoNetAccountList.observe(this, new Observer<List<CryptoNetAccount>>() { // }
@Override // }
public void onChanged(@Nullable List<CryptoNetAccount> cryptoNetAccounts) { // });
for(CryptoNetAccount nextCryptoNetAccount : cryptoNetAccounts) {
generalAccountManager.loadAccountFromDB(nextCryptoNetAccount,thisService);
}
}
});
/*while(this.keepLoadingAccountTransactions){ /*while(this.keepLoadingAccountTransactions){
try{ try{

2
app/src/main/java/cy/agorise/crystalwallet/service/EquivalencesThread.java
View file

@ -1,6 +1,6 @@
package cy.agorise.crystalwallet.service; package cy.agorise.crystalwallet.service;
import android.arch.lifecycle.LifecycleService; import androidx.lifecycle.LifecycleService;
import android.util.Log; import android.util.Log;
import java.util.ArrayList; import java.util.ArrayList;

2
app/src/main/java/cy/agorise/crystalwallet/util/BottomStatusBar.java
View file

@ -1,7 +1,7 @@
package cy.agorise.crystalwallet.util; package cy.agorise.crystalwallet.util;
import android.content.Context; import android.content.Context;
import android.support.constraint.ConstraintLayout; import androidx.constraintlayout.widget.ConstraintLayout;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.widget.ImageView; import android.widget.ImageView;

12
app/src/main/java/cy/agorise/crystalwallet/util/BounceTouchListener.java
View file

@ -3,12 +3,12 @@ package cy.agorise.crystalwallet.util;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.animation.ValueAnimator; import android.animation.ValueAnimator;
import android.support.annotation.IdRes; import androidx.annotation.IdRes;
import android.support.annotation.Nullable; import androidx.annotation.Nullable;
import android.support.v4.view.MotionEventCompat; import androidx.core.view.MotionEventCompat;
import android.support.v7.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.support.v7.widget.StaggeredGridLayoutManager; import androidx.recyclerview.widget.StaggeredGridLayoutManager;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;

2
app/src/main/java/cy/agorise/crystalwallet/util/ChildViewPager.java
View file

@ -1,7 +1,7 @@
package cy.agorise.crystalwallet.util; package cy.agorise.crystalwallet.util;
import android.content.Context; import android.content.Context;
import android.support.v4.view.ViewPager; import androidx.viewpager.widget.ViewPager;
import android.util.AttributeSet; import android.util.AttributeSet;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.animation.DecelerateInterpolator; import android.view.animation.DecelerateInterpolator;

6
app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedListViewModel.java
View file

@ -1,15 +1,13 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.PagedList;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed; import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoCoinTransaction;
/** /**
* Created by Henry Varona on 27/9/2017. * Created by Henry Varona on 27/9/2017.

4
app/src/main/java/cy/agorise/crystalwallet/viewmodels/AccountSeedViewModel.kt
View file

@ -1,8 +1,8 @@
package cy.agorise.crystalwallet.viewmodels package cy.agorise.crystalwallet.viewmodels
import android.app.Application import android.app.Application
import android.arch.lifecycle.AndroidViewModel import androidx.lifecycle.AndroidViewModel
import android.arch.lifecycle.LiveData import androidx.lifecycle.LiveData
import cy.agorise.crystalwallet.dao.CrystalDatabase import cy.agorise.crystalwallet.dao.CrystalDatabase
import cy.agorise.crystalwallet.models.AccountSeed import cy.agorise.crystalwallet.models.AccountSeed

8
app/src/main/java/cy/agorise/crystalwallet/viewmodels/ContactListViewModel.java
View file

@ -1,10 +1,10 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.LivePagedListBuilder; import androidx.paging.LivePagedListBuilder;
import android.arch.paging.PagedList; import androidx.paging.PagedList;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.enums.CryptoNet; import cy.agorise.crystalwallet.enums.CryptoNet;

5
app/src/main/java/cy/agorise/crystalwallet/viewmodels/ContactViewModel.java
View file

@ -1,9 +1,8 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.PagedList;
import java.util.List; import java.util.List;

6
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoCoinBalanceListViewModel.java
View file

@ -1,15 +1,13 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCoinBalance; import cy.agorise.crystalwallet.models.CryptoCoinBalance;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.CryptoNetBalance;
/** /**
* Created by Henry Varona on 27/9/2017. * Created by Henry Varona on 27/9/2017.

4
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoCurrencyEquivalenceListViewModel.java
View file

@ -1,14 +1,12 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence; import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence;
import cy.agorise.crystalwallet.models.CryptoNetBalance;
/** /**
* Created by Henry Varona on 27/9/2017. * Created by Henry Varona on 27/9/2017.

6
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoCurrencyEquivalenceViewModel.java
View file

@ -1,10 +1,8 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence; import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence;

4
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoCurrencyViewModel.java
View file

@ -1,12 +1,10 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCurrency; import cy.agorise.crystalwallet.models.CryptoCurrency;
import cy.agorise.crystalwallet.models.CryptoCurrencyEquivalence;
/** /**
* Created by Henry Varona on 4/11/2017. * Created by Henry Varona on 4/11/2017.

5
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoNetAccountListViewModel.java
View file

@ -1,13 +1,12 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCoinBalance;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
/** /**

7
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoNetAccountViewModel.java
View file

@ -1,13 +1,10 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetAccount; import cy.agorise.crystalwallet.models.CryptoNetAccount;
/** /**

5
app/src/main/java/cy/agorise/crystalwallet/viewmodels/CryptoNetBalanceListViewModel.java
View file

@ -1,13 +1,12 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.AccountSeed;
import cy.agorise.crystalwallet.models.CryptoNetBalance; import cy.agorise.crystalwallet.models.CryptoNetBalance;
/** /**

6
app/src/main/java/cy/agorise/crystalwallet/viewmodels/GeneralSettingListViewModel.java
View file

@ -1,14 +1,12 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import android.arch.paging.PagedList;
import java.util.List; import java.util.List;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoCoinTransaction;
import cy.agorise.crystalwallet.models.GeneralSetting; import cy.agorise.crystalwallet.models.GeneralSetting;
/** /**

6
app/src/main/java/cy/agorise/crystalwallet/viewmodels/GrapheneAccountInfoViewModel.java
View file

@ -1,12 +1,10 @@
package cy.agorise.crystalwallet.viewmodels; package cy.agorise.crystalwallet.viewmodels;
import android.app.Application; import android.app.Application;
import android.arch.lifecycle.AndroidViewModel; import androidx.lifecycle.AndroidViewModel;
import android.arch.lifecycle.LiveData; import androidx.lifecycle.LiveData;
import cy.agorise.crystalwallet.dao.CrystalDatabase; import cy.agorise.crystalwallet.dao.CrystalDatabase;
import cy.agorise.crystalwallet.models.CryptoNetAccount;
import cy.agorise.crystalwallet.models.GrapheneAccount;
import cy.agorise.crystalwallet.models.GrapheneAccountInfo; import cy.agorise.crystalwallet.models.GrapheneAccountInfo;
/** /**

Some files were not shown because too many files have changed in this diff Show more