Skip to content

Commit e38e4c5

Browse files
committed
rename colours to avoid primary app's colors.xml conflicts
1 parent 1de117c commit e38e4c5

12 files changed

+31
-31
lines changed

rave_android/src/main/res/layout/rave_sdk_add_exisiting_bank.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
44
android:orientation="vertical"
5-
android:background="@color/lightish_grey_bg"
5+
android:background="@color/rave_lightish_grey_bg"
66
android:layout_width="match_parent"
77
android:layout_height="match_parent">
88

@@ -14,7 +14,7 @@
1414
android:textStyle="bold"
1515
android:textSize="16sp"
1616
android:layout_marginBottom="10dp"
17-
android:textColor="@color/light_grey"
17+
android:textColor="@color/rave_light_grey"
1818
android:gravity="center_horizontal|center_vertical"
1919
android:id="@+id/rave_payment_type_title_textView"
2020
/>

rave_android/src/main/res/layout/rave_sdk_fragment_bank_transfer.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
android:layout_marginEnd="24dp"
8686
android:layout_marginRight="24dp"
8787
android:textSize="16sp"
88-
android:textColor="@color/lightish_black"
88+
android:textColor="@color/rave_lightish_black"
8989
android:gravity="center"
9090
android:text="@string/bank_transfer_instructions_placeholder"
9191
app:layout_constraintEnd_toEndOf="parent"
@@ -97,7 +97,7 @@
9797
android:layout_width="wrap_content"
9898
android:layout_height="wrap_content"
9999
android:textSize="16sp"
100-
android:textColor="@color/lightish_black"
100+
android:textColor="@color/rave_lightish_black"
101101
android:layout_marginTop="32dp"
102102
android:text="@string/amount"
103103
app:layout_constraintStart_toStartOf="parent"
@@ -109,7 +109,7 @@
109109
android:layout_height="wrap_content"
110110
android:text="@string/amount_placeholder"
111111
android:textSize="16sp"
112-
android:textColor="@color/lightish_black"
112+
android:textColor="@color/rave_lightish_black"
113113
android:textIsSelectable="true"
114114
app:layout_constraintBottom_toBottomOf="@+id/textView2"
115115
app:layout_constraintEnd_toEndOf="parent"
@@ -124,7 +124,7 @@
124124
android:layout_marginEnd="8dp"
125125
android:layout_marginRight="8dp"
126126
android:text="@string/currency_placeholder"
127-
android:textColor="@color/lightish_black"
127+
android:textColor="@color/rave_lightish_black"
128128
android:textSize="16sp"
129129
app:layout_constraintBottom_toBottomOf="@+id/textView2"
130130
app:layout_constraintEnd_toStartOf="@+id/rave_amount_tv"
@@ -139,7 +139,7 @@
139139
android:layout_marginTop="32dp"
140140
android:text="@string/account_number"
141141
android:textSize="16sp"
142-
android:textColor="@color/lightish_black"
142+
android:textColor="@color/rave_lightish_black"
143143
app:layout_constraintStart_toStartOf="parent"
144144
app:layout_constraintTop_toBottomOf="@+id/textView2" />
145145

@@ -151,7 +151,7 @@
151151
android:layout_marginRight="1dp"
152152
android:text="@string/account_number_placeholder"
153153
android:textSize="20sp"
154-
android:textColor="@color/lightish_black"
154+
android:textColor="@color/rave_lightish_black"
155155
android:textIsSelectable="true"
156156
app:layout_constraintBottom_toBottomOf="@+id/textView5"
157157
app:layout_constraintEnd_toEndOf="parent"
@@ -164,7 +164,7 @@
164164
android:layout_marginTop="32dp"
165165
android:text="@string/bank_name"
166166
android:textSize="16sp"
167-
android:textColor="@color/lightish_black"
167+
android:textColor="@color/rave_lightish_black"
168168
app:layout_constraintStart_toStartOf="parent"
169169
app:layout_constraintTop_toBottomOf="@+id/textView5" />
170170

@@ -174,7 +174,7 @@
174174
android:layout_height="wrap_content"
175175
android:text="@string/bank_name_placeholder"
176176
android:textSize="16sp"
177-
android:textColor="@color/lightish_black"
177+
android:textColor="@color/rave_lightish_black"
178178
android:textIsSelectable="true"
179179
app:layout_constraintBottom_toBottomOf="@+id/textView7"
180180
app:layout_constraintEnd_toEndOf="parent"
@@ -187,7 +187,7 @@
187187
android:layout_marginTop="32dp"
188188
android:text="@string/beneficiary_name"
189189
android:textSize="16sp"
190-
android:textColor="@color/lightish_black"
190+
android:textColor="@color/rave_lightish_black"
191191
app:layout_constraintStart_toStartOf="parent"
192192
app:layout_constraintTop_toBottomOf="@+id/textView7" />
193193

