Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Implement transaction request #21

Merged
merged 24 commits into from
Nov 15, 2018
Merged

Implement transaction request #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
65dc95a
:hammer: Implement clear account cache when logout
Oct 17, 2018
ecf89ea
:sparkles: Add key for keep transaction request formatted_id in the l…
Oct 17, 2018
06355d8
:sparkles: Create a transaction request after login and set primary t…
Oct 17, 2018
3dc9e9a
:sparkles: Listen to transaction consumption finalized
Oct 18, 2018
77ccfda
:hammer: Handle transaction consumption event
Oct 19, 2018
a68d8e6
:sparkles: Add animation to notify balance amount is changed
Oct 20, 2018
3904123
:hammer: Add close button in splash screen
Oct 21, 2018
adb52f6
:wrench: Fix tests
Oct 21, 2018
22a122d
:white_check_mark: Add custom toolbar title assertion
Oct 22, 2018
e0567fd
:hammer: Save `primaryTokenId` in share preference after create a tra…
Oct 22, 2018
3c0dd74
:hammer: Refactor create transaction request logic
Oct 22, 2018
7bd5121
:hammer: Implement prefetch test properly
Oct 22, 2018
bdff6b9
:hammer: Add test verify the primary token is always visible
Oct 22, 2018
6f7430f
:sparkles: Add balance detail test
Oct 22, 2018
8825244
:sparkles: Add consume transaction tests
Oct 23, 2018
4ed640c
:sparkles: Add more tests for consume transaction request
Oct 23, 2018
d9ed1fb
:hammer: Refactor tests
Oct 23, 2018
c868881
:hammer: Refactor transaction request test
Oct 24, 2018
d9ce6cf
:hammer: Stop listening to socket event when logout
Oct 24, 2018
01941ad
:sparkles: Add start screen showing omg logo
Oct 25, 2018
0386f93
:hammer: Fix wrong transaction consumption amount and token display
Oct 25, 2018
367307a
:hammer: Renaming
Oct 25, 2018
9967516
:hammer: Fix wrong amount when consume with the different token
Oct 25, 2018
01ef3d9
:wrench: Fix failed tests
Oct 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .idea/assetWizardSettings.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

77 changes: 45 additions & 32 deletions .idea/navEditor.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())
def clientAPIKey = properties.getProperty('ewallet.apikey')
def clientAPIBaseURL = properties.getProperty('ewallet.baseurl')
def clientAPISocketBaseURL = properties.getProperty('ewallet.socket.baseurl')
def clientEncryptKeyAlias = properties.getProperty('omg.encrypt.keyAlias')
def clientEncryptIV = properties.getProperty('omg.encrypt.iv')
def clientVerificationSignUpPrefix = properties.getProperty('ewallet.verification.signup.prefix')
Expand All @@ -31,6 +32,7 @@ android {
debug {
buildConfigField 'String', "CLIENT_API_KEY", clientAPIKey
buildConfigField 'String', "CLIENT_API_BASE_URL", clientAPIBaseURL
buildConfigField 'String', "CLIENT_API_SOCKET_BASE_URL", clientAPISocketBaseURL
buildConfigField 'String', "CLIENT_ENCRYPT_KEY_ALIAS", clientEncryptKeyAlias
buildConfigField 'String', "CLIENT_ENCRYPT_IV", clientEncryptIV
buildConfigField 'String', "CLIENT_VERIFICATION_SIGNUP_PREFIX", clientVerificationSignUpPrefix
Expand All @@ -40,6 +42,7 @@ android {
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
buildConfigField 'String', "CLIENT_API_KEY", clientAPIKey
buildConfigField 'String', "CLIENT_API_BASE_URL", clientAPIBaseURL
buildConfigField 'String', "CLIENT_API_SOCKET_BASE_URL", clientAPISocketBaseURL
buildConfigField 'String', "CLIENT_ENCRYPT_KEY_ALIAS", clientEncryptKeyAlias
buildConfigField 'String', "CLIENT_ENCRYPT_IV", clientEncryptIV
buildConfigField 'String', "CLIENT_VERIFICATION_SIGNUP_PREFIX", clientVerificationSignUpPrefix
Expand Down Expand Up @@ -105,6 +108,9 @@ dependencies {
implementation firebase.core
implementation firebase.crashlytics

/* Testing */
implementation custom.idlingResource

testImplementation test
androidTestImplementation androidTest
}
Expand Down
14 changes: 8 additions & 6 deletions app/gradleScript/dependencies.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ allprojects {

ext {
/* Version */
appVersion = '1.1.0'
omisego = '1.1.1-alpha6'
appVersion = '2.0.0'
omisego = '1.1.2-alpha4'
supportLibrary = '1.0.0-rc02'
kotlin = '1.2.61'
retrofit = '2.4.0'
Expand All @@ -18,6 +18,7 @@ ext {
okhttp3 = '3.9.1'
nav = '1.0.0-alpha06'
architecture = "2.0.0-alpha1"
espresso = "3.1.0-alpha4"

omisego = [
sdk: "co.omisego:omisego-client:${omisego}",
Expand All @@ -27,7 +28,7 @@ ext {
extensions: "androidx.lifecycle:lifecycle-extensions:${architecture}"
]
firebase = [
core : "com.google.firebase:firebase-core:16.0.1",
core : "com.google.firebase:firebase-core:16.0.1",
crashlytics: "com.crashlytics.sdk.android:crashlytics:2.9.5"
]
databinding = [
Expand Down Expand Up @@ -73,19 +74,20 @@ ext {
"androidx.arch.core:core-testing:${architecture}"
]
androidTest = [
"androidx.test.espresso:espresso-core:3.1.0-alpha4",
"androidx.test.espresso:espresso-core:${espresso}",
"com.agoda.kakao:kakao:1.4.0-androidx",
"com.android.support.test:runner:1.0.1",
"org.amshove.kluent:kluent-android:1.30",
"com.android.support.test:rules:1.0.1",
"com.jakewharton.espresso:okhttp3-idling-resource:1.0.0"
"com.jakewharton.espresso:okhttp3-idling-resource:1.0.0",
]
custom = [
constraintLayout: 'androidx.constraintlayout:constraintlayout:1.1.0',
stetho : 'com.facebook.stetho:stetho-okhttp3:1.5.0',
shimmer : 'com.facebook.shimmer:shimmer:0.2.0',
dexter : 'com.karumi:dexter:5.0.0',
biometric : 'co.infinum:goldfinger:1.1.1',
pagerindicator : 'com.romandanylyk:pageindicatorview:1.0.2'
pagerindicator : 'com.romandanylyk:pageindicatorview:1.0.2',
idlingResource : "androidx.test.espresso:espresso-idling-resource:${espresso}",
]
}
Loading