Skip to content
This repository was archived by the owner on Nov 21, 2024. It is now read-only.

Commit 450e7ca

Browse files
hunterstichGerrit Code Review
hunterstich
authored and
Gerrit Code Review
committed
Merge "Rename color.xml values to use snake case"
2 parents 9937d7b + 4a63e2b commit 450e7ca

File tree

5 files changed

+51
-51
lines changed

5 files changed

+51
-51
lines changed

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
the License.
1414
-->
1515
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
16-
<background android:drawable="@color/colorBlue700"/>
16+
<background android:drawable="@color/reply_blue_700"/>
1717
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
1818
</adaptive-icon>

‎app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
the License.
1414
-->
1515
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
16-
<background android:drawable="@color/colorBlue700"/>
16+
<background android:drawable="@color/reply_blue_700"/>
1717
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
1818
</adaptive-icon>

‎app/src/main/res/values-night/themes.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,26 +19,26 @@
1919

2020
<style name="Theme.Reply.Dark" parent="Theme.Reply">
2121
<!--Color-->
22-
<item name="colorPrimary">@color/colorBlue200</item>
23-
<item name="colorPrimaryVariant">@color/colorBlue300</item>
24-
<item name="colorSecondary">@color/colorOrange300</item>
25-
<item name="colorSecondaryVariant">@color/colorOrange300</item>
22+
<item name="colorPrimary">@color/reply_blue_200</item>
23+
<item name="colorPrimaryVariant">@color/reply_blue_300</item>
24+
<item name="colorSecondary">@color/reply_orange_300</item>
25+
<item name="colorSecondaryVariant">@color/reply_orange_300</item>
2626

27-
<item name="android:colorBackground">@color/colorBlack900</item>
28-
<item name="colorSurface">@color/colorBlack800</item>
27+
<item name="android:colorBackground">@color/reply_black_900</item>
28+
<item name="colorSurface">@color/reply_black_800</item>
2929
<item name="colorBrandedSurface">?attr/colorSurface</item>
3030
<item name="colorBrandedVariantSurface">?attr/colorSurface</item>
31-
<item name="colorError">@color/colorRed200</item>
31+
<item name="colorError">@color/reply_red_200</item>
3232

33-
<item name="colorOnPrimary">@color/colorBlack900</item>
34-
<item name="colorOnSecondary">@color/colorBlack900</item>
35-
<item name="colorOnBackground">@color/colorWhite50</item>
36-
<item name="colorOnSurface">@color/colorWhite50</item>
33+
<item name="colorOnPrimary">@color/reply_black_900</item>
34+
<item name="colorOnSecondary">@color/reply_black_900</item>
35+
<item name="colorOnBackground">@color/reply_white_50</item>
36+
<item name="colorOnSurface">@color/reply_white_50</item>
3737
<item name="colorOnBrandedSurface">?attr/colorOnSurface</item>
38-
<item name="colorOnError">@color/colorBlack900</item>
38+
<item name="colorOnError">@color/reply_black_900</item>
3939

40-
<item name="scrimBackground">@color/colorBlack900Alpha087</item>
41-
<item name="android:statusBarColor">@color/colorBlack900Alpha060</item>
40+
<item name="scrimBackground">@color/reply_black_900_alpha_087</item>
41+
<item name="android:statusBarColor">@color/reply_black_900_alpha_060</item>
4242

4343
<item name="elevationOverlayEnabled">true</item>
4444
<item name="bottomAppBarStyle">@style/Widget.MaterialComponents.BottomAppBar</item>

‎app/src/main/res/values/color.xml

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,38 +15,38 @@
1515
<resources>
1616

1717
<!--Color palette-->
18-
<color name="colorWhite50">#ffffff</color>
18+
<color name="reply_white_50">#ffffff</color>
1919

20-
<color name="colorBlack800">#121212</color>
21-
<color name="colorBlack900">#000000</color>
20+
<color name="reply_black_800">#121212</color>
21+
<color name="reply_black_900">#000000</color>
2222

23-
<color name="colorBlue50">#eef0f2</color>
24-
<color name="colorBlue100">#d2dbe0</color>
25-
<color name="colorBlue200">#adbbc4</color>
26-
<color name="colorBlue300">#8ca2ae</color>
27-
<color name="colorBlue600">#4a6572</color>
28-
<color name="colorBlue700">#344955</color>
29-
<color name="colorBlue800">#232f34</color>
23+
<color name="reply_blue_50">#eef0f2</color>
24+
<color name="reply_blue_100">#d2dbe0</color>
25+
<color name="reply_blue_200">#adbbc4</color>
26+
<color name="reply_blue_300">#8ca2ae</color>
27+
<color name="reply_blue_600">#4a6572</color>
28+
<color name="reply_blue_700">#344955</color>
29+
<color name="reply_blue_800">#232f34</color>
3030

