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

Commit c3bc0bd

Browse files
hunterstichhunterstich
committed
Style resource renaming and consistency
- Changed color.xml to just hold Reply's palette - Fixed pre-Q navigation bar coloring - Renamed layout keylines to the 'grid' naming - Fixed hard coded motion duration in EmailSwipeActionDrawable to use motion.xml value Change-Id: I33f3b23db8509b8870db7343b090c61bf9df1093
1 parent 071c40e commit c3bc0bd

24 files changed

+193
-187
lines changed

‎app/src/main/java/com/materialstudies/reply/ui/home/EmailSwipeActionDrawable.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import com.materialstudies.reply.R
3232
import com.materialstudies.reply.util.getColorFromAttr
3333
import com.materialstudies.reply.util.lerp
3434
import com.materialstudies.reply.util.lerpArgb
35+
import kotlin.math.abs
3536
import kotlin.math.hypot
3637

3738
/**
@@ -57,7 +58,7 @@ class EmailSwipeActionDrawable(context: Context) : Drawable() {
5758
context,
5859
R.drawable.ic_twotone_star_on_background
5960
)!!
60-
private val iconMargin = context.resources.getDimension(R.dimen.keyline_6)
61+
private val iconMargin = context.resources.getDimension(R.dimen.grid_4)
6162
private val iconIntrinsicWidth = icon.intrinsicWidth
6263
private val iconIntrinsicHeight = icon.intrinsicHeight
6364

@@ -76,6 +77,7 @@ class EmailSwipeActionDrawable(context: Context) : Drawable() {
7677
}
7778
}
7879
private var progressAnim: ValueAnimator? = null
80+
private val dur = context.resources.getInteger(R.integer.reply_motion_short_duration)
7981
private val interp = FastOutSlowInInterpolator()
8082

8183
override fun onBoundsChange(bounds: Rect?) {
@@ -116,7 +118,7 @@ class EmailSwipeActionDrawable(context: Context) : Drawable() {
116118
progress = animatedValue as Float
117119
}
118120
interpolator = interp
119-
duration = (Math.abs(newProgress - initialProgress) * 250F).toLong()
121+
duration = (abs(newProgress - initialProgress) * dur).toLong()
120122
}
121123
progressAnim?.start()
122124
return newProgress == initialProgress

‎app/src/main/java/com/materialstudies/reply/ui/nav/BottomNavDrawerFragment.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@ class BottomNavDrawerFragment :
115115
shapeAppearanceModel = shapeAppearanceModel.toBuilder()
116116
.setTopEdge(
117117
SemiCircleEdgeCutoutTreatment(
118-
resources.getDimension(R.dimen.keyline_3),
119-
resources.getDimension(R.dimen.keyline_5),
118+
resources.getDimension(R.dimen.grid_1),
119+
resources.getDimension(R.dimen.grid_3),
120120
0F,
121121
resources.getDimension(R.dimen.navigation_drawer_profile_image_size_padded)
122122
)

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,15 @@
3131
android:layout_width="match_parent"
3232
android:layout_height="wrap_content"
3333
android:minHeight="?attr/listPreferredItemHeight"
34-
android:paddingHorizontal="@dimen/keyline_4"
34+
android:paddingHorizontal="@dimen/grid_2"
3535
android:onClick="@{() -> accountListener.onAccountClicked(account)}"
3636
android:background="?attr/selectableItemBackground">
3737

3838
<ImageView
3939
android:id="@+id/account_profile_image_view"
4040
android:layout_width="@dimen/navigation_drawer_profile_image_size"
4141
android:layout_height="@dimen/navigation_drawer_profile_image_size"
42-
android:padding="@dimen/keyline_3"
42+
android:padding="@dimen/grid_1"
4343
app:layout_constraintStart_toStartOf="parent"
4444
app:layout_constraintTop_toTopOf="parent"
4545
app:layout_constraintBottom_toBottomOf="parent"
@@ -51,7 +51,7 @@
5151
android:id="@+id/account_address_text_view"
5252
android:layout_width="0dp"
5353
android:layout_height="wrap_content"
54-
android:layout_marginHorizontal="@dimen/keyline_4"
54+
android:layout_marginHorizontal="@dimen/grid_2"
5555
app:layout_constraintBottom_toBottomOf="parent"
5656
app:layout_constraintEnd_toEndOf="parent"
5757
app:layout_constraintStart_toEndOf="@id/account_profile_image_view"
@@ -62,7 +62,7 @@
6262
android:textColor="@color/color_navigation_drawer_menu_item"
6363
app:drawableTint="@color/color_navigation_drawer_menu_item"
6464
app:drawableRight="@{account.checkedIcon}"
65-
android:drawablePadding="@dimen/keyline_5"
65+
android:drawablePadding="@dimen/grid_3"
6666
android:lines="1"
6767
android:ellipsize="end"
6868
tools:text="[email protected]" />

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
android:id="@+id/bottom_app_bar_content_container"
5555
android:layout_width="wrap_content"
5656
android:layout_height="@dimen/min_touch_target_size"
57-
android:layout_marginVertical="@dimen/keyline_2"
58-
android:paddingHorizontal="@dimen/keyline_2"
57+
android:layout_marginVertical="@dimen/grid_0_5"
58+
android:paddingHorizontal="@dimen/grid_0_5"
5959
android:orientation="horizontal"
6060
android:gravity="center_vertical"
6161
android:foreground="@drawable/bottom_app_bar_title_foreground">
@@ -72,7 +72,7 @@
7272
android:id="@+id/bottom_app_bar_logo"
7373
android:layout_width="@dimen/bottom_app_bar_logo_size"
7474
android:layout_height="@dimen/bottom_app_bar_logo_size"
75-
android:layout_marginLeft="@dimen/keyline_3"
75+
android:layout_marginLeft="@dimen/grid_1"
7676
android:contentDescription="@string/bottom_app_bar_logo_content_desc"
7777
android:layout_gravity="center_vertical"
7878
app:srcCompat="@drawable/ic_reply_logo_on_branded" />
@@ -83,8 +83,8 @@
8383
android:layout_width="wrap_content"
8484
android:layout_height="wrap_content"
8585
android:layout_gravity="center_vertical"
86-
android:layout_marginLeft="@dimen/keyline_3"
87-
android:layout_marginRight="@dimen/keyline_3"
86+
android:layout_marginLeft="@dimen/grid_1"
87+
android:layout_marginRight="@dimen/grid_1"
8888
android:text="@string/navigation_inbox"
8989
android:textColor="?attr/colorControlNormal"/>
9090

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:id="@+id/attachment_image_view"
2626
android:layout_height="200dp"
2727
android:layout_width="match_parent"
28-
android:layout_margin="@dimen/keyline_1"
28+
android:layout_margin="@dimen/grid_0_25"
2929
android:contentDescription="@{emailAttachment.contentDesc}"
3030
app:glideSrc="@{emailAttachment.resId}"
3131
app:glideCenterCrop="@{true}" />

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:id="@+id/attachment_image_view"
2626
android:layout_height="match_parent"
2727
android:layout_width="150dp"
28-
android:layout_margin="@dimen/keyline_1"
28+
android:layout_margin="@dimen/grid_0_25"
2929
android:contentDescription="@{emailAttachment.contentDesc}"
3030
app:glideSrc="@{emailAttachment.resId}"
3131
app:glideCenterCrop="@{true}" />

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

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
android:id="@+id/email_frame"
3232
android:layout_height="wrap_content"
3333
android:layout_width="match_parent"
34-
android:layout_marginVertical="@dimen/keyline_1"
35-
android:layout_marginHorizontal="@dimen/keyline_2"
34+
android:layout_marginVertical="@dimen/grid_0_25"
35+
android:layout_marginHorizontal="@dimen/grid_0_5"
3636
android:background="?attr/colorSecondary">
3737

3838
<com.google.android.material.card.MaterialCardView
@@ -50,17 +50,17 @@
5050
<androidx.constraintlayout.widget.ConstraintLayout
5151
android:layout_width="match_parent"
5252
android:layout_height="wrap_content"
53-
android:paddingTop="@dimen/keyline_4"
54-
android:paddingBottom="@dimen/keyline_4">
53+
android:paddingTop="@dimen/grid_2"
54+
android:paddingBottom="@dimen/grid_2">
5555

5656
<TextView
5757
android:textAppearance="?attr/textAppearanceBody2"
5858
android:id="@+id/sender_text_view"
5959
android:layout_width="0dp"
6060
android:layout_height="wrap_content"
61-
android:layout_marginTop="@dimen/keyline_3"
62-
android:layout_marginStart="@dimen/keyline_4"
63-
android:layout_marginEnd="@dimen/keyline_4"
61+
android:layout_marginTop="@dimen/grid_1"
62+
android:layout_marginStart="@dimen/grid_2"
63+
android:layout_marginEnd="@dimen/grid_2"
6464
android:maxLines="1"
6565
android:text="@{email.senderPreview}"
6666
tools:text="Google Express - 12m"
@@ -72,11 +72,11 @@
7272
android:id="@+id/subject_text_view"
7373
android:layout_width="0dp"
7474
android:layout_height="wrap_content"
75-
android:layout_marginTop="@dimen/keyline_3"
76-
android:layout_marginEnd="@dimen/keyline_4"
77-
android:layout_marginStart="@dimen/keyline_4"
75+
android:layout_marginTop="@dimen/grid_1"
76+
android:layout_marginEnd="@dimen/grid_2"
77+
android:layout_marginStart="@dimen/grid_2"
7878
android:textAppearance="?attr/textAppearanceHeadline5"
79-
app:layout_goneMarginEnd="@dimen/keyline_4"
79+
app:layout_goneMarginEnd="@dimen/grid_2"
8080
android:maxLines="1"
8181
android:text="@{email.subject}"
8282
tools:text="Package Shipped!"
@@ -89,9 +89,9 @@
8989
android:id="@+id/body_preview_text_view"
9090
android:layout_width="0dp"
9191
android:layout_height="wrap_content"
92-
android:layout_marginTop="@dimen/keyline_3"
93-
android:layout_marginStart="@dimen/keyline_4"
94-
android:layout_marginEnd="@dimen/keyline_4"
92+
android:layout_marginTop="@dimen/grid_1"
93+
android:layout_marginStart="@dimen/grid_2"
94+
android:layout_marginEnd="@dimen/grid_2"
9595
android:maxLines="2"
9696
android:text="@{email.body}"
9797
tools:text="Cucumber mask facial has shipped. It'll be on your front door by the end of the week!"
@@ -104,7 +104,7 @@
104104
android:id="@+id/attachment_recycler_view"
105105
android:layout_width="match_parent"
106106
android:layout_height="96dp"
107-
android:layout_marginTop="@dimen/keyline_4"
107+
android:layout_marginTop="@dimen/grid_2"
108108
app:layout_constraintStart_toStartOf="parent"
109109
app:layout_constraintEnd_toEndOf="parent"
110110
app:layout_constraintTop_toBottomOf="@id/body_preview_text_view"
@@ -120,9 +120,9 @@
120120
android:id="@+id/sender_profile_image_view"
121121
android:layout_width="@dimen/email_sender_profile_image_size"
122122
android:layout_height="@dimen/email_sender_profile_image_size"
123-
android:layout_marginTop="@dimen/keyline_3"
124-
android:layout_marginStart="@dimen/keyline_4"
125-
android:layout_marginEnd="@dimen/keyline_4"
123+
android:layout_marginTop="@dimen/grid_1"
124+
android:layout_marginStart="@dimen/grid_2"
125+
android:layout_marginEnd="@dimen/grid_2"
126126
android:contentDescription="@string/email_sender_profile_content_desc"
127127
app:layout_constraintEnd_toEndOf="parent"
128128
app:layout_constraintTop_toTopOf="parent"

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@
4848
android:id="@+id/account_recycler_view"
4949
android:layout_width="match_parent"
5050
android:layout_height="wrap_content"
51-
android:paddingTop="@dimen/keyline_5"
52-
android:paddingBottom="@dimen/keyline_5"
51+
android:paddingTop="@dimen/grid_3"
52+
android:paddingBottom="@dimen/grid_3"
5353
app:paddingBottomSystemWindowInsets="@{true}"
5454
android:nestedScrollingEnabled="false"
5555
android:alpha="0.0"
@@ -61,7 +61,7 @@
6161
android:id="@+id/profile_image_view"
6262
android:layout_width="@dimen/navigation_drawer_profile_image_size"
6363
android:layout_height="@dimen/navigation_drawer_profile_image_size"
64-
android:padding="@dimen/keyline_3"
64+
android:padding="@dimen/grid_1"
6565
android:layout_gravity="center|top"
6666
android:foreground="?attr/actionBarItemBackground"
6767
android:contentDescription="@string/bottom_nav_drawer_profile_image_content_desc"
@@ -75,15 +75,15 @@
7575
android:layout_width="match_parent"
7676
android:layout_height="match_parent"
7777
android:orientation="vertical"
78-
android:layout_marginTop="@dimen/keyline_5"
79-
android:paddingTop="@dimen/keyline_5"
80-
android:paddingBottom="@dimen/keyline_6">
78+
android:layout_marginTop="@dimen/grid_3"
79+
android:paddingTop="@dimen/grid_3"
80+
android:paddingBottom="@dimen/grid_4">
8181

8282
<androidx.recyclerview.widget.RecyclerView
8383
android:id="@+id/nav_recycler_view"
8484
android:layout_width="match_parent"
8585
android:layout_height="wrap_content"
86-
android:paddingTop="@dimen/keyline_5"
86+
android:paddingTop="@dimen/grid_3"
8787
android:paddingBottom="@dimen/bottom_app_bar_height"
8888
android:clipToPadding="false"
8989
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"

0 commit comments

Comments
 (0)