Skip to content

Commit 7a13cbc

Browse files
rob729jddeep
authored andcommitted
fix: Landscape screen of home screen
1 parent 798a29a commit 7a13cbc

File tree

1 file changed

+36
-54
lines changed

1 file changed

+36
-54
lines changed

app/src/main/res/layout-land/content_main.xml

Lines changed: 36 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -9,70 +9,52 @@
99
android:layout_height="wrap_content"
1010
android:background="@color/home_activity_background"
1111
android:orientation="vertical"
12+
android:paddingTop="@dimen/padding_extra_larger"
1213
app:layout_behavior="@string/appbar_scrolling_view_behavior">
1314

14-
<android.support.v7.widget.CardView
15-
android:id="@+id/cardView"
16-
android:layout_width="@dimen/connection_card_layout_width"
15+
<LinearLayout
16+
android:layout_width="match_parent"
1717
android:layout_height="wrap_content"
18-
android:layout_gravity="center"
19-
android:layout_marginStart="@dimen/layout_margin_extra_large"
20-
android:layout_marginLeft="@dimen/layout_margin_extra_large"
21-
android:layout_marginTop="@dimen/connection_card_margin_top"
22-
android:layout_marginEnd="@dimen/layout_margin_extra_large"
23-
android:layout_marginRight="@dimen/layout_margin_extra_large"
24-
app:cardBackgroundColor="@android:color/white"
25-
app:cardCornerRadius="@dimen/card_corner_radius"
26-
app:cardElevation="@dimen/card_elevation"
27-
app:cardUseCompatPadding="true">
18+
android:orientation="horizontal">
2819

29-
<android.support.constraint.ConstraintLayout
30-
android:layout_width="match_parent"
31-
android:layout_height="wrap_content">
20+
<FrameLayout
21+
android:layout_width="@dimen/spacing_none"
22+
android:layout_height="wrap_content"
23+
android:layout_weight="1">
3224

33-
<ImageView
34-
android:id="@+id/deviceStatusIconImageView"
35-
android:layout_width="@dimen/bin_value_text_padding"
36-
android:layout_height="wrap_content"
37-
android:layout_marginEnd="@dimen/layout_margin_large"
38-
android:layout_marginRight="@dimen/layout_margin_large"
39-
android:adjustViewBounds="true"
40-
app:layout_constraintBottom_toBottomOf="@+id/deviceStatusTextView"
41-
app:layout_constraintEnd_toStartOf="@+id/deviceStatusTextView"
42-
app:layout_constraintTop_toTopOf="@+id/deviceStatusTextView"
43-
app:srcCompat="@drawable/ic_offline_dot" />
25+
<include layout="@layout/card_focus" />
26+
</FrameLayout>
4427

45-
<TextView
46-
android:id="@+id/deviceStatusTextView"
47-
android:layout_width="wrap_content"
48-
android:layout_height="wrap_content"
49-
android:layout_marginStart="@dimen/layout_margin_large"
50-
android:layout_marginLeft="@dimen/layout_margin_large"
51-
android:layout_marginTop="@dimen/layout_margin_large"
52-
android:layout_marginEnd="@dimen/layout_margin_medium"
53-
android:layout_marginRight="@dimen/layout_margin_medium"
54-
android:layout_marginBottom="@dimen/layout_margin_large"
55-
android:gravity="center"
56-
android:text="@string/device_is_not_connected"
57-
android:textAppearance="@style/Base.TextAppearance.AppCompat.Medium"
58-
app:layout_constraintBottom_toBottomOf="parent"
59-
app:layout_constraintEnd_toEndOf="parent"
60-
app:layout_constraintStart_toStartOf="parent"
61-
app:layout_constraintTop_toTopOf="parent" />
62-
</android.support.constraint.ConstraintLayout>
63-
</android.support.v7.widget.CardView>
28+
<FrameLayout
29+
android:layout_width="@dimen/spacing_none"
30+
android:layout_height="wrap_content"
31+
android:layout_weight="1">
32+
33+
<include layout="@layout/card_relax" />
34+
</FrameLayout>
35+
</LinearLayout>
6436

6537
<LinearLayout
6638
android:layout_width="match_parent"
67-
android:layout_height="0dp"
68-
android:layout_weight="0.8"
69-
android:gravity="center"
70-
android:orientation="vertical">
39+
android:layout_height="wrap_content"
40+
android:orientation="horizontal"
41+
android:layout_marginTop="@dimen/layout_margin_moderate">
42+
43+
<FrameLayout
44+
android:layout_width="@dimen/spacing_none"
45+
android:layout_height="wrap_content"
46+
android:layout_weight="1">
47+
48+
<include layout="@layout/card_mem_graph" />
49+
</FrameLayout>
50+
51+
<FrameLayout
52+
android:layout_width="@dimen/spacing_none"
53+
android:layout_height="wrap_content"
54+
android:layout_weight="1">
7155

72-
<include layout="@layout/card_focus" />
73-
<include layout="@layout/card_relax" />
74-
<include layout="@layout/card_mem_graph" />
75-
<include layout="@layout/card_meditation" />
56+
<include layout="@layout/card_meditation" />
57+
</FrameLayout>
7658
</LinearLayout>
7759
</LinearLayout>
7860
</ScrollView>

0 commit comments

Comments
 (0)