Skip to content

Commit dbb5df5

Browse files
author
ELY M
committed
55943-elys
1 parent 318df00 commit dbb5df5

6 files changed

Lines changed: 309 additions & 77 deletions

File tree

‎app/src/main/AndroidManifest.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2424
xmlns:tools="http://schemas.android.com/tools"
25-
android:versionCode="55942"
26-
android:versionName="55942-elys">
25+
android:versionCode="55943"
26+
android:versionName="55943-elys">
2727

2828
<uses-permission android:name="android.permission.INTERNET" />
2929
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />

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

Lines changed: 124 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -18,33 +18,121 @@
1818
1919
-->
2020

21-
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
21+
<!--<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"-->
22+
<!-- xmlns:app="http://schemas.android.com/apk/res-auto"-->
23+
<!-- android:id="@+id/main_content"-->
24+
<!-- android:fitsSystemWindows="true"-->
25+
<!-- android:background="?attr/colorPrimary"-->
26+
<!-- android:layout_width="match_parent"-->
27+
<!-- android:layout_height="match_parent">-->
28+
29+
<!-- <RelativeLayout-->
30+
<!-- android:id="@+id/rl"-->
31+
<!-- android:layout_width="match_parent"-->
32+
<!-- android:layout_height="match_parent">-->
33+
34+
<!-- <include layout="@layout/widget_toolbar_bottom" />-->
35+
36+
<!-- <LinearLayout-->
37+
<!-- android:layout_width="fill_parent"-->
38+
<!-- android:layout_height="fill_parent"-->
39+
<!-- android:layout_above="@id/toolbar_bottom"-->
40+
<!-- android:orientation="vertical">-->
41+
42+
<!-- <include layout="@layout/widget_toolbar_top" />-->
43+
44+
<!-- <ScrollView-->
45+
<!-- android:background="?attr/popupMenuBackground"-->
46+
<!-- android:layout_width="fill_parent"-->
47+
<!-- android:layout_height="fill_parent"-->
48+
<!-- android:scrollbars="none">-->
49+
50+
<!-- <LinearLayout-->
51+
<!-- android:id="@+id/ll"-->
52+
<!-- android:layout_width="fill_parent"-->
53+
<!-- android:layout_height="wrap_content"-->
54+
<!-- android:orientation="vertical"-->
55+
<!-- android:padding="@dimen/padding_ll">-->
56+
57+
<!-- <androidx.cardview.widget.CardView-->
58+
<!-- android:id="@+id/cv1"-->
59+
<!-- android:layout_width="match_parent"-->
60+
<!-- android:layout_height="match_parent"-->
61+
<!-- android:layout_gravity="center">-->
62+
63+
<!-- <LinearLayout-->
64+
<!-- android:layout_width="match_parent"-->
65+
<!-- android:layout_height="match_parent"-->
66+
<!-- android:orientation="vertical">-->
67+
68+
<!-- <EditText-->
69+
<!-- android:id="@+id/palTitle"-->
70+
<!-- android:layout_width="match_parent"-->
71+
<!-- android:layout_height="match_parent"-->
72+
<!-- android:hint="@string/name"-->
73+
<!-- android:inputType="text"-->
74+
<!-- android:textSize="18sp"-->
75+
<!-- android:importantForAutofill="no" />-->
76+
77+
<!-- <EditText-->
78+
<!-- android:id="@+id/palContent"-->
79+
<!-- android:layout_width="match_parent"-->
80+
<!-- android:layout_height="match_parent"-->
81+
<!-- android:hint="@string/color_palette"-->
82+
<!-- android:inputType="textMultiLine"-->
83+
<!-- android:textSize="@dimen/list_item_text"-->
84+
<!-- android:importantForAutofill="no" />-->
85+
86+
<!-- </LinearLayout>-->
87+
<!-- </androidx.cardview.widget.CardView>-->
88+
89+
<!-- </LinearLayout>-->
90+
<!-- </ScrollView>-->
91+
<!-- </LinearLayout>-->
92+
<!-- </RelativeLayout>-->
93+
94+
<!-- <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton-->
95+
<!-- android:id="@+id/fab"-->
96+
<!-- android:layout_width="wrap_content"-->
97+
<!-- android:layout_height="wrap_content"-->
98+
<!-- android:layout_margin="28dp"-->
99+
<!-- app:elevation="@dimen/fab_elevation"-->
100+
<!-- app:layout_anchor="@id/rl"-->
101+
<!-- app:layout_anchorGravity="bottom|center"-->
102+
<!-- app:pressedTranslationZ="@dimen/fab_elevation_pressed"-->
103+
<!-- app:srcCompat="@drawable/ic_done_24dp"-->
104+
<!-- android:contentDescription="@string/done" />-->
105+
<!--</androidx.coordinatorlayout.widget.CoordinatorLayout>-->
106+
107+
108+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
22109
xmlns:app="http://schemas.android.com/apk/res-auto"
23-
android:id="@+id/main_content"
24-
android:fitsSystemWindows="true"
25-
android:background="?attr/colorPrimary"
110+
android:id="@+id/rl"
26111
android:layout_width="match_parent"
27-
android:layout_height="match_parent">
112+
android:layout_height="match_parent"
113+
android:background="?attr/colorPrimary"
114+
android:fitsSystemWindows="true">
28115

