change color icon selection fields

Razeeman · Razeeman · commit 4d9df460f434 · 2025-06-22T23:24:16.000+03:00
diff --git a/features/feature_change_activity_filter/src/main/java/com/example/util/simpletimetracker/feature_change_activity_filter/view/ChangeActivityFilterFragment.kt b/features/feature_change_activity_filter/src/main/java/com/example/util/simpletimetracker/feature_change_activity_filter/view/ChangeActivityFilterFragment.kt
@@ -5,6 +5,7 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
 import com.example.util.simpletimetracker.core.base.BaseFragment
@@ -29,6 +30,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmpty
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.info.createInfoAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
+import com.example.util.simpletimetracker.feature_change_activity_filter.R
 import com.example.util.simpletimetracker.feature_change_activity_filter.viewData.ChangeActivityFilterChooserState.Closed
 import com.example.util.simpletimetracker.feature_change_activity_filter.viewData.ChangeActivityFilterChooserState.Color
 import com.example.util.simpletimetracker.feature_change_activity_filter.viewData.ChangeActivityFilterChooserState.Type
@@ -207,6 +209,12 @@ class ChangeActivityFilterFragment :
         // Chooser fields
         fieldChangeActivityFilterColor.isVisible = isClosed || state.current is Color
         fieldChangeActivityFilterType.isVisible = isClosed || state.current is Type
+
+        // Chooser size
+        val sizeDefault = resources.getDimensionPixelSize(R.dimen.input_field_height)
+        val sizeBig = resources.getDimensionPixelSize(R.dimen.input_field_height_big)
+        val colorSize = if (state.current is Color) sizeDefault else sizeBig
+        fieldChangeActivityFilterColor.updateLayoutParams { height = colorSize }
     }
 
     private fun updateTypes(
diff --git a/features/feature_change_activity_filter/src/main/res/layout/change_activity_filter_fragment.xml b/features/feature_change_activity_filter/src/main/res/layout/change_activity_filter_fragment.xml
@@ -110,7 +110,7 @@
                 android:id="@+id/fieldChangeActivityFilterColor"
                 style="@style/InputFieldCard"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/input_field_height"
+                android:layout_height="@dimen/input_field_height_big"
                 android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
                 android:layout_marginTop="3dp"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt b/features/feature_change_category/src/main/java/com/example/util/simpletimetracker/feature_change_category/view/ChangeCategoryFragment.kt
@@ -6,6 +6,7 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.core.view.updateLayoutParams
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
 import com.example.util.simpletimetracker.core.base.BaseFragment
@@ -31,12 +32,13 @@ import com.example.util.simpletimetracker.feature_base_adapter.empty.createEmpty
 import com.example.util.simpletimetracker.feature_base_adapter.hint.createHintAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.info.createInfoAdapterDelegate
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.createRecordTypeAdapterDelegate
-import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryTypesViewData
-import com.example.util.simpletimetracker.feature_change_category.viewModel.ChangeCategoryViewModel
+import com.example.util.simpletimetracker.feature_change_category.R
 import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryChooserState.Closed
 import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryChooserState.Color
 import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryChooserState.GoalTime
 import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryChooserState.Type
+import com.example.util.simpletimetracker.feature_change_category.viewData.ChangeCategoryTypesViewData
+import com.example.util.simpletimetracker.feature_change_category.viewModel.ChangeCategoryViewModel
 import com.example.util.simpletimetracker.feature_change_goals.api.ChangeRecordTypeGoalsViewData
 import com.example.util.simpletimetracker.feature_change_goals.views.GoalsViewDelegate
 import com.example.util.simpletimetracker.feature_views.extension.animateColor
@@ -277,6 +279,12 @@ class ChangeCategoryFragment :
         fieldChangeCategoryColor.isVisible = isClosed || state.current is Color
         fieldChangeCategoryType.isVisible = isClosed || state.current is Type
         fieldChangeCategoryGoalTime.isVisible = isClosed || state.current is GoalTime
+
+        // Chooser size
+        val sizeDefault = resources.getDimensionPixelSize(R.dimen.input_field_height)
+        val sizeBig = resources.getDimensionPixelSize(R.dimen.input_field_height_big)
+        val colorSize = if (state.current is Color) sizeDefault else sizeBig
+        fieldChangeCategoryColor.updateLayoutParams { height = colorSize }
     }
 
     private fun updateGoalsState(state: ChangeRecordTypeGoalsViewData) = with(binding) {
diff --git a/features/feature_change_category/src/main/res/layout/change_category_fragment.xml b/features/feature_change_category/src/main/res/layout/change_category_fragment.xml
@@ -153,7 +153,7 @@
                 android:id="@+id/fieldChangeCategoryColor"
                 style="@style/InputFieldCard"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/input_field_height"
+                android:layout_height="@dimen/input_field_height_big"
                 android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
                 android:layout_marginTop="3dp"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/features/feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt b/features/feature_change_record_tag/src/main/java/com/example/util/simpletimetracker/feature_change_record_tag/view/ChangeRecordTagFragment.kt
@@ -7,6 +7,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.core.view.setPadding
+import androidx.core.view.updateLayoutParams
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
@@ -53,6 +55,7 @@ import com.example.util.simpletimetracker.feature_change_record_tag.viewData.Cha
 import com.example.util.simpletimetracker.feature_change_record_tag.viewData.ChangeRecordTagTypesViewData
 import com.example.util.simpletimetracker.feature_change_record_tag.viewModel.ChangeRecordTagViewModel
 import com.example.util.simpletimetracker.feature_views.extension.animateColor
+import com.example.util.simpletimetracker.feature_views.extension.dpToPx
 import com.example.util.simpletimetracker.feature_views.extension.setCompoundDrawableWithIntrinsicBounds
 import com.example.util.simpletimetracker.feature_views.extension.setOnClick
 import com.example.util.simpletimetracker.feature_views.extension.visible
@@ -358,6 +361,7 @@ class ChangeRecordTagFragment :
         )
 
         val isClosed = state.current is Closed
