Rename attributes in stripecardscan

stripe · Apr 27, 2023 · 289db63 · 289db63
1 parent 70faa85
commit 289db63
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 20 deletions.
diff --git a/camera-core/res/values/attrs.xml b/camera-core/res/values/attrs.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <declare-styleable name="CameraView" tools:ignore="ResourceName">
+    <declare-styleable name="StripeCameraView">
         <!--defines the shape, aspect ratio of the viewfinder-->
-        <attr name="viewFinderType" format="enum">
+        <attr name="stripeViewFinderType" format="enum">
             <!--viewFinder fills previewView, no background/hole drawn-->
             <enum name="fill" value="0" />
             <!--viewFinder has aspect ratio for credit card, a hole is drawn to highlight the viewfinder-->
@@ -13,11 +13,11 @@
             <enum name="passport" value="3" />
         </attr>
         <!--defines the imageView of the border-->
-        <attr name="borderDrawable" format="reference" />
+        <attr name="stripeBorderDrawable" format="reference" />
     </declare-styleable>
 
-    <declare-styleable name="ViewFinderBackground" tools:ignore="ResourceName">
-        <attr name="backgroundColor" format="color" />
+    <declare-styleable name="StripeViewFinderBackground">
+        <attr name="stripeBackgroundColor" format="color" />
     </declare-styleable>
 
 </resources>
diff --git a/camera-core/src/main/java/com/stripe/android/camera/scanui/CameraView.kt b/camera-core/src/main/java/com/stripe/android/camera/scanui/CameraView.kt
@@ -26,8 +26,8 @@ import kotlin.math.roundToInt
  * and [ScanFlow].
  *
  * Has the following styleable parameters to configure in xml
- *  [R.styleable.CameraView_viewFinderType] - a enum to decide the type of [ViewFinderType], which dictates the aspect ratio of [viewFinderWindowView].
- *  [R.styleable.CameraView_borderDrawable] - an optional reference for [viewFinderBorderView]'s drawable resource.
+ *  [R.styleable.StripeCameraView_stripeViewFinderType] - a enum to decide the type of [ViewFinderType], which dictates the aspect ratio of [viewFinderWindowView].
+ *  [R.styleable.StripeCameraView_stripeBorderDrawable] - an optional reference for [viewFinderBorderView]'s drawable resource.
  *
  */
 @RestrictTo(RestrictTo.Scope.LIBRARY_GROUP)
@@ -123,13 +123,13 @@ class CameraView : ConstraintLayout {
     private fun initFromXML(context: Context, attrs: AttributeSet? = null) {
         context.withStyledAttributes(
             attrs,
-            R.styleable.CameraView
+            R.styleable.StripeCameraView
         ) {
             viewFinderType =
-                ViewFinderType.values()[getInt(R.styleable.CameraView_viewFinderType, 0)]
+                ViewFinderType.values()[getInt(R.styleable.StripeCameraView_stripeViewFinderType, 0)]
             borderDrawable =
                 getResourceId(
-                    R.styleable.CameraView_borderDrawable,
+                    R.styleable.StripeCameraView_stripeBorderDrawable,
                     NO_BORDER
                 )
         }

diff --git a/camera-core/src/main/java/com/stripe/android/camera/scanui/ViewFinderBackground.kt b/camera-core/src/main/java/com/stripe/android/camera/scanui/ViewFinderBackground.kt
@@ -56,10 +56,10 @@ class ViewFinderBackground(
 
     private val theme = context.theme
     private val attributes =
-        theme.obtainStyledAttributes(attrs, R.styleable.ViewFinderBackground, 0, 0)
+        theme.obtainStyledAttributes(attrs, R.styleable.StripeViewFinderBackground, 0, 0)
     private val backgroundColor =
         attributes.getColor(
-            R.styleable.ViewFinderBackground_backgroundColor,
+            R.styleable.StripeViewFinderBackground_stripeBackgroundColor,
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
                 resources.getColor(R.color.stripeNotFoundBackground, theme)
             } else {

diff --git a/stripe-core/src/test/java/com/stripe/android/core/model/CountryUtilsTest.kt b/stripe-core/src/test/java/com/stripe/android/core/model/CountryUtilsTest.kt
@@ -6,7 +6,6 @@ import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 import java.util.Locale
-import kotlin.test.Ignore
 import kotlin.test.Test
 
 /**

diff --git a/stripecardscan/res/layout/stripe_activity_cardscan.xml b/stripecardscan/res/layout/stripe_activity_cardscan.xml
@@ -10,8 +10,8 @@
         android:id="@+id/camera_view"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:borderDrawable="@drawable/stripe_card_border_not_found"
-        app:viewFinderType="creditCard" />
+        app:stripeBorderDrawable="@drawable/stripe_card_border_not_found"
+        app:stripeViewFinderType="creditCard" />
 
     <ImageView
         android:id="@+id/close_button"

diff --git a/stripecardscan/res/layout/stripe_fragment_cardscan.xml b/stripecardscan/res/layout/stripe_fragment_cardscan.xml
@@ -14,7 +14,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintDimensionRatio="1:1"
-        app:viewFinderType="creditCard" />
+        app:stripeViewFinderType="creditCard" />
 
     <ImageView
         android:id="@+id/close_button"

diff --git a/stripecardscan/res/values/styles.xml b/stripecardscan/res/values/styles.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <style name="Theme.AppCompat.Light.NoActionBar.FullScreen" parent="@style/Theme.AppCompat.Light.NoActionBar">
+    <style name="StripeBaseTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowFullscreen">true</item>
         <item name="android:windowContentOverlay">@null</item>
     </style>
 
     <!-- Base application theme. -->
-    <style name="stripeDefaultTheme" parent="Theme.AppCompat.Light.NoActionBar.FullScreen">
+    <style name="StripeDefaultTheme" parent="StripeBaseTheme">
         <item name="background">@color/stripeNotFoundBackground</item>
 
         <item name="stripeNotFoundBackgroundColor">@color/stripeNotFoundBackground</item>

diff --git a/stripecardscan/src/main/AndroidManifest.xml b/stripecardscan/src/main/AndroidManifest.xml
@@ -13,11 +13,11 @@
         <activity
             android:name=".cardimageverification.CardImageVerificationActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/stripeDefaultTheme" />
+            android:theme="@style/StripeDefaultTheme" />
 
         <activity
             android:name=".cardscan.CardScanActivity"
             android:screenOrientation="nosensor"
-            android:theme="@style/stripeDefaultTheme" />
+            android:theme="@style/StripeDefaultTheme" />
     </application>
 </manifest>