29-
<RelativeLayout
30-
android:id="@+id/rl"
31-
android:layout_width="match_parent"
32-
android:layout_height="match_parent">
116+
<include layout="@layout/widget_toolbar_bottom" />
33117

34-
<include layout="@layout/widget_toolbar_bottom" />
118+
<LinearLayout
119+
android:layout_width="fill_parent"
120+
android:layout_height="fill_parent"
121+
android:layout_above="@id/toolbar_bottom"
122+
android:orientation="vertical">
35123

36-
<LinearLayout
37-
android:layout_width="fill_parent"
38-
android:layout_height="fill_parent"
39-
android:layout_above="@id/toolbar_bottom"
40-
android:orientation="vertical">
124+
<include layout="@layout/widget_toolbar_top" />
41125

42-
<include layout="@layout/widget_toolbar_top" />
126+
<androidx.coordinatorlayout.widget.CoordinatorLayout
127+
android:id="@+id/main_content"
128+
android:layout_width="match_parent"
129+
android:layout_height="match_parent">
43130

44131
<ScrollView
45-
android:background="?attr/popupMenuBackground"
132+
android:id="@+id/scrollView"
46133
android:layout_width="fill_parent"
47134
android:layout_height="fill_parent"
135+
android:background="?attr/popupMenuBackground"
48136
android:scrollbars="none">
49137

50138
<LinearLayout
@@ -70,36 +158,36 @@
70158
android:layout_width="match_parent"
71159
android:layout_height="match_parent"
72160
android:hint="@string/name"
161+
android:importantForAutofill="no"
73162
android:inputType="text"
74-
android:textSize="18sp"
75-
android:importantForAutofill="no" />
163+
android:textSize="18sp" />
76164

77165
<EditText
78166
android:id="@+id/palContent"
79167
android:layout_width="match_parent"
80168
android:layout_height="match_parent"
81169
android:hint="@string/color_palette"
170+
android:importantForAutofill="no"
82171
android:inputType="textMultiLine"
83-
android:textSize="@dimen/list_item_text"
84-
android:importantForAutofill="no" />
172+
android:textSize="@dimen/list_item_text" />
85173

86174
</LinearLayout>
87175
</androidx.cardview.widget.CardView>
88176

89177
</LinearLayout>
90178
</ScrollView>
91-
</LinearLayout>
92-
</RelativeLayout>
93-
94-
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
95-
android:id="@+id/fab"
96-
android:layout_width="wrap_content"
97-
android:layout_height="wrap_content"
98-
android:layout_margin="28dp"
99-
app:elevation="@dimen/fab_elevation"
100-
app:layout_anchor="@id/rl"
101-
app:layout_anchorGravity="bottom|center"
102-
app:pressedTranslationZ="@dimen/fab_elevation_pressed"
103-
app:srcCompat="@drawable/ic_done_24dp"
104-
android:contentDescription="@string/done" />
105-
</androidx.coordinatorlayout.widget.CoordinatorLayout>
179+
180+
<com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
181+
android:id="@+id/fab"
182+
android:layout_width="wrap_content"
183+
android:layout_height="wrap_content"
184+
android:layout_margin="10dp"
185+
android:contentDescription="@string/done"
186+
app:elevation="@dimen/fab_elevation"
187+
app:layout_anchor="@id/scrollView"
188+
app:layout_anchorGravity="bottom|center"
189+
app:pressedTranslationZ="@dimen/fab_elevation_pressed"
190+
app:srcCompat="@drawable/ic_done_24dp" />
191+
</androidx.coordinatorlayout.widget.CoordinatorLayout>
192+
</LinearLayout>
193+
</RelativeLayout>

0 commit comments

Comments
 (0)