+        spaceChangeRecordTagFieldsTop.isVisible = !isClosed
         inputChangeRecordTagName.isVisible = isClosed
         btnChangeRecordTagSelectActivity.isVisible = isClosed
         btnChangeRecordTagStatistics.isVisible =
@@ -374,6 +378,16 @@ class ChangeRecordTagFragment :
         fieldChangeRecordTagIcon.isVisible = isClosed || state.current is Icon
         fieldChangeRecordTagType.isVisible = isClosed || state.current is Type
         fieldChangeRecordTagDefaultType.isVisible = isClosed || state.current is DefaultType
+
+        // Chooser size
+        val sizeDefault = resources.getDimensionPixelSize(R.dimen.input_field_height)
+        val sizeBig = resources.getDimensionPixelSize(R.dimen.input_field_height_big)
+        val colorSize = if (state.current is Color) sizeDefault else sizeBig
+        fieldChangeRecordTagColor.updateLayoutParams { height = colorSize }
+        val iconSize = if (state.current is Icon) sizeDefault else sizeBig
+        fieldChangeRecordTagIcon.updateLayoutParams { height = iconSize }
+        val iconPreviewPadding = if (state.current is Icon) 4 else 8
+        iconChangeRecordTagIconPreview.setPadding(iconPreviewPadding.dpToPx())
     }
 
     private fun updateIconColorSourceSelected(selected: Boolean) = with(binding) {
diff --git a/features/feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml b/features/feature_change_record_tag/src/main/res/layout/change_record_tag_fragment.xml
@@ -158,6 +158,13 @@
                 app:barrierDirection="bottom"
                 app:constraint_referenced_ids="btnChangeRecordTagStatistics, btnChangeRecordTagArchive, btnChangeRecordTagDelete" />
 
+            <Space
+                android:id="@+id/spaceChangeRecordTagFieldsTop"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/edit_screen_field_top_margin"
+                android:visibility="gone"
+                app:layout_constraintTop_toBottomOf="@id/barrierChangeRecordTagButtons" />
+
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/inputChangeRecordTagName"
                 style="@style/ChangeItemInputField"
@@ -166,7 +173,7 @@
                 android:layout_marginHorizontal="@dimen/edit_screen_margin_horizontal"
                 android:layout_marginTop="@dimen/edit_screen_field_top_margin"
                 app:errorIconDrawable="@null"
-                app:layout_constraintTop_toBottomOf="@id/barrierChangeRecordTagButtons">
+                app:layout_constraintTop_toBottomOf="@id/spaceChangeRecordTagFieldsTop">
 
                 <com.google.android.material.textfield.TextInputEditText
                     android:id="@+id/etChangeRecordTagName"
@@ -181,13 +188,15 @@
                 android:id="@+id/fieldChangeRecordTagColor"
                 style="@style/InputFieldCard"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/input_field_height"
-                android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
+                android:layout_height="@dimen/input_field_height_big"
+                android:layout_marginStart="@dimen/edit_screen_field_margin_horizontal"
                 android:layout_marginTop="3dp"
-                app:layout_constraintEnd_toEndOf="parent"
+                android:layout_marginEnd="0dp"
+                app:layout_constraintEnd_toStartOf="@id/fieldChangeRecordTagIcon"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTagName"
-                app:layout_goneMarginTop="@dimen/edit_screen_field_top_margin">
+                app:layout_goneMarginEnd="@dimen/edit_screen_field_margin_horizontal"
+                app:layout_goneMarginTop="0dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -226,12 +235,15 @@
                 android:id="@+id/fieldChangeRecordTagIcon"
                 style="@style/InputFieldCard"
                 android:layout_width="0dp"
-                android:layout_height="@dimen/input_field_height"
-                android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
+                android:layout_height="@dimen/input_field_height_big"
+                android:layout_marginStart="0dp"
+                android:layout_marginTop="3dp"
+                android:layout_marginEnd="@dimen/edit_screen_field_margin_horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTagColor"
-                app:layout_goneMarginTop="@dimen/edit_screen_field_top_margin">
+                app:layout_constraintStart_toEndOf="@id/fieldChangeRecordTagColor"
+                app:layout_constraintTop_toBottomOf="@id/inputChangeRecordTagName"
+                app:layout_goneMarginStart="@dimen/edit_screen_field_margin_horizontal"
+                app:layout_goneMarginTop="0dp">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -250,7 +262,8 @@
                             android:id="@+id/iconChangeRecordTagIconPreview"
                             style="@style/EditScreenPreviewIcon"
                             android:layout_width="match_parent"
-                            android:layout_height="match_parent" />
+                            android:layout_height="match_parent"
+                            android:padding="8dp" />
 
                     </com.google.android.material.card.MaterialCardView>
 
@@ -274,6 +287,13 @@
 
             </androidx.cardview.widget.CardView>
 
+            <androidx.constraintlayout.widget.Barrier
+                android:id="@+id/barrierChangeRecordTagMain"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                app:barrierDirection="bottom"
+                app:constraint_referenced_ids="fieldChangeRecordTagColor, fieldChangeRecordTagIcon" />
+
             <androidx.cardview.widget.CardView
                 android:id="@+id/fieldChangeRecordTagType"
                 style="@style/InputFieldCard"
@@ -282,8 +302,7 @@
                 android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTagIcon"
-                app:layout_goneMarginTop="@dimen/edit_screen_field_top_margin">
+                app:layout_constraintTop_toBottomOf="@id/barrierChangeRecordTagMain">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -337,8 +356,7 @@
                 android:layout_marginHorizontal="@dimen/edit_screen_field_margin_horizontal"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTagType"
-                app:layout_goneMarginTop="@dimen/edit_screen_field_top_margin">
+                app:layout_constraintTop_toBottomOf="@id/fieldChangeRecordTagType">
 
                 <androidx.constraintlayout.widget.ConstraintLayout
                     android:layout_width="match_parent"
@@ -407,7 +425,7 @@
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="@dimen/edit_screen_margin_horizontal"
-                android:layout_marginTop="-2dp"
+                android:layout_marginTop="-4dp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@id/btnChangeRecordTagSelectActivity">
diff --git a/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt b/features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
@@ -7,6 +7,8 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
+import androidx.core.view.setPadding
+import androidx.core.view.updateLayoutParams
 import androidx.core.widget.doAfterTextChanged
 import androidx.fragment.app.viewModels
 import androidx.recyclerview.widget.GridLayoutManager
@@ -47,6 +49,7 @@ import com.example.util.simpletimetracker.feature_base_adapter.loader.createLoad
 import com.example.util.simpletimetracker.feature_base_adapter.recordType.RecordTypeViewData
 import com.example.util.simpletimetracker.feature_change_goals.api.ChangeRecordTypeGoalsViewData
 import com.example.util.simpletimetracker.feature_change_goals.views.GoalsViewDelegate
+import com.example.util.simpletimetracker.feature_change_record_type.R
 import com.example.util.simpletimetracker.feature_change_record_type.viewData.ChangeRecordTypeAdditionalState
 import com.example.util.simpletimetracker.feature_change_record_type.viewData.ChangeRecordTypeCategoriesViewData
 import com.example.util.simpletimetracker.feature_change_record_type.viewData.ChangeRecordTypeChooserState.Additional
@@ -416,6 +419,16 @@ class ChangeRecordTypeFragment :
         fieldChangeRecordTypeCategory.isVisible = isClosed || state.current is Category
         fieldChangeRecordTypeGoalTime.isVisible = isClosed || state.current is GoalTime
         fieldChangeRecordTypeAdditional.isVisible = isClosed || state.current is Additional
+
+        // Chooser size
+        val sizeDefault = resources.getDimensionPixelSize(R.dimen.input_field_height)
+        val sizeBig = resources.getDimensionPixelSize(R.dimen.input_field_height_big)
+        val colorSize = if (state.current is Color) sizeDefault else sizeBig
+        fieldChangeRecordTypeColor.updateLayoutParams { height = colorSize }
+        val iconSize = if (state.current is Icon) sizeDefault else sizeBig
+        fieldChangeRecordTypeIcon.updateLayoutParams { height = iconSize }
+        val iconPreviewPadding = if (state.current is Icon) 4 else 8
+        iconChangeRecordTypeIconPreview.setPadding(iconPreviewPadding.dpToPx())
     }
 
     private fun updateGoalsState(state: ChangeRecordTypeGoalsViewData) = with(binding) {
diff --git a/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml b/features/feature_change_record_type/src/main/res/layout/change_record_type_fragment.xml
diff --git a/features/feature_views/src/main/res/values/dimens.xml b/features/feature_views/src/main/res/values/dimens.xml
