Skip to content

Commit

Permalink
refactor: update login flow (#74)
Browse files Browse the repository at this point in the history
* refactor: increase the margin on a few details controls

Increase the margin on the top image so its further from the top of the screen, and increase the
margin on the login button so it more closely matches the material design

* refactor: update the syncing screen ui

Move the progress bar below the body text as it makes it a bit easier to see
  • Loading branch information
Chesire authored Jan 25, 2020
1 parent 36a6b30 commit b75e257
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 12 deletions.
4 changes: 2 additions & 2 deletions app/src/main/res/layout/fragment_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
android:id="@+id/detailsHeaderImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/half_margin"
android:layout_marginTop="@dimen/double_margin"
android:contentDescription="@string/login_header_image_content_description"
android:src="@drawable/ic_blackcat"
app:layout_constraintEnd_toEndOf="parent"
Expand Down Expand Up @@ -105,7 +105,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/half_margin">
android:layout_margin="@dimen/full_margin">

<com.google.android.material.button.MaterialButton
android:id="@+id/detailsLoginButton"
Expand Down
23 changes: 13 additions & 10 deletions app/src/main/res/layout/fragment_syncing.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,6 @@
app:layout_constraintVertical_bias="0.2"
tools:src="@drawable/ic_account_circle" />

<ProgressBar
android:layout_width="0dp"
android:layout_height="0dp"
android:indeterminateOnly="true"
android:indeterminateTint="@color/colorPrimaryDark"
app:layout_constraintBottom_toBottomOf="@id/syncingProfileImage"
app:layout_constraintEnd_toEndOf="@id/syncingProfileImage"
app:layout_constraintStart_toStartOf="@id/syncingProfileImage"
app:layout_constraintTop_toTopOf="@id/syncingProfileImage" />

<TextView
android:id="@+id/syncingSyncText"
style="@style/TextAppearance.MaterialComponents.Headline5"
Expand All @@ -40,4 +30,17 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/syncingProfileImage" />

<ProgressBar
style="@style/Widget.AppCompat.ProgressBar.Horizontal"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="@dimen/double_margin"
android:layout_marginTop="@dimen/full_margin"
android:layout_marginEnd="@dimen/double_margin"
android:indeterminateOnly="true"
android:indeterminateTint="@color/colorPrimaryDark"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/syncingSyncText" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions core/src/main/res/values/dimens.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<dimen name="half_margin">8dp</dimen>
<dimen name="full_margin">16dp</dimen>
<dimen name="double_margin">32dp</dimen>

<dimen name="login_text_drawable_padding">8dp</dimen>

Expand Down

0 comments on commit b75e257

Please sign in to comment.