Refactored gray2 color

ramiyass · May 12, 2019 · cc8caa3 · cc8caa3
1 parent 8fcc673
commit cc8caa3
Show file tree

Hide file tree

Showing 13 changed files with 24 additions and 18 deletions.
diff --git a/corecomponent/androidcomponent/src/main/res/values/colors.xml b/corecomponent/androidcomponent/src/main/res/values/colors.xml
@@ -8,8 +8,10 @@
     <color name="colorSecondary_50">#80E6650F</color>
     <color name="colorBackground">@color/white</color>
     <color name="colorOnBackground">@color/gray1</color>
+    <color name="colorOnBackgroundSecondary">@color/gray2</color>
     <color name="colorSurface">@color/white</color>
     <color name="colorOnSurface">@color/gray1</color>
+    <color name="colorOnSurfaceSecondary">@color/gray2</color>
 
     <!-- Gray scale -->
     <color name="gray1">#353435</color>
@@ -28,6 +30,10 @@
     <color name="tag_text_gray">@color/gray1</color>
     <color name="tag_bg_gray">#E5E8EA</color>
 
+    <color name="filter_text_gray">@color/gray2</color>
+    <color name="filter_icon_gray">@color/gray3</color>
+    <color name="filter_bg_gray">@color/gray4</color>
+
     <color name="cell_text_red">#F63529</color>
     <color name="cell_bg_red">#FEEAE9</color>
     <color name="cell_vertical_line">@color/gray1</color>

