Skip to content

Commit

Permalink
display 'now' in lower case letters in directions form
Browse files Browse the repository at this point in the history
  • Loading branch information
ialokim authored and grote committed Oct 24, 2020
1 parent fe70367 commit 7b1866e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class DirectionsFragment : TransportrFragment() {
if (calendar == null) return
when {
isNow(calendar) -> {
time.setText(R.string.now)
time.setText(R.string.now_small)
date.visibility = GONE
}
isToday(calendar) -> {
Expand Down
9 changes: 4 additions & 5 deletions app/src/main/res/layout/fragment_directions_form.xml
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,11 @@
android:paddingEnd="4dp"
android:paddingRight="4dp"
android:gravity="center"
android:text="@string/trip_dep"
android:textColor="@color/md_grey_300"
app:layout_constraintStart_toEndOf="@+id/timeIcon"
app:layout_constraintTop_toTopOf="@+id/timeIcon"
app:layout_constraintBottom_toBottomOf="@+id/timeIcon"
tools:text="Departure"/>
tools:text="@string/trip_dep"/>

<TextView
android:id="@+id/date"
Expand All @@ -168,19 +167,19 @@
app:layout_constraintBottom_toTopOf="@+id/time"
app:layout_constraintTop_toTopOf="@+id/timeIcon"
tools:text="2042-12-23"
tools:visibility="visible"/>
tools:visibility="gone"/>

<TextView
android:id="@+id/time"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:gravity="center"
android:text="@string/now"
android:textColor="@color/md_grey_300"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/timeBarrier"
app:layout_constraintStart_toEndOf="@+id/departure"
app:layout_constraintTop_toBottomOf="@+id/date"/>
app:layout_constraintTop_toBottomOf="@+id/date"
tools:text="@string/now_small"/>

<androidx.constraintlayout.widget.Barrier
android:id="@+id/timeBarrier"
Expand Down

0 comments on commit 7b1866e

Please sign in to comment.