Skip to content

Commit 3c1d233

Browse files
StormunblessedStormunblessed
authored
Merge branch 'LagradOst:master' into master
2 parents 41c112c + c11a96a commit 3c1d233

File tree

2 files changed

+215
-86
lines changed

2 files changed

+215
-86
lines changed

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

Lines changed: 210 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -79,84 +79,84 @@
7979
android:layout_gravity="end|center_vertical"
8080
tools:visibility="visible" />
8181

82-
83-
<LinearLayout
84-
android:layout_marginBottom="10dp"
85-
android:layout_width="match_parent"
86-
android:layout_height="wrap_content">
87-
88-
89-
<TextView
90-
android:layout_gravity="center_vertical"
91-
android:padding="10dp"
92-
android:textSize="17sp"
93-
android:textColor="?attr/textColor"
94-
android:text="Status:"
95-
android:layout_width="wrap_content"
96-
android:layout_height="wrap_content" />
97-
98-
<com.google.android.material.button.MaterialButton
99-
android:layout_height="30dp"
100-
android:text="Watching"
101-
android:minWidth="0dp"
102-
android:layout_width="wrap_content"
103-
android:layout_gravity="center_vertical"
104-
android:layout_marginStart="0dp"
105-
style="@style/BlackButton" />
106-
</LinearLayout>
107-
108-
<GridLayout
109-
android:orientation="horizontal"
110-
android:columnCount="2"
111-
112-
android:layout_width="match_parent"
113-
android:layout_height="wrap_content">
114-
115-
<com.google.android.material.button.MaterialButton
116-
android:id="@+id/sync_completed"
117-
android:nextFocusRight="@id/sync_on_hold"
118-
android:nextFocusDown="@id/sync_plan_to_watch"
119-
120-
android:layout_row="0"
121-
android:layout_column="0"
122-
android:text="@string/type_completed"
123-
style="@style/SyncButton" />
124-
125-
<com.google.android.material.button.MaterialButton
126-
android:id="@+id/sync_on_hold"
127-
android:nextFocusDown="@id/sync_watching"
128-
android:nextFocusLeft="@id/sync_completed"
129-
130-
android:layout_row="0"
131-
android:layout_column="1"
132-
style="@style/SyncButton"
133-
android:text="@string/type_on_hold" />
134-
135-
<com.google.android.material.button.MaterialButton
136-
android:id="@+id/sync_plan_to_watch"
137-
android:nextFocusRight="@id/sync_plan_to_watch"
138-
android:nextFocusDown="@id/sync_dropped"
139-
android:nextFocusUp="@id/sync_completed"
140-
141-
android:layout_row="1"
142-
android:layout_column="0"
143-
android:text="@string/type_plan_to_watch"
144-
style="@style/SyncButton"
145-
/>
146-
147-
<com.google.android.material.button.MaterialButton
148-
android:id="@+id/sync_watching"
149-
android:nextFocusLeft="@id/sync_plan_to_watch"
150-
android:nextFocusDown="@id/sync_dropped"
151-
android:nextFocusUp="@id/sync_on_hold"
152-
153-
android:layout_row="1"
154-
android:layout_column="1"
155-
156-
style="@style/SyncButton"
157-
android:text="@string/type_watching" />
158-
159-
</GridLayout>
82+
<!--
83+
<LinearLayout
84+
android:layout_marginBottom="10dp"
85+
android:layout_width="match_parent"
86+
android:layout_height="wrap_content">
87+
88+
89+
<TextView
90+
android:layout_gravity="center_vertical"
91+
android:padding="10dp"
92+
android:textSize="17sp"
93+
android:textColor="?attr/textColor"
94+
android:text="Status:"
95+
android:layout_width="wrap_content"
96+
android:layout_height="wrap_content" />
97+
98+
<com.google.android.material.button.MaterialButton
99+
android:layout_height="30dp"
100+
android:text="Watching"
101+
android:minWidth="0dp"
102+
android:layout_width="wrap_content"
103+
android:layout_gravity="center_vertical"
104+
android:layout_marginStart="0dp"
105+
style="@style/BlackButton" />
106+
</LinearLayout>
107+
108+
<GridLayout
109+
android:orientation="horizontal"
110+
android:columnCount="2"
111+
112+
android:layout_width="match_parent"
113+
android:layout_height="wrap_content">
114+
115+
<com.google.android.material.button.MaterialButton
116+
android:id="@+id/sync_completed"
117+
android:nextFocusRight="@id/sync_on_hold"
118+
android:nextFocusDown="@id/sync_plan_to_watch"
119+
120+
android:layout_row="0"
121+
android:layout_column="0"
122+
android:text="@string/type_completed"
123+
style="@style/SyncButton" />
124+
125+
<com.google.android.material.button.MaterialButton
126+
android:id="@+id/sync_on_hold"
127+
android:nextFocusDown="@id/sync_watching"
128+
android:nextFocusLeft="@id/sync_completed"
129+
130+
android:layout_row="0"
131+
android:layout_column="1"
132+
style="@style/SyncButton"
133+
android:text="@string/type_on_hold" />
134+
135+
<com.google.android.material.button.MaterialButton
136+
android:id="@+id/sync_plan_to_watch"
137+
android:nextFocusRight="@id/sync_plan_to_watch"
138+
android:nextFocusDown="@id/sync_dropped"
139+
android:nextFocusUp="@id/sync_completed"
140+
141+
android:layout_row="1"
142+
android:layout_column="0"
143+
android:text="@string/type_plan_to_watch"
144+
style="@style/SyncButton"
145+
/>
146+
147+
<com.google.android.material.button.MaterialButton
148+
android:id="@+id/sync_watching"
149+
android:nextFocusLeft="@id/sync_plan_to_watch"
150+
android:nextFocusDown="@id/sync_dropped"
151+
android:nextFocusUp="@id/sync_on_hold"
152+
153+
android:layout_row="1"
154+
android:layout_column="1"
155+
156+
style="@style/SyncButton"
157+
android:text="@string/type_watching" />
158+
159+
</GridLayout>
160160
161161
<com.google.android.material.button.MaterialButton
162162
android:id="@+id/sync_dropped"
@@ -165,7 +165,7 @@
165165
android:layout_width="match_parent"
166166
style="@style/SyncButton"
167167
168-
android:text="@string/type_dropped" />
168+
android:text="@string/type_dropped" />-->
169169

