Skip to content

Commit b4a9b9b

Browse files
SyntaxSpinSyntaxSpin
committed
chore : trying to redesign buttons
1 parent 54d0f24 commit b4a9b9b

1 file changed

Lines changed: 71 additions & 86 deletions

File tree

‎app/src/main/res/layout/fragment_main.xml‎

Lines changed: 71 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -4,131 +4,116 @@
44
xmlns:android="http://schemas.android.com/apk/res/android"
55
xmlns:app="http://schemas.android.com/apk/res-auto"
66
xmlns:tools="http://schemas.android.com/tools"
7-
android:layout_height="match_parent"
7+
android:id="@+id/drawer"
88
android:layout_width="match_parent"
9-
android:id="@+id/drawer">
10-
9+
android:layout_height="match_parent">
1110

1211
<androidx.coordinatorlayout.widget.CoordinatorLayout
13-
android:layout_height="match_parent"
14-
android:layout_width="match_parent">
15-
12+
android:layout_width="match_parent"
13+
android:layout_height="match_parent">
1614

1715
<com.google.android.material.appbar.AppBarLayout
1816
android:id="@+id/appBarLayout"
1917
android:layout_width="match_parent"
2018
android:layout_height="wrap_content">
2119

20+
<com.google.android.material.appbar.MaterialToolbar
21+
android:id="@+id/toolbar"
22+
android:layout_width="match_parent"
23+
android:layout_height="?attr/actionBarSize"
24+
app:title="@string/app_name"
25+
app:menu="@menu/menu_main" />
26+
<com.google.android.material.divider.MaterialDivider
27+
android:layout_width="match_parent"
28+
android:layout_height="wrap_content"
29+
/>
2230
</com.google.android.material.appbar.AppBarLayout>
2331

24-
<LinearLayout
25-
android:layout_width="match_parent"
26-
android:layout_height="match_parent"
27-
app:layout_behavior="@string/appbar_scrolling_view_behavior">
28-
29-
<com.sparkleseditor.components.ExpandableLayout
30-
android:id="@+id/options"
32+
<LinearLayout
3133
android:layout_width="match_parent"
32-
android:layout_height="wrap_content"
33-
android:orientation="horizontal"
34-
android:fitsSystemWindows="true"
35-
android:background="?colorSurface">
36-
<LinearLayout
37-
android:id="@+id/linear"
34+
android:layout_height="match_parent"
35+
android:orientation="vertical"
36+
app:layout_behavior="@string/appbar_scrolling_view_behavior">
37+
38+
<com.sparkleseditor.components.ExpandableLayout
39+
android:id="@+id/options"
3840
android:layout_width="match_parent"
39-
android:layout_height="?attr/actionBarSize"
40-
android:orientation="horizontal"
41-
android:gravity="center"
41+
android:layout_height="wrap_content"
4242
android:background="?colorSurface">
43+
4344
<LinearLayout
45+
android:id="@+id/linear"
4446
android:layout_width="match_parent"
45-
android:layout_weight="1"
46-
android:layout_height="wrap_content"
47-
android:gravity="center">
47+
android:layout_height="?attr/actionBarSize"
48+
android:orientation="horizontal"
49+
android:gravity="center"
50+
android:weightSum="4"
51+
android:background="?colorSurface">
52+
4853
<Button
4954
android:id="@+id/file"
50-
android:layout_width="wrap_content"
51-
android:layout_height="wrap_content"
5255
style="?attr/materialIconButtonStyle"
53-
app:icon="@drawable/ic_draft_rounded_filled_24dp" />
54-
</LinearLayout>
55-
<LinearLayout
56-
android:layout_width="match_parent"
57-
android:layout_weight="1"
58-
android:layout_height="wrap_content"
59-
android:gravity="center">
56+
android:layout_width="0dp"
57+
android:layout_height="wrap_content"
58+
android:layout_weight="1"
59+
app:icon="@drawable/ic_draft_rounded_filled_24dp"
60+
app:iconGravity="textStart" />
61+
6062
<Button
6163
android:id="@+id/term"
62-
android:layout_width="wrap_content"
63-
android:layout_height="wrap_content"
6464
style="?attr/materialIconButtonStyle"
65-
app:icon="@drawable/ic_terminal_rounded_filled_24dp" />
66-
</LinearLayout>
67-
<LinearLayout
68-
android:layout_width="match_parent"
69-
android:layout_weight="1"
70-
android:layout_height="wrap_content"
71-
android:gravity="center">
65+
android:layout_width="0dp"
66+
android:layout_height="wrap_content"
67+
android:layout_weight="1"
68+
app:icon="@drawable/ic_terminal_rounded_filled_24dp"
69+
app:iconGravity="textStart" />
70+
7271
<Button
7372
android:id="@+id/search"
74-
android:layout_width="wrap_content"
75-
android:layout_height="wrap_content"
76-
android:contentDescription="Clear"
7773
style="?attr/materialIconButtonStyle"
78-
app:icon="@drawable/ic_search_rounded_filled_24dp" />
79-
</LinearLayout>
80-
<LinearLayout
81-
android:layout_width="match_parent"
82-
android:layout_weight="1"
83-
android:layout_height="wrap_content"
84-
android:gravity="center">
74+
android:layout_width="0dp"
75+
android:layout_height="wrap_content"
76+
android:layout_weight="1"
77+
app:icon="@drawable/ic_search_rounded_filled_24dp"
78+
app:iconGravity="textStart" />
79+
8580
<Button
8681
android:id="@+id/settings"
8782
style="?attr/materialIconButtonStyle"
88-
android:layout_width="wrap_content"
83+
android:layout_width="0dp"
8984
android:layout_height="wrap_content"
90-
android:contentDescription="Settings"
91-
app:icon="@drawable/ic_settings_rounded_filled_24dp" />
92-
</LinearLayout>
93-
</LinearLayout>
94-
</com.sparkleseditor.components.ExpandableLayout>
95-
96-
85+
android:layout_weight="1"
86+
app:icon="@drawable/ic_settings_rounded_filled_24dp"
87+
app:iconGravity="textStart" />
9788

