9
9
android : layout_height =" wrap_content"
10
10
android : background =" @color/home_activity_background"
11
11
android : orientation =" vertical"
12
+ android : paddingTop =" @dimen/padding_extra_larger"
12
13
app : layout_behavior =" @string/appbar_scrolling_view_behavior" >
13
14
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"
17
17
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" >
28
19
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" >
32
24
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 >
44
27
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 >
64
36
65
37
<LinearLayout
66
38
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" >
71
55
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 >
76
58
</LinearLayout >
77
59
</LinearLayout >
78
60
</ScrollView >
0 commit comments