170170
<LinearLayout
171171
android:orientation="horizontal"
@@ -180,26 +180,28 @@
180180
android:text="Rated:"
181181
android:layout_width="wrap_content"
182182
android:layout_height="wrap_content" />
183-
183+
<!--
184184
<com.google.android.material.button.MaterialButton
185185
android:layout_height="30dp"
186186
android:text="7/10"
187187
android:minWidth="0dp"
188188
android:layout_width="wrap_content"
189189
android:layout_gravity="center_vertical"
190190
android:layout_marginStart="0dp"
191-
style="@style/BlackButton" />
191+
style="@style/BlackButton" />-->
192192
</LinearLayout>
193193

194194
<com.google.android.material.slider.Slider
195195
android:valueFrom="0"
196196
android:valueTo="10"
197197
android:value="4"
198198
android:stepSize="1"
199-
android:paddingStart="-10dp"
200-
android:paddingEnd="-10dp"
201-
202-
android:layout_width="match_parent"
199+
app:tickVisible="false"
200+
android:layout_marginStart="-5dp"
201+
android:layout_marginEnd="-5dp"
202+
app:thumbRadius="10dp"
203+
app:labelStyle="@style/BlackLabel"
204+
android:layout_width="wrap_content"
203205
android:layout_height="wrap_content" />
204206

205207
<FrameLayout
@@ -225,10 +227,132 @@
225227
android:contentDescription="@string/home_more_info" />
226228
</FrameLayout>
227229

230+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
231+
xmlns:app="http://schemas.android.com/apk/res-auto"
232+
xmlns:tools="http://schemas.android.com/tools"
233+
style="@style/AppTextViewStyle"
234+
android:id="@android:id/text1"
235+
android:layout_width="match_parent"
236+
android:layout_height="wrap_content"
237+
android:minHeight="?android:attr/listPreferredItemHeightSmall"
238+
android:textAppearance="?android:attr/textAppearanceSmall"
239+
android:textColor="@color/text_selection_color"
240+
android:textSize="16sp"
241+
android:textStyle="bold"
242+
android:gravity="center_vertical"
243+
android:paddingStart="12dp"
244+
android:paddingEnd="7dip"
245+
android:text="@string/type_watching"
246+
android:checkMark="?android:attr/listChoiceIndicatorSingle"
247+
android:ellipsize="marquee"
248+
android:foreground="?attr/selectableItemBackgroundBorderless"
249+
tools:drawableTint="?attr/textColor"
250+
android:drawablePadding="20dp"
251+
app:drawableTint="@color/check_selection_color"
252+
app:drawableStartCompat="@drawable/ic_baseline_check_24" />
253+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
254+
xmlns:app="http://schemas.android.com/apk/res-auto"
255+
xmlns:tools="http://schemas.android.com/tools"
256+
style="@style/AppTextViewStyle"
257+
android:id="@android:id/text1"
258+
android:layout_width="match_parent"
259+
android:layout_height="wrap_content"
260+
android:minHeight="?android:attr/listPreferredItemHeightSmall"
261+
android:textAppearance="?android:attr/textAppearanceSmall"
262+
android:textColor="@color/text_selection_color"
263+
android:textSize="16sp"
264+
android:textStyle="bold"
265+
android:gravity="center_vertical"
266+
android:paddingStart="12dp"
267+
android:paddingEnd="7dip"
268+
android:text="@string/type_on_hold"
269+
android:checkMark="?android:attr/listChoiceIndicatorSingle"
270+
android:ellipsize="marquee"
271+
android:foreground="?attr/selectableItemBackgroundBorderless"
272+
tools:drawableTint="?attr/textColor"
273+
android:drawablePadding="20dp"
274+
app:drawableTint="@color/check_selection_color"
275+
app:drawableStartCompat="@drawable/ic_baseline_check_24" />
276+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
277+
xmlns:app="http://schemas.android.com/apk/res-auto"
278+
xmlns:tools="http://schemas.android.com/tools"
279+
style="@style/AppTextViewStyle"
280+
android:id="@android:id/text1"
281+
android:layout_width="match_parent"
282+
android:layout_height="wrap_content"
283+
android:minHeight="?android:attr/listPreferredItemHeightSmall"
284+
android:textAppearance="?android:attr/textAppearanceSmall"
285+
android:textColor="@color/text_selection_color"
286+
android:textSize="16sp"
287+
android:textStyle="bold"
288+
android:gravity="center_vertical"
289+
android:paddingStart="12dp"
290+
android:paddingEnd="7dip"
291+
android:text="@string/type_completed"
292+
android:checkMark="?android:attr/listChoiceIndicatorSingle"
293+
android:ellipsize="marquee"
294+
android:foreground="?attr/selectableItemBackgroundBorderless"
295+
tools:drawableTint="?attr/textColor"
296+
android:drawablePadding="20dp"
297+
app:drawableTint="@color/check_selection_color"
298+
app:drawableStartCompat="@drawable/ic_baseline_check_24" />
299+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
300+
xmlns:app="http://schemas.android.com/apk/res-auto"
301+
xmlns:tools="http://schemas.android.com/tools"
302+
style="@style/AppTextViewStyle"
303+
android:id="@android:id/text1"
304+
android:layout_width="match_parent"
305+
android:layout_height="wrap_content"
306+
android:minHeight="?android:attr/listPreferredItemHeightSmall"
307+
android:textAppearance="?android:attr/textAppearanceSmall"
308+
android:textColor="@color/text_selection_color"
309+
android:textSize="16sp"
310+
android:textStyle="bold"
311+
android:gravity="center_vertical"
312+
android:paddingStart="12dp"
313+
android:paddingEnd="7dip"
314+
android:text="@string/type_plan_to_watch"
315+
android:checkMark="?android:attr/listChoiceIndicatorSingle"
316+
android:ellipsize="marquee"
317+
android:foreground="?attr/selectableItemBackgroundBorderless"
318+
tools:drawableTint="?attr/textColor"
319+
android:drawablePadding="20dp"
320+
app:drawableTint="@color/check_selection_color"
321+
app:drawableStartCompat="@drawable/ic_baseline_check_24" />
322+
<TextView xmlns:android="http://schemas.android.com/apk/res/android"
323+
xmlns:app="http://schemas.android.com/apk/res-auto"
324+
xmlns:tools="http://schemas.android.com/tools"
325+
style="@style/AppTextViewStyle"
326+
android:id="@android:id/text1"
327+
android:layout_width="match_parent"
328+
android:layout_height="wrap_content"
329+
android:minHeight="?android:attr/listPreferredItemHeightSmall"
330+
android:textAppearance="?android:attr/textAppearanceSmall"
331+
android:textColor="@color/text_selection_color"
332+
android:textSize="16sp"
333+
android:textStyle="bold"
334+
android:gravity="center_vertical"
335+
android:paddingStart="12dp"
336+
android:paddingEnd="7dip"
337+
android:text="@string/type_dropped"
338+
android:checkMark="?android:attr/listChoiceIndicatorSingle"
339+
android:ellipsize="marquee"
340+
android:foreground="?attr/selectableItemBackgroundBorderless"
341+
tools:drawableTint="?attr/textColor"
342+
android:drawablePadding="20dp"
343+
app:drawableTint="@color/check_selection_color"
344+
app:drawableStartCompat="@drawable/ic_baseline_check_24" />
345+
346+
<com.google.android.material.button.MaterialButton
347+
android:visibility="gone"
348+
android:layout_marginTop="10dp"
349+
android:layout_width="match_parent"
350+
style="@style/WhiteButton"
351+
android:text="@string/type_watching" />
228352
<com.google.android.material.button.MaterialButton
229353
android:layout_marginTop="10dp"
230354
android:layout_width="match_parent"
231-
style="@style/SyncButton"
355+
style="@style/BlackButton"
232356
app:icon="@drawable/baseline_sync_24"
233357
android:text="@string/upload_sync" />
234358
</LinearLayout>

‎app/src/main/res/values/styles.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,11 @@
365365
<item name="rippleColor">?attr/primaryBlackBackground</item>
366366
</style>
367367

368+
<style name="BlackLabel" parent="@style/Widget.MaterialComponents.Tooltip">
369+
<item name="backgroundTint">?attr/iconGrayBackground</item>
370+
<item name="android:textColor">?attr/textColor</item>
371+
</style>
372+
368373
<style name="BlackButton" parent="NiceButton">
369374
<item name="strokeColor">?attr/textColor</item>
370375
<item name="backgroundTint">?attr/iconGrayBackground</item>

0 commit comments

Comments
 (0)