Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 50785f1

Browse files
ajitsingajitsing
committed
Prefixing sherlock to all colors used in sherlock
1 parent 75303f1 commit 50785f1

8 files changed

Lines changed: 19 additions & 21 deletions

File tree

‎sherlock/src/main/java/com/singhajit/sherlock/core/investigation/CrashReporter.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ public void report(CrashViewModel crashViewModel) {
3939
.setAutoCancel(true);
4040

4141
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
42-
notificationBuilder.setColor(ContextCompat.getColor(context, R.color.colorAccent));
42+
notificationBuilder.setColor(ContextCompat.getColor(context, R.color.sherlock_colorAccent));
4343
}
4444

4545
NotificationManager notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);

‎sherlock/src/main/res/layout/app_info_row.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:layout_height="wrap_content"
2121
android:layout_gravity="start"
2222
android:text="@{appInfo.attr}"
23-
android:textColor="@color/colorAccent"/>
23+
android:textColor="@color/sherlock_colorAccent"/>
2424

2525
<TextView
2626
android:layout_width="match_parent"

‎sherlock/src/main/res/layout/crash_activity.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
android:layout_height="wrap_content"
6767
android:layout_margin="10dp"
6868
android:text="@{viewModel.exactLocationOfCrash}"
69-
android:textColor="@color/colorAccent"
69+
android:textColor="@color/sherlock_colorAccent"
7070
android:textSize="15sp"
7171
android:textStyle="bold"
7272
tools:text="Place of crash"/>
@@ -102,7 +102,7 @@
102102
android:layout_height="wrap_content"
103103
android:layout_marginBottom="10dp"
104104
android:text="@string/stack_trace"
105-
android:textColor="@color/colorAccent"
105+
android:textColor="@color/sherlock_colorAccent"
106106
android:textSize="15sp"
107107
android:textStyle="bold"/>
108108

@@ -146,7 +146,7 @@
146146
android:layout_height="wrap_content"
147147
android:layout_marginBottom="10dp"
148148
android:text="@string/about_phone"
149-
android:textColor="@color/colorAccent"
149+
android:textColor="@color/sherlock_colorAccent"
150150
android:textSize="15sp"
151151
android:textStyle="bold"/>
152152

@@ -183,7 +183,7 @@
183183
android:layout_height="wrap_content"
184184
android:layout_marginBottom="10dp"
185185
android:text="@string/about_app"
186-
android:textColor="@color/colorAccent"
186+
android:textColor="@color/sherlock_colorAccent"
187187
android:textSize="15sp"
188188
android:textStyle="bold"/>
189189

‎sherlock/src/main/res/layout/crash_card.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
android:layout_height="wrap_content"
4444
android:layout_marginBottom="10dp"
4545
android:text="@{viewModel.place}"
46-
android:textColor="@color/colorAccent"/>
46+
android:textColor="@color/sherlock_colorAccent"/>
4747

4848
<TextView
4949
android:layout_width="wrap_content"

‎sherlock/src/main/res/layout/crash_list_activity.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
android:visibility="@{viewModel.crashNotFoundViewState.visibility}"
3636
android:layout_width="match_parent"
3737
android:layout_height="match_parent"
38-
android:background="@color/white"
38+
android:background="@color/sherlock_white"
3939
android:orientation="vertical"
4040
android:paddingTop="50dp">
4141

‎sherlock/src/main/res/layout/device_info.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:layout_height="wrap_content"
2626
android:layout_gravity="start"
2727
android:text="@string/name"
28-
android:textColor="@color/colorAccent"/>
28+
android:textColor="@color/sherlock_colorAccent"/>
2929

3030
<TextView
3131
android:layout_width="match_parent"
@@ -48,7 +48,7 @@
4848
android:layout_height="wrap_content"
4949
android:layout_gravity="start"
5050
android:text="@string/brand"
51-
android:textColor="@color/colorAccent"/>
51+
android:textColor="@color/sherlock_colorAccent"/>
5252

5353
<TextView
5454
android:layout_width="match_parent"
@@ -70,7 +70,7 @@
7070
android:layout_height="wrap_content"
7171
android:layout_gravity="start"
7272
android:text="@string/android_api_version"
73-
android:textColor="@color/colorAccent"/>
73+
android:textColor="@color/sherlock_colorAccent"/>
7474

7575
<TextView
7676
android:layout_width="match_parent"

‎sherlock/src/main/res/values/colors.xml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<color name="colorPrimary">#D32F2F</color>
4-
<color name="colorPrimaryDark">#B71C1C</color>
5-
<color name="colorAccent">#5B3758</color>
3+
<color name="sherlock_colorPrimary">#D32F2F</color>
4+
<color name="sherlock_colorPrimaryDark">#B71C1C</color>
5+
<color name="sherlock_colorAccent">#5B3758</color>
66

7-
<color name="white">#FFFFFF</color>
8-
<color name="light_black">#2e2828</color>
9-
<color name="grey">#ededed</color>
7+
<color name="sherlock_white">#FFFFFF</color>
108
</resources>

‎sherlock/src/main/res/values/styles.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<style name="Sherlock.Base" parent="Theme.AppCompat.Light.DarkActionBar">
77
<item name="windowNoTitle">true</item>
88
<item name="windowActionBar">false</item>
9-
<item name="colorPrimary">@color/colorPrimary</item>
10-
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
11-
<item name="colorAccent">@color/colorAccent</item>
9+
<item name="colorPrimary">@color/sherlock_colorPrimary</item>
10+
<item name="colorPrimaryDark">@color/sherlock_colorPrimaryDark</item>
11+
<item name="colorAccent">@color/sherlock_colorAccent</item>
1212
</style>
1313

1414
<style name="CardViewStyle" parent="Theme.AppCompat.Light">
@@ -18,6 +18,6 @@
1818
<item name="contentPaddingTop">12dp</item>
1919
<item name="contentPaddingLeft">8dp</item>
2020
<item name="contentPaddingRight">8dp</item>
21-
<item name="cardBackgroundColor">@color/white</item>
21+
<item name="cardBackgroundColor">@color/sherlock_white</item>
2222
</style>
2323
</resources>

0 commit comments

Comments
 (0)