@@ -197,7 +197,7 @@
197197
android:layout_height="wrap_content"
198198
android:text="@string/beneficiary_name_placeholder"
199199
android:textSize="16sp"
200-
android:textColor="@color/lightish_black"
200+
android:textColor="@color/rave_lightish_black"
201201
app:layout_constraintBottom_toBottomOf="@+id/textView9"
202202
app:layout_constraintEnd_toEndOf="parent"
203203
app:layout_constraintTop_toTopOf="@+id/textView9" />

rave_android/src/main/res/layout/rave_sdk_payment_title_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
android:layout_marginLeft="17dp"
1313
android:layout_marginTop="25dp"
1414
android:drawableLeft="@drawable/padlock"
15-
android:drawableTint="@color/light_grey"
15+
android:drawableTint="@color/rave_light_grey"
1616
android:drawablePadding="10dp"
1717
android:letterSpacing="-0.01"
1818
android:text="SECURED BY FLUTTERWAVE"
19-
android:textColor="@color/light_grey"
19+
android:textColor="@color/rave_light_grey"
2020
android:textSize="10sp"
2121
app:layout_constraintLeft_toLeftOf="parent"
2222
app:layout_constraintTop_toTopOf="parent" />

rave_android/src/main/res/layout/rave_sdk_pick_saved_card_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
android:layout_marginTop="10dp"
1818
android:gravity="center_horizontal|center_vertical"
1919
android:text="@string/please_select_a_card"
20-
android:textColor="@color/light_grey"
20+
android:textColor="@color/rave_light_grey"
2121
android:textSize="16sp"
2222
android:textStyle="bold" />
2323

rave_android/src/main/res/layout/rave_sdk_select_bank_list_item.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
android:layout_height="wrap_content"
2222
android:layout_centerVertical="true"
2323
android:letterSpacing="0.04"
24-
android:textColor="@color/light_grey"
24+
android:textColor="@color/rave_light_grey"
2525
android:textSize="16sp" />
2626

2727
<View
2828
android:layout_width="match_parent"
2929
android:layout_height="1dp"
30-
android:textColor="@color/light_grey"
30+
android:textColor="@color/rave_light_grey"
3131
android:layout_alignParentBottom="true"
3232
/>
3333

rave_android/src/main/res/layout/rave_sdk_ukinstruction_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:gravity="center"
2323
android:padding="20dp"
2424
android:text="@string/uk_instruction"
25-
android:textColor="@color/lightish_black"
25+
android:textColor="@color/rave_lightish_black"
2626
android:textSize="13sp" />
2727

2828
<View

rave_android/src/main/res/values-night/colors.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<color name="sisal">#DCD4C9</color>
1313
<color name="divider_color">#DCD4C9</color>
1414

15-
<color name="light_grey">#ffffff</color>
16-
<color name="lightish_black">#fafbff</color>
17-
<color name="lightish_grey_bg">#4A4A4A</color>
15+
<color name="rave_light_grey">#ffffff</color>
16+
<color name="rave_lightish_black">#fafbff</color>
17+
<color name="rave_lightish_grey_bg">#4A4A4A</color>
1818
</resources>

rave_android/src/main/res/values/colors.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<color name="sisal">#DCD4C9</color>
1313
<color name="divider_color">#DCD4C9</color>
1414

15-
<color name="light_grey">#4A4A4A</color>
16-
<color name="lightish_black">#333333</color>
17-
<color name="lightish_grey_bg">#FFFFFF</color>
15+
<color name="rave_light_grey">#4A4A4A</color>
16+
<color name="rave_lightish_black">#333333</color>
17+
<color name="rave_lightish_grey_bg">#FFFFFF</color>
1818
</resources>

rave_utils/src/main/res/layout/rave_sdk_avsvbv_layout.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
xmlns:app="http://schemas.android.com/apk/res-auto"
66
android:scrollbars="vertical"
77
android:fillViewport="true"
8-
android:background="@color/lightish_grey_bg"
8+
android:background="@color/rave_lightish_grey_bg"
99
android:layout_height="match_parent">
1010

1111
<LinearLayout
@@ -27,7 +27,7 @@
2727
android:layout_marginLeft="30dp"
2828
android:paddingTop="10dp"
2929
android:paddingBottom="10dp"
30-
android:textColor="@color/lightish_black"
30+
android:textColor="@color/rave_lightish_black"
3131
android:textSize="16sp"
3232
android:textStyle="bold"
3333
android:layout_marginRight="30dp"

rave_utils/src/main/res/layout/rave_sdk_fragment_web.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
android:clickable="true"
88
android:focusable="true"
99
android:id="@+id/rave_internetBankingBottomSheet"
10-
android:textColor="@color/lightish_black"
10+
android:textColor="@color/rave_lightish_black"
1111
android:orientation="vertical">
1212

1313
<WebView

0 commit comments

Comments
 (0)