Skip to content

Commit 4acb41f

Browse files
RazeemanRazeeman
committed
add hints to data edit
1 parent 4f81e1a commit 4acb41f

File tree

2 files changed

+92
-45
lines changed

2 files changed

+92
-45
lines changed

‎features/feature_data_edit/src/main/res/layout/data_edit_fragment.xml‎

Lines changed: 78 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@
4242
app:layout_constraintBottom_toBottomOf="parent"
4343
app:layout_constraintTop_toBottomOf="@id/dividerDataEdit">
4444

45-
<androidx.appcompat.widget.LinearLayoutCompat
45+
<androidx.constraintlayout.widget.ConstraintLayout
4646
android:id="@+id/containerDataEdit"
4747
android:layout_width="match_parent"
48-
android:layout_height="match_parent"
49-
android:orientation="vertical">
48+
android:layout_height="match_parent">
5049

5150
<com.google.android.material.button.MaterialButton
5251
android:id="@+id/btnDataEditSelectRecords"
@@ -59,13 +58,25 @@
5958
android:text="@string/data_edit_select_records"
6059
app:icon="@drawable/ic_list_24px"
6160
app:iconGravity="end"
62-
app:iconTint="?appLightTextColor" />
61+
app:iconTint="?appLightTextColor"
62+
app:layout_constraintTop_toTopOf="parent" />
63+
64+
<androidx.appcompat.widget.AppCompatTextView
65+
style="@style/DataEditHintButton"
66+
android:layout_width="wrap_content"
67+
android:layout_height="wrap_content"
68+
android:text="1"
69+
app:layout_constraintStart_toStartOf="@id/btnDataEditSelectRecords"
70+
app:layout_constraintTop_toTopOf="@id/btnDataEditSelectRecords"
71+
tools:ignore="HardcodedText" />
6372

6473
<androidx.cardview.widget.CardView
74+
android:id="@+id/cardDataEditSelectedRecords"
6575
style="@style/SettingsCard"
6676
android:layout_width="match_parent"
6777
android:layout_height="wrap_content"
68-
android:layout_marginHorizontal="6dp">
78+
android:layout_marginHorizontal="6dp"
79+
app:layout_constraintTop_toBottomOf="@id/btnDataEditSelectRecords">
6980

7081
<androidx.constraintlayout.widget.ConstraintLayout
7182
android:layout_width="match_parent"
@@ -97,10 +108,12 @@
97108
</androidx.cardview.widget.CardView>
98109

99110
<androidx.cardview.widget.CardView
111+
android:id="@+id/cardDataEditSelectedChanges"
100112
style="@style/SettingsCard"
101113
android:layout_width="match_parent"
102114
android:layout_height="wrap_content"
103-
android:layout_marginHorizontal="6dp">
115+
android:layout_marginHorizontal="6dp"
116+
app:layout_constraintTop_toBottomOf="@id/cardDataEditSelectedRecords">
104117

105118
<LinearLayout
106119
android:layout_width="match_parent"
@@ -326,16 +339,37 @@
326339

327340
</androidx.cardview.widget.CardView>
328341

342+
<androidx.appcompat.widget.AppCompatTextView
343+
style="@style/DataEditHintButton"
344+
android:layout_width="wrap_content"
345+
android:layout_height="wrap_content"
346+
android:text="2"
347+
app:layout_constraintStart_toStartOf="@id/cardDataEditSelectedChanges"
348+
app:layout_constraintTop_toTopOf="@id/cardDataEditSelectedChanges"
349+
tools:ignore="HardcodedText" />
350+
329351
<com.google.android.material.button.MaterialButton
330352
android:id="@+id/btnDataEditChange"
331353
style="@style/AppButtonActive"
332354
android:layout_width="match_parent"
333355
android:layout_marginHorizontal="8dp"
334-
android:text="@string/data_edit_button_change" />
356+
android:text="@string/data_edit_button_change"
357+
app:layout_constraintTop_toBottomOf="@id/cardDataEditSelectedChanges" />
358+
359+
<androidx.appcompat.widget.AppCompatTextView
360+
style="@style/DataEditHintButton"
361+
android:layout_width="wrap_content"
362+
android:layout_height="wrap_content"
363+
android:text="3"
364+
app:layout_constraintStart_toStartOf="@id/btnDataEditChange"
365+
app:layout_constraintTop_toTopOf="@id/btnDataEditChange"
366+
tools:ignore="HardcodedText" />
335367

336368
<com.example.util.simpletimetracker.feature_views.DividerView
369+
android:id="@+id/dividerDataEditChange"
337370
android:layout_width="match_parent"
338-
android:layout_height="wrap_content" />
371+
android:layout_height="wrap_content"
372+
app:layout_constraintTop_toBottomOf="@id/btnDataEditChange" />
339373

340374
<com.google.android.material.button.MaterialButton
341375
android:id="@+id/btnDataEditDuplicateType"
@@ -344,47 +378,44 @@
344378
android:layout_marginHorizontal="8dp"
345379
android:foreground="?selectableItemBackground"
346380
android:text="@string/change_record_duplicate"
381+
app:layout_constraintTop_toBottomOf="@id/dividerDataEditChange"
347382
tools:ignore="UnusedAttribute" />
348383

