Skip to content

Commit 57a87e3

Browse files
committed
Improve small screen layout, moving logo to watermark
1 parent 8ba3b36 commit 57a87e3

File tree

1 file changed

+32
-47
lines changed

1 file changed

+32
-47
lines changed

app/src/main/res/layout/main_layout.xml

Lines changed: 32 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -7,84 +7,69 @@
77
tools:context=".MainActivity">
88

99
<androidx.constraintlayout.widget.Guideline
10-
android:id="@+id/logoGuideline"
10+
android:id="@+id/statusGuideline"
1111
android:layout_width="wrap_content"
1212
android:layout_height="wrap_content"
1313
android:orientation="horizontal"
14-
app:layout_constraintGuide_percent="0.16" />
14+
app:layout_constraintGuide_percent="0.2" />
1515

16-
<LinearLayout
17-
android:id="@+id/headingContainer"
16+
<ImageView
17+
android:id="@+id/logoImage"
1818
android:layout_width="match_parent"
19-
android:layout_height="wrap_content"
20-
android:paddingBottom="20dp"
21-
app:layout_constraintBottom_toBottomOf="@+id/logoGuideline"
22-
app:layout_constraintTop_toTopOf="@+id/logoGuideline"
23-
app:layout_constraintStart_toStartOf="parent"
24-
app:layout_constraintEnd_toEndOf="parent">
25-
26-
<ImageView
27-
android:id="@+id/logoImage"
28-
android:layout_width="wrap_content"
29-
android:layout_height="wrap_content"
30-
android:paddingStart="16dp"
31-
android:contentDescription="The HTTP Toolkit Logo"
32-
app:srcCompat="@drawable/ic_transparent_icon" />
19+
android:layout_height="match_parent"
20+
android:alpha="0.3"
21+
android:tint="#fff"
22+
android:layout_marginBottom="120dp"
23+
app:srcCompat="@drawable/ic_transparent_icon"
24+
tools:ignore="ContentDescription" />
3325

34-
<View
35-
android:layout_width="0dp"
36-
android:layout_height="0dp"
37-
android:layout_weight="1" />
38-
39-
<TextView
40-
android:id="@+id/statusText"
41-
style="@style/StatusText"
42-
android:layout_width="wrap_content"
43-
android:layout_height="wrap_content"
44-
android:layout_gravity="center"
45-
android:text="@string/disconnected_status"
46-
android:textSize="30sp" />
47-
48-
<View
49-
android:layout_width="0dp"
50-
android:layout_height="0dp"
51-
android:layout_weight="1" />
52-
53-
</LinearLayout>
26+
<TextView
27+
android:id="@+id/statusText"
28+
style="@style/StatusText"
29+
android:layout_width="wrap_content"
30+
android:layout_height="wrap_content"
31+
android:layout_gravity="center"
32+
android:text="@string/disconnected_status"
33+
android:textSize="30sp"
34+
app:layout_constraintBottom_toBottomOf="@+id/statusGuideline"
35+
app:layout_constraintTop_toTopOf="@+id/statusGuideline"
36+
app:layout_constraintEnd_toEndOf="parent"
37+
app:layout_constraintStart_toStartOf="parent"/>
5438

5539
<LinearLayout
5640
android:id="@+id/statusDetailContainer"
5741
android:layout_width="wrap_content"
5842
android:layout_height="wrap_content"
43+
android:layout_marginTop="16dp"
5944
android:layout_marginStart="16dp"
6045
android:layout_marginEnd="16dp"
6146
app:layout_constrainedWidth="true"
6247
app:layout_constraintEnd_toEndOf="parent"
6348
app:layout_constraintStart_toStartOf="parent"
64-
app:layout_constraintTop_toBottomOf="@+id/headingContainer"
49+
app:layout_constraintTop_toBottomOf="@+id/statusText"
6550
android:orientation="vertical" />
6651

6752
<com.google.android.material.card.MaterialCardView
68-
android:layout_height="wrap_content"
53+
android:id="@+id/materialCardView"
54+
style="@style/PortraitButtonsCard"
6955
android:layout_width="match_parent"
56+
android:layout_height="wrap_content"
7057
android:layout_marginStart="16dp"
7158
android:layout_marginEnd="16dp"
7259
app:layout_constraintBottom_toBottomOf="parent"
7360
app:layout_constraintEnd_toEndOf="parent"
74-
app:layout_constraintStart_toStartOf="parent"
75-
style="@style/PortraitButtonsCard"
76-
>
61+
app:layout_constraintStart_toStartOf="parent">
62+
7763
<LinearLayout
7864
android:id="@+id/buttonLayoutContainer"
7965
android:layout_width="match_parent"
8066
android:layout_height="wrap_content"
67+
android:clipToPadding="false"
8168
android:orientation="vertical"
8269
android:paddingStart="16dp"
83-
android:paddingEnd="16dp"
8470
android:paddingTop="12dp"
85-
android:paddingBottom="10dp"
86-
android:clipToPadding="false">
87-
</LinearLayout>
71+
android:paddingEnd="16dp"
72+
android:paddingBottom="10dp" />
8873
</com.google.android.material.card.MaterialCardView>
8974

9075
</androidx.constraintlayout.widget.ConstraintLayout>

0 commit comments

Comments
 (0)