31-
<color name="colorOrange300">#fbd790</color>
32-
<color name="colorOrange400">#f9be64</color>
33-
<color name="colorOrange500">#f9aa33</color>
31+
<color name="reply_orange_300">#fbd790</color>
32+
<color name="reply_orange_400">#f9be64</color>
33+
<color name="reply_orange_500">#f9aa33</color>
3434

35-
<color name="colorRed200">#cf7779</color>
36-
<color name="colorRed400">#ff4c5d</color>
35+
<color name="reply_red_200">#cf7779</color>
36+
<color name="reply_red_400">#ff4c5d</color>
3737

38-
<color name="colorWhite50Alpha060">#99ffffff</color>
38+
<color name="reply_white_50_alpha_060">#99ffffff</color>
3939

40-
<color name="colorBlue50Alpha060">#99eef0f2</color>
40+
<color name="reply_blue_50_alpha_060">#99eef0f2</color>
4141

42-
<color name="colorBlack900Alpha020">#33000000</color>
43-
<color name="colorBlack900Alpha087">#de000000</color>
44-
<color name="colorBlack900Alpha060">#99000000</color>
42+
<color name="reply_black_900_alpha_020">#33000000</color>
43+
<color name="reply_black_900_alpha_087">#de000000</color>
44+
<color name="reply_black_900_alpha_060">#99000000</color>
4545

4646
<!--Nav bar color protection for behavior differences between Android P and Q. All sdk-->
4747
<!--levels should draw fullscreen. P should color the nav bar with a translucent background -->
4848
<!--to guard for contrast. Q should have a transparent nav bar as Q will automatically -->
4949
<!--handles contrast by either dynamically coloring the nav bar handle (gesture nav) -->
5050
<!--or automatically applying a translucent background (3-button mode).-->
51-
<color name="nav_bar">@color/colorBlack900Alpha020</color>
51+
<color name="nav_bar">@color/reply_black_900_alpha_020</color>
5252
</resources>

‎app/src/main/res/values/themes.xml

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -20,26 +20,26 @@
2020
<style name="Theme.Reply" parent="Theme.MaterialComponents.DayNight.NoActionBar">
2121

2222
<!--Color-->
23-
<item name="colorPrimary">@color/colorBlue700</item>
24-
<item name="colorPrimaryVariant">@color/colorBlue800</item>
25-
<item name="colorSecondary">@color/colorOrange500</item>
26-
<item name="colorSecondaryVariant">@color/colorOrange400</item>
23+
<item name="colorPrimary">@color/reply_blue_700</item>
24+
<item name="colorPrimaryVariant">@color/reply_blue_800</item>
25+
<item name="colorSecondary">@color/reply_orange_500</item>
26+
<item name="colorSecondaryVariant">@color/reply_orange_400</item>
2727

28-
<item name="android:colorBackground">@color/colorBlue50</item>
29-
<item name="colorSurface">@color/colorWhite50</item>
28+
<item name="android:colorBackground">@color/reply_blue_50</item>
29+
<item name="colorSurface">@color/reply_white_50</item>
3030
<item name="colorBrandedSurface">?attr/colorPrimary</item>
3131
<item name="colorBrandedVariantSurface">?attr/colorPrimaryVariant</item>
32-
<item name="colorError">@color/colorRed400</item>
32+
<item name="colorError">@color/reply_red_400</item>
3333

34-
<item name="colorOnPrimary">@color/colorWhite50</item>
35-
<item name="colorOnSecondary">@color/colorBlack900</item>
36-
<item name="colorOnBackground">@color/colorBlack900</item>
37-
<item name="colorOnSurface">@color/colorBlack900</item>
34+
<item name="colorOnPrimary">@color/reply_white_50</item>
35+
<item name="colorOnSecondary">@color/reply_black_900</item>
36+
<item name="colorOnBackground">@color/reply_black_900</item>
37+
<item name="colorOnSurface">@color/reply_black_900</item>
3838
<item name="colorOnBrandedSurface">?attr/colorOnPrimary</item>
39-
<item name="colorOnError">@color/colorBlack900</item>
39+
<item name="colorOnError">@color/reply_black_900</item>
4040

41-
<item name="scrimBackground">@color/colorWhite50Alpha060</item>
42-
<item name="android:statusBarColor">@color/colorBlue50Alpha060</item>
41+
<item name="scrimBackground">@color/reply_white_50_alpha_060</item>
42+
<item name="android:statusBarColor">@color/reply_blue_50_alpha_060</item>
4343
<item name="android:navigationBarColor">@color/nav_bar</item>
4444

4545
<item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.Reply.SmallComponents</item>

0 commit comments

Comments
 (0)