Skip to content

Commit

Permalink
Remove unnecessary theme parameters
Browse files Browse the repository at this point in the history
Update demo app appcompat
Update volley
  • Loading branch information
ioan-ghisoi-cko committed Jan 28, 2019
1 parent 528dc36 commit da072f0
Show file tree
Hide file tree
Showing 11 changed files with 29 additions and 24 deletions.
Binary file modified .idea/caches/build_file_checksums.ser
Binary file not shown.
10 changes: 7 additions & 3 deletions .idea/misc.xml

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

2 changes: 1 addition & 1 deletion .idea/vcs.xml

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

6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ allprojects {
dependencies {
implementation 'com.android.support:design:27.1.1'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.github.checkout:frames-android:v2.0.5'
implementation 'com.android.volley:volley:1.1.0'
implementation 'com.github.checkout:frames-android:v2.0.6'
}
```

> You can find more about the installation [here](https://jitpack.io/#checkout/frames-android/v2.0.5)
> You can find more about the installation [here](https://jitpack.io/#checkout/frames-android/v2.0.6)
> Please keep in mind that the Jitpack repository should to be added to the project gradle file while the dependency should be added in the module gradle file. [(see more about gradle files)](https://developer.android.com/studio/build)
Expand Down
2 changes: 1 addition & 1 deletion android-sdk/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ dependencies {
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.support:design:27.1.1'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.android.volley:volley:1.1.0'
}
3 changes: 0 additions & 3 deletions android-sdk/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorButtonNormal">#000000</item>
<item name="button">#4050b5</item>
<item name="colorControlNormal">#000000</item>
</style>

<style name="Error">
Expand Down
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "checkout.checkout_android"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -23,11 +23,11 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.android.volley:volley:1.1.0'
implementation project(path: ':android-sdk')
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
Expand Down
Binary file modified demos/examples/.idea/caches/build_file_checksums.ser
Binary file not shown.
8 changes: 6 additions & 2 deletions demos/examples/.idea/misc.xml

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

10 changes: 5 additions & 5 deletions demos/examples/app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
compileSdkVersion 28
defaultConfig {
applicationId "checkout.com.demo"
minSdkVersion 16
targetSdkVersion 27
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
Expand All @@ -20,13 +20,13 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:27.1.1'
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.2'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
implementation 'com.github.checkout:frames-android:v2.0.5'
implementation 'com.android.support:design:27.1.1'
implementation 'com.android.support:design:28.0.0'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.android.volley:volley:1.1.0'
}
4 changes: 2 additions & 2 deletions demos/googlepay_example/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ dependencies {
implementation 'com.android.support:mediarouter-v7:27.1.1'
implementation 'com.android.support:design:27.1.1'
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.android.volley:volley:1.0.0'
implementation 'com.github.checkout:frames-android:v2.0.5'
implementation 'com.android.volley:volley:1.1.0'
implementation 'com.github.checkout:frames-android:v2.0.6'

// "wallet" is the only module needed for the Google Payment API and this sample app.
// Apps that selectively compile Google Play service APIs need only this dependency.
Expand Down

0 comments on commit da072f0

Please sign in to comment.