diff --git a/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt b/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt index 5cd0d3b6b..e2afeaaad 100644 --- a/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt +++ b/domain/src/main/java/com/example/util/simpletimetracker/domain/record/interactor/CalculateAdjacentActivitiesInteractor.kt @@ -7,7 +7,8 @@ import javax.inject.Inject class CalculateAdjacentActivitiesInteractor @Inject constructor() { - // Doesn't count multitasked activities. + // TODO count multitask also + // Doesn't count multitask activities. // Only those that started after current ended. fun calculateNextActivities( typeIds: List, diff --git a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/button/ButtonAdapterDelegate.kt b/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/button/ButtonAdapterDelegate.kt index b66b0c1ec..f08dde567 100644 --- a/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/button/ButtonAdapterDelegate.kt +++ b/features/feature_base_adapter/src/main/java/com/example/util/simpletimetracker/feature_base_adapter/button/ButtonAdapterDelegate.kt @@ -13,7 +13,6 @@ import com.example.util.simpletimetracker.feature_base_adapter.databinding.ItemB // TODO remove ripple from icon background if background is transparent. // TODO SUG add backup tests -// TODO SUG add reorder hint // TODO GOAL add backup tests, raise test file version fun createButtonAdapterDelegate( onClick: (ViewData) -> Unit, diff --git a/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/adapter/ActivitySuggestionListAdapterDelegate.kt b/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/adapter/ActivitySuggestionListAdapterDelegate.kt index d6caca1f0..067f69c8b 100644 --- a/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/adapter/ActivitySuggestionListAdapterDelegate.kt +++ b/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/adapter/ActivitySuggestionListAdapterDelegate.kt @@ -36,7 +36,6 @@ fun activitySuggestionListAdapterBindDelegate( } } -// TODO refactor with list element from rules? data class ActivitySuggestionListViewData( val id: Id, val text: String, diff --git a/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/interactor/ActivitySuggestionsViewDataInteractor.kt b/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/interactor/ActivitySuggestionsViewDataInteractor.kt index e9e60a4f7..7e83e7dbd 100644 --- a/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/interactor/ActivitySuggestionsViewDataInteractor.kt +++ b/features/feature_suggestions/src/main/java/com/example/util/simpletimetracker/feature_suggestions/interactor/ActivitySuggestionsViewDataInteractor.kt @@ -93,7 +93,9 @@ class ActivitySuggestionsViewDataInteractor @Inject constructor( ) if (index == 0) { result += HintViewData( - text = resourceRepo.getString(R.string.settings_activity_suggestions), + text = resourceRepo.getString(R.string.settings_activity_suggestions) + + " " + + resourceRepo.getString(R.string.card_order_hint).let { "($it)" }, paddingTop = 0, paddingBottom = 0, gravity = HintViewData.Gravity.START, diff --git a/features/feature_suggestions/src/main/res/layout/item_activity_suggestion_list_layout.xml b/features/feature_suggestions/src/main/res/layout/item_activity_suggestion_list_layout.xml index 06f7efb11..ce42aa564 100644 --- a/features/feature_suggestions/src/main/res/layout/item_activity_suggestion_list_layout.xml +++ b/features/feature_suggestions/src/main/res/layout/item_activity_suggestion_list_layout.xml @@ -7,6 +7,7 @@ android:layout_height="wrap_content" android:layout_margin="2dp" android:elevation="0dp" + android:foreground="?selectableItemBackground" app:cardCornerRadius="@dimen/record_type_card_corner_radius" app:cardPreventCornerOverlap="false" app:cardUseCompatPadding="false"