Merge pull request #71 from getbouncer/awushensky/update_color_overri…

…des_for_cardverify Update color names
getbouncer · Dec 16, 2019 · 48badcd · 48badcd
2 parents 1ed60e9 + 7b8b3dc
commit 48badcd
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -20,8 +20,8 @@ We publish our library in the jcenter repository, so for most gradle configurati
 
 ```gradle
 dependencies {
-    implementation 'com.getbouncer:cardscan-base:1.0.5117'
-    implementation 'com.getbouncer:cardscan:1.0.5117'
+    implementation 'com.getbouncer:cardscan-base:1.0.5118'
+    implementation 'com.getbouncer:cardscan:1.0.5118'
 }
 ```
 

diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 28
         versionCode 4015
-        versionName "1.0.5117"
+        versionName "1.0.5118"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

diff --git a/cardscan-base/src/main/java/com/getbouncer/cardscan/base/OverlayWhite.java b/cardscan-base/src/main/java/com/getbouncer/cardscan/base/OverlayWhite.java
@@ -6,8 +6,8 @@
 
 public class OverlayWhite extends Overlay {
 
-    int backgroundColorId = R.color.card_scan_white_background;
-    int cornerColorId = R.color.card_scan_gray;
+    int backgroundColorId = R.color.card_scan_overlay_colored_background;
+    int cornerColorId = R.color.card_scan_overlay_colored_corner_color;
 
     public OverlayWhite(Context context, AttributeSet attrs) {
         super(context, attrs);

diff --git a/cardscan-base/src/main/res/values/colors.xml b/cardscan-base/src/main/res/values/colors.xml
@@ -2,6 +2,6 @@
 <resources>
     <color name="card_scan_camera_background">#992F3542</color>
     <color name="card_scan_corner_color">#4CD964</color>
-    <color name="card_scan_white_background">#ffffffff</color>
-    <color name="card_scan_gray">#88888888</color>
+    <color name="card_scan_overlay_colored_background">#ffffffff</color>
+    <color name="card_scan_overlay_colored_corner_color">#88888888</color>
 </resources>
diff --git a/cardscan/build.gradle b/cardscan/build.gradle
@@ -39,8 +39,8 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 ext {
-    bintrayRepo = 'cardscan-android'
-    bintrayName = 'cardscan-android'
+    bintrayRepo = 'CardScan'
+    bintrayName = 'CardScan'
     bintrayOrg = 'bouncerpaid'
 
     publishedGroupId = 'com.getbouncer'
@@ -133,7 +133,7 @@ bintray {
     pkg {
         repo = bintrayRepo
         name = bintrayName
-        userOrg = bintrayOrg
+//        userOrg = bintrayOrg
         desc = libraryDescription
         websiteUrl = siteUrl
         vcsUrl = gitUrl

diff --git a/gradle.properties b/gradle.properties
@@ -13,4 +13,4 @@ org.gradle.jvmargs=-Xmx1536m
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-version=1.0.5117
+version=1.0.5118