Skip to content

Commit

Permalink
Improve small screen layout, moving logo to watermark
Browse files Browse the repository at this point in the history
  • Loading branch information
@pimterry
pimterry committed Jun 19, 2020
1 parent 8ba3b36 commit 57a87e3
Showing 1 changed file with 32 additions and 47 deletions.
79 changes: 32 additions & 47 deletions app/src/main/res/layout/main_layout.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,84 +7,69 @@
tools:context=".MainActivity">

<androidx.constraintlayout.widget.Guideline
android:id="@+id/logoGuideline"
android:id="@+id/statusGuideline"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal"
app:layout_constraintGuide_percent="0.16" />
app:layout_constraintGuide_percent="0.2" />

<LinearLayout
android:id="@+id/headingContainer"
<ImageView
android:id="@+id/logoImage"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingBottom="20dp"
app:layout_constraintBottom_toBottomOf="@+id/logoGuideline"
app:layout_constraintTop_toTopOf="@+id/logoGuideline"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent">

<ImageView
android:id="@+id/logoImage"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingStart="16dp"
android:contentDescription="The HTTP Toolkit Logo"
app:srcCompat="@drawable/ic_transparent_icon" />
android:layout_height="match_parent"
android:alpha="0.3"
android:tint="#fff"
android:layout_marginBottom="120dp"
app:srcCompat="@drawable/ic_transparent_icon"
tools:ignore="ContentDescription" />

<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />

<TextView
android:id="@+id/statusText"
style="@style/StatusText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/disconnected_status"
android:textSize="30sp" />

<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />

</LinearLayout>
<TextView
android:id="@+id/statusText"
style="@style/StatusText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/disconnected_status"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="@+id/statusGuideline"
app:layout_constraintTop_toTopOf="@+id/statusGuideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<LinearLayout
android:id="@+id/statusDetailContainer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constrainedWidth="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/headingContainer"
app:layout_constraintTop_toBottomOf="@+id/statusText"
android:orientation="vertical" />

<com.google.android.material.card.MaterialCardView
android:layout_height="wrap_content"
android:id="@+id/materialCardView"
style="@style/PortraitButtonsCard"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
style="@style/PortraitButtonsCard"
>
app:layout_constraintStart_toStartOf="parent">

<LinearLayout
android:id="@+id/buttonLayoutContainer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipToPadding="false"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:paddingTop="12dp"
android:paddingBottom="10dp"
android:clipToPadding="false">
</LinearLayout>
android:paddingEnd="16dp"
android:paddingBottom="10dp" />
</com.google.android.material.card.MaterialCardView>

</androidx.constraintlayout.widget.ConstraintLayout>

0 comments on commit 57a87e3

Please sign in to comment.