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

Commit 9f014e1

Browse files
nickbutchernickbutcher
committed
Clean up styles & themes.
Change-Id: I8b170833d1ded927f4f3d3382dd7a23870a925c8
1 parent 4e22134 commit 9f014e1

20 files changed

+98
-106
lines changed

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@
2626
android:label="@string/app_name"
2727
android:name="OwlApplication"
2828
android:supportsRtl="true"
29-
android:theme="@style/Owl"
29+
android:theme="@style/Owl.Blue"
3030
tools:ignore="GoogleAppIndexingWarning">
3131

3232
<activity
3333
android:name=".ui.MainActivity"
34-
android:theme="@style/Owl.Theme2">
34+
android:theme="@style/Owl.Blue">
3535
<intent-filter>
3636
<action android:name="android.intent.action.MAIN"/>
3737
<category android:name="android.intent.category.LAUNCHER"/>

‎app/src/main/java/com/materialstudies/owl/ui/learn/LearnFragment.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ class LearnFragment : Fragment() {
5959
course = courses.last()
6060

6161
val behavior = BottomSheetBehavior.from(lessonsSheet)
62-
val sheetStartColor = lessonsSheet.context.getColor(R.color.owl_pink)
62+
val sheetStartColor = lessonsSheet.context.getColor(R.color.owl_pink_500)
6363
val sheetEndColor =
6464
lessonsSheet.context.getColorStateList(R.color.primary_sheet).defaultColor
6565
val sheetBackground = MaterialShapeDrawable(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616

1717
<item
1818
android:alpha="0.96"
19-
android:color="?attr/colorBrandedSurface"/>
19+
android:color="?attr/colorPrimarySurface"/>
2020

2121
</selector>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
<item
1818
android:state_activated="true"
1919
android:alpha="0.80"
20-
android:color="@color/theme_3_primary"/>
20+
android:color="@color/owl_pink_500"/>
2121

2222
</selector>

‎app/src/main/res/drawable/ic_add.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
android:viewportHeight="48">
2121
<path
2222
android:pathData="M24,15c4.95,0 9,4.05 9,9s-4.05,9 -9,9 -9,-4.05 -9,-9 4.05,-9 9,-9z"
23-
android:fillColor="?attr/colorBrandedSurface"
23+
android:fillColor="?attr/colorPrimarySurface"
2424
android:strokeWidth="2"
2525
android:strokeColor="#fff"/>
2626
<path

‎app/src/main/res/layout/course_item.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,6 @@
7777
android:lines="2"
7878
android:ellipsize="end"
7979
android:text="@{course.name}"
80-
android:textColor="?attr/colorOnSurface"
8180
android:textAppearance="?attr/textAppearanceSubtitle1"
8281
app:lineHeight="22sp"/>
8382

‎app/src/main/res/layout/featured_item.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
android:paddingHorizontal="@dimen/grid_2"
9292
android:gravity="center"
9393
android:text="@{course.name}"
94-
android:textColor="?attr/colorOnSurface"
9594
android:textAppearance="?attr/textAppearanceSubtitle1"
9695
app:lineHeight="22sp"/>
9796

‎app/src/main/res/layout/fragment_featured.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222
<androidx.coordinatorlayout.widget.CoordinatorLayout
2323
android:layout_width="match_parent"
2424
android:layout_height="match_parent"
25-
android:background="?attr/colorBrandedSurface"
25+
android:background="?attr/colorPrimarySurface"
2626
app:paddingTopSystemWindowInsets="@{true}"
27-
android:theme="@style/Owl.Theme2"
27+
android:theme="@style/Owl.Blue"
2828
tools:context=".ui.featured.FeaturedFragment">
2929

3030
<com.google.android.material.appbar.AppBarLayout

‎app/src/main/res/layout/fragment_learn.xml

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<androidx.coordinatorlayout.widget.CoordinatorLayout
2929
android:layout_width="match_parent"
3030
android:layout_height="match_parent"
31-
android:theme="@style/Owl.Theme3"
31+
android:theme="@style/Owl.Pink"
3232
tools:context=".ui.learn.LearnFragment">
3333

3434
<androidx.core.widget.NestedScrollView
@@ -110,7 +110,6 @@
110110
android:paddingHorizontal="@dimen/grid_2"
111111
android:gravity="center"
112112
android:text="@{course.name}"
113-
android:textColor="?attr/colorOnSurface"
114113
android:textAppearance="?attr/textAppearanceHeadline4"
115114
app:lineHeight="40sp"/>
116115

@@ -171,8 +170,8 @@
171170
app:layout_constraintTop_toBottomOf="@id/needs"
172171
app:layout_constraintEnd_toEndOf="parent"
173172
app:layout_constraintBottom_toBottomOf="parent"
174-
android:background="?attr/colorBrandedSurface"
175-
android:theme="@style/Owl.Theme2"/>
173+
android:background="?attr/colorPrimarySurface"
174+
android:theme="@style/ThemeOverlay.Owl.Blue"/>
176175

177176
<TextView
178177
android:id="@+id/also_like"
@@ -185,10 +184,10 @@
185184
android:paddingVertical="@dimen/grid_3"
186185
android:gravity="center"
187186
android:textAppearance="?attr/textAppearanceHeadline6"
188-
android:textColor="?attr/colorOnBrandedSurface"
187+
android:textColor="?attr/colorOnPrimarySurface"
189188
app:lineHeight="28sp"
190189
android:text="@string/you_ll_also_like"
191-
android:theme="@style/Owl.Theme2"/>
190+
android:theme="@style/ThemeOverlay.Owl.Blue"/>
192191

193192
<androidx.recyclerview.widget.RecyclerView
194193
android:id="@+id/also_like_list"
@@ -205,7 +204,7 @@
205204
android:orientation="horizontal"
206205
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
207206
app:hasFixedSize="@{true}"
208-
android:theme="@style/Owl.Theme2"/>
207+
android:theme="@style/ThemeOverlay.Owl.Blue"/>
209208

210209
</androidx.constraintlayout.widget.ConstraintLayout>
211210

@@ -257,7 +256,7 @@
257256
android:background="?attr/selectableItemBackgroundBorderless"
258257
android:alpha="0"
259258
app:srcCompat="@drawable/ic_arrow_down"
260-
app:tint="?attr/colorOnBrandedSurface"/>
259+
app:tint="?attr/colorOnPrimarySurface"/>
261260

262261
<View
263262
android:id="@+id/sheet_expand"

‎app/src/main/res/layout/fragment_my_courses.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
<androidx.coordinatorlayout.widget.CoordinatorLayout
2121
android:layout_width="match_parent"
2222
android:layout_height="match_parent"
23-
android:background="?attr/colorBrandedSurface"
23+
android:background="?attr/colorPrimarySurface"
2424
app:paddingTopSystemWindowInsets="@{true}"
25-
android:theme="@style/Owl.Theme2"
25+
android:theme="@style/Owl.Blue"
2626
tools:context=".ui.mycourses.MyCoursesFragment">
2727

2828
<com.google.android.material.appbar.AppBarLayout

0 commit comments

Comments
 (0)