89+
</LinearLayout>
90+
</com.sparkleseditor.components.ExpandableLayout>
91+
<com.google.android.material.tabs.TabLayout
92+
android:id="@+id/tabLayout"
93+
android:layout_width="match_parent"
94+
android:layout_height="wrap_content" />
95+
</LinearLayout>
9896

99-
</LinearLayout>
100-
101-
<com.google.android.material.floatingactionbutton.FloatingActionButton
102-
android:id="@+id/fab"
103-
android:layout_width="wrap_content"
104-
android:layout_height="wrap_content"
105-
android:layout_gravity="bottom|end"
106-
android:layout_marginEnd="@dimen/fab_margin"
107-
android:layout_marginBottom="16dp"
108-
app:srcCompat="@android:drawable/ic_dialog_email" />
109-
110-
<com.google.android.material.appbar.MaterialToolbar
111-
android:id="@+id/toolbar"
112-
android:layout_width="match_parent"
113-
android:layout_height="?attr/actionBarSize"
114-
app:layout_anchor="@+id/appBarLayout"
115-
app:layout_anchorGravity="center"
116-
app:menu="@menu/menu_main"
117-
app:title="@string/app_name" />
97+
<com.google.android.material.floatingactionbutton.FloatingActionButton
98+
android:id="@+id/fab"
99+
android:layout_width="wrap_content"
100+
android:layout_height="wrap_content"
101+
android:layout_gravity="bottom|end"
102+
android:layout_margin="16dp"
103+
android:contentDescription="Play"
104+
app:srcCompat="@android:drawable/ic_dialog_email" />
118105

119106
</androidx.coordinatorlayout.widget.CoordinatorLayout>
107+
120108
<com.google.android.material.navigation.NavigationView
121109
android:layout_width="wrap_content"
122110
android:layout_height="match_parent"
123-
android:layout_gravity="start">
124-
125-
</com.google.android.material.navigation.NavigationView>
111+
android:layout_gravity="start" />
126112

127113
<com.google.android.material.navigation.NavigationView
114+
android:id="@+id/right_drawer_menu"
128115
android:layout_width="wrap_content"
129116
android:layout_height="match_parent"
130-
android:layout_gravity="end"
131-
android:id="@+id/right_drawer_menu">
117+
android:layout_gravity="end" />
132118

133-
</com.google.android.material.navigation.NavigationView>
134119
</androidx.drawerlayout.widget.DrawerLayout>

0 commit comments

Comments
 (0)