diff --git a/feature/about/src/main/java/io/github/droidkaigi/confsched2019/about/ui/item/AboutItem.kt b/feature/about/src/main/java/io/github/droidkaigi/confsched2019/about/ui/item/AboutItem.kt
@@ -34,7 +34,7 @@ class AboutItem(
             ContextCompat.getColor(
                 binding.root.context,
                 if (clickListener == null) {
-                    R.color.gray2
+                    R.color.colorOnBackgroundSecondary
                 } else {
                     R.color.colorSecondary
                 }

diff --git a/...utor/src/main/java/io/github/droidkaigi/confsched2019/contributor/item/ContributorItem.kt b/...utor/src/main/java/io/github/droidkaigi/confsched2019/contributor/item/ContributorItem.kt
@@ -7,10 +7,10 @@ import com.squareup.inject.assisted.AssistedInject
 import com.squareup.picasso.Picasso
 import com.xwray.groupie.databinding.BindableItem
 import io.github.droidkaigi.confsched2019.contributor.R
+import io.github.droidkaigi.confsched2019.contributor.databinding.ItemContributorBinding
 import io.github.droidkaigi.confsched2019.model.Contributor
 import io.github.droidkaigi.confsched2019.system.actioncreator.ActivityActionCreator
 import jp.wasabeef.picasso.transformations.CropCircleTransformation
-import io.github.droidkaigi.confsched2019.contributor.databinding.ItemContributorBinding
 
 class ContributorItem @AssistedInject constructor(
     @Assisted val contributor: Contributor,
@@ -41,7 +41,7 @@ class ContributorItem @AssistedInject constructor(
 
         val placeHolderColor = ContextCompat.getColor(
             context,
-            R.color.gray2
+            R.color.colorOnBackgroundSecondary
         )
         val placeHolder = VectorDrawableCompat.create(
             context.resources,

diff --git a/...e/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeakerItem.kt b/...e/session/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeakerItem.kt
@@ -39,7 +39,7 @@ class SpeakerItem @AssistedInject constructor(
         val context = itemBinding.speakerImage.context
         val placeHolderColor = ContextCompat.getColor(
             context,
-            R.color.gray2
+            R.color.colorOnBackgroundSecondary
         )
         val placeHolder = VectorDrawableCompat.create(
             context.resources,

diff --git a/...ion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeechSessionItem.kt b/...ion/src/main/java/io/github/droidkaigi/confsched2019/session/ui/item/SpeechSessionItem.kt
@@ -146,7 +146,7 @@ class SpeechSessionItem @AssistedInject constructor(
                 setTint(
                     ContextCompat.getColor(
                         context,
-                        R.color.gray2
+                        R.color.colorOnBackgroundSecondary
                     )
                 )
             }

diff --git a/.../main/java/io/github/droidkaigi/confsched2019/session/ui/item/TabularSpeechSessionItem.kt b/.../main/java/io/github/droidkaigi/confsched2019/session/ui/item/TabularSpeechSessionItem.kt
@@ -112,7 +112,7 @@ class TabularSpeechSessionItem @AssistedInject constructor(
                     null
                 )?.apply {
                     setTint(
-                        ContextCompat.getColor(context, R.color.gray2)
+                        ContextCompat.getColor(context, R.color.colorOnBackgroundSecondary)
                     )
                 }
 

diff --git a/feature/session/src/main/res/layout/fragment_bottom_sheet_sessions.xml b/feature/session/src/main/res/layout/fragment_bottom_sheet_sessions.xml
@@ -79,10 +79,10 @@
                 android:layout_marginEnd="16dp"
                 android:gravity="center_vertical|start"
                 android:text="@{safeUnbox(isFiltered) ? @string/session_filter_button_filtered : @string/session_filter_button }"
-                android:textColor="@color/gray2"
-                app:chipBackgroundColor="@color/gray4"
+                android:textColor="@color/filter_text_gray"
+                app:chipBackgroundColor="@color/filter_bg_gray"
                 app:chipIcon="@drawable/ic_filter_list_black_24dp"
-                app:chipIconTint="@color/gray3"
+                app:chipIconTint="@color/filter_icon_gray"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintTop_toTopOf="parent"

diff --git a/feature/session/src/main/res/layout/fragment_session_detail.xml b/feature/session/src/main/res/layout/fragment_session_detail.xml
@@ -145,7 +145,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:contentDescription="@string/session_description_time_image"
-                    android:tint="@color/gray2"
+                    android:tint="@color/colorOnBackgroundSecondary"
                     app:layout_constraintStart_toStartOf="@id/session_time_and_room"
                     app:layout_constraintTop_toBottomOf="@id/session_time_and_room"
                     app:srcCompat="@drawable/ic_access_time_black_24dp"

diff --git a/feature/session/src/main/res/layout/fragment_speaker.xml b/feature/session/src/main/res/layout/fragment_speaker.xml
@@ -92,14 +92,14 @@
                     android:layout_height="64dp"
                     android:layout_margin="16dp"
                     android:contentDescription="@string/speaker_label"
-                    app:circleCrop="@{true}"
                     android:transitionName="@{speaker.id}"
+                    app:circleCrop="@{true}"
                     app:imageUrl="@{speaker.imageUrl}"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintTop_toTopOf="parent"
                     app:listener="@{listener}"
                     app:placeHolder="@{@drawable/ic_person_outline_black_24dp}"
-                    app:placeHolderTint="@{@color/gray2}"
+                    app:placeHolderTint="@{@color/colorOnBackgroundSecondary}"
                     tools:src="@tools:sample/avatars"
                     />
 

diff --git a/feature/session/src/main/res/layout/item_speaker.xml b/feature/session/src/main/res/layout/item_speaker.xml
@@ -40,7 +40,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:placeHolder="@{@drawable/ic_person_outline_black_24dp}"
-            app:placeHolderTint="@{@color/gray2}"
+            app:placeHolderTint="@{@color/colorOnBackgroundSecondary}"
             tools:src="@tools:sample/avatars"
             />
 

diff --git a/feature/session/src/main/res/menu/menu_session_detail_bottomappbar.xml b/feature/session/src/main/res/menu/menu_session_detail_bottomappbar.xml
@@ -7,22 +7,22 @@
         android:id="@+id/session_share"
         android:icon="@drawable/ic_share_outline_black_24dp"
         android:title="@string/session_share"
-        app:iconTint="@color/gray2"
+        app:iconTint="@color/colorOnSurfaceSecondary"
         app:showAsAction="ifRoom"
         />
     <item
         android:id="@+id/session_place"
         android:icon="@drawable/ic_room_outline_black_24dp"
         android:title="@string/session_place"
-        app:iconTint="@color/gray2"
+        app:iconTint="@color/colorOnSurfaceSecondary"
         app:showAsAction="ifRoom"
         />
 
     <item
         android:id="@+id/session_calendar"
         android:icon="@drawable/ic_date_range_black_24dp"
         android:title="@string/session_place"
-        app:iconTint="@color/gray2"
+        app:iconTint="@color/colorOnSurfaceSecondary"
         app:showAsAction="ifRoom"
         />
 

diff --git a/feature/staff/src/main/java/io/github/droidkaigi/confsched2019/staff/ui/item/StaffItem.kt b/feature/staff/src/main/java/io/github/droidkaigi/confsched2019/staff/ui/item/StaffItem.kt
@@ -20,7 +20,7 @@ class StaffItem(
         val context = itemBinding.staffImage.context
         val placeHolderColor = ContextCompat.getColor(
             context,
-            R.color.gray2
+            R.color.colorOnBackgroundSecondary
         )
         val placeHolder = VectorDrawableCompat.create(
             context.resources,

diff --git a/...survey/src/main/java/io/github/droidkaigi/confsched2019/survey/ui/item/SpeakerIconItem.kt b/...survey/src/main/java/io/github/droidkaigi/confsched2019/survey/ui/item/SpeakerIconItem.kt
@@ -20,7 +20,7 @@ class SpeakerIconItem constructor(
         val context = itemBinding.icon.context
         val placeHolderColor = ContextCompat.getColor(
             context,
-            R.color.gray2
+            R.color.colorOnBackgroundSecondary
         )
         val placeHolder = VectorDrawableCompat.create(
             context.resources,