349384
<com.example.util.simpletimetracker.feature_views.DividerView
385+
android:id="@+id/dividerDataEditDuplicateType"
350386
android:layout_width="match_parent"
351-
android:layout_height="wrap_content" />
387+
android:layout_height="wrap_content"
388+
app:layout_constraintTop_toBottomOf="@id/btnDataEditDuplicateType" />
352389

353-
<androidx.constraintlayout.widget.ConstraintLayout
354-
android:layout_width="match_parent"
355-
android:layout_height="wrap_content">
356-
357-
<com.google.android.material.button.MaterialButton
358-
android:id="@+id/btnDataEditDeleteTodayRecords"
359-
style="@style/AppButtonActive"
360-
android:layout_width="0dp"
361-
android:layout_height="@dimen/button_height_short"
362-
android:layout_marginHorizontal="8dp"
363-
android:layout_marginVertical="6dp"
364-
android:background="@drawable/bg_rounded_gradient"
365-
android:foreground="?selectableItemBackground"
366-
android:padding="0dp"
367-
app:backgroundTint="@null"
368-
app:layout_constraintEnd_toStartOf="@id/btnDataEditDeleteTodayRecordsView"
369-
app:layout_constraintStart_toStartOf="parent"
370-
app:layout_constraintTop_toTopOf="parent"
371-
tools:ignore="UnusedAttribute"
372-
tools:text="Delete - Today - 38 Records" />
373-
374-
<com.google.android.material.button.MaterialButton
375-
android:id="@+id/btnDataEditDeleteTodayRecordsView"
376-
style="@style/AppButtonActive"
377-
android:layout_width="48dp"
378-
android:layout_marginHorizontal="8dp"
379-
android:padding="0dp"
380-
app:icon="@drawable/ic_list_24px"
381-
app:iconGravity="textStart"
382-
app:iconPadding="0dp"
383-
app:iconTint="?appLightTextColor"
384-
app:layout_constraintEnd_toEndOf="parent"
385-
app:layout_constraintTop_toTopOf="parent" />
386-
387-
</androidx.constraintlayout.widget.ConstraintLayout>
390+
<com.google.android.material.button.MaterialButton
391+
android:id="@+id/btnDataEditDeleteTodayRecords"
392+
style="@style/AppButtonActive"
393+
android:layout_width="0dp"
394+
android:layout_height="@dimen/button_height_short"
395+
android:layout_marginHorizontal="8dp"
396+
android:layout_marginVertical="6dp"
397+
android:background="@drawable/bg_rounded_gradient"
398+
android:foreground="?selectableItemBackground"
399+
android:padding="0dp"
400+
app:backgroundTint="@null"
401+
app:layout_constraintEnd_toStartOf="@id/btnDataEditDeleteTodayRecordsView"
402+
app:layout_constraintStart_toStartOf="parent"
403+
app:layout_constraintTop_toBottomOf="@id/dividerDataEditDuplicateType"
404+
tools:ignore="UnusedAttribute"
405+
tools:text="Delete - Today - 38 Records" />
406+
407+
<com.google.android.material.button.MaterialButton
408+
android:id="@+id/btnDataEditDeleteTodayRecordsView"
409+
style="@style/AppButtonActive"
410+
android:layout_width="48dp"
411+
android:layout_marginHorizontal="8dp"
412+
android:padding="0dp"
413+
app:icon="@drawable/ic_list_24px"
414+
app:iconGravity="textStart"
415+
app:iconPadding="0dp"
416+
app:iconTint="?appLightTextColor"
417+
app:layout_constraintEnd_toEndOf="parent"
418+
app:layout_constraintTop_toBottomOf="@id/dividerDataEditDuplicateType" />
388419

389420
<com.google.android.material.button.MaterialButton
390421
android:id="@+id/btnDataEditDeleteRecords"
@@ -398,6 +429,7 @@
398429
android:padding="0dp"
399430
android:text="@string/data_edit_button_delete_records"
400431
app:backgroundTint="@null"
432+
app:layout_constraintTop_toBottomOf="@id/btnDataEditDeleteTodayRecords"
401433
tools:ignore="UnusedAttribute" />
402434

403435
<com.google.android.material.button.MaterialButton
@@ -412,9 +444,10 @@
412444
android:padding="0dp"
413445
android:text="@string/data_edit_button_delete_data"
414446
app:backgroundTint="@null"
447+
app:layout_constraintTop_toBottomOf="@id/btnDataEditDeleteRecords"
415448
tools:ignore="UnusedAttribute" />
416449

417-
</androidx.appcompat.widget.LinearLayoutCompat>
450+
</androidx.constraintlayout.widget.ConstraintLayout>
418451

419452
</androidx.core.widget.NestedScrollView>
420453

‎features/feature_data_edit/src/main/res/values/styles.xml‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
4+
<style name="DataEditHintButton">
5+
<item name="android:background">@drawable/round_corners_background</item>
6+
<item name="android:backgroundTint">?appCardBackgroundColor</item>
7+
<item name="android:elevation">8dp</item>
8+
<item name="android:paddingStart">4dp</item>
9+
<item name="android:paddingEnd">4dp</item>
10+
<item name="android:textColor">?appTextPrimaryColor</item>
11+
<item name="android:textSize">11sp</item>
12+
</style>
13+
14+
</resources>

0 commit comments

Comments
 (0)