A fork of Simple Time Tracker with WearOS support. (Now integrated upstream)
move Now time adjustment button to the right, make buttons bigger
+10
-14
+3
-2
core/src/main/res/layout/time_adjustment_item_layout.xml
+3
-2
core/src/main/res/layout/time_adjustment_item_layout.xml
···
10
10
<androidx.appcompat.widget.AppCompatTextView
11
11
android:id="@+id/tvTimeAdjustmentItem"
12
12
android:layout_width="match_parent"
13
-
android:layout_height="30dp"
13
+
android:layout_height="wrap_content"
14
14
android:background="?appInputFieldBorder"
15
15
android:gravity="center"
16
-
android:padding="4dp"
16
+
android:paddingHorizontal="4dp"
17
+
android:paddingVertical="8dp"
17
18
android:textColor="?appTextPrimaryColor"
18
19
app:autoSizeMaxTextSize="14sp"
19
20
app:autoSizeMinTextSize="1sp"
+4
core/src/main/java/com/example/util/simpletimetracker/core/view/timeAdjustment/TimeAdjustmentView.kt
+4
core/src/main/java/com/example/util/simpletimetracker/core/view/timeAdjustment/TimeAdjustmentView.kt
···
4
4
import android.util.AttributeSet
5
5
import android.view.LayoutInflater
6
6
import android.widget.FrameLayout
7
+
import androidx.core.view.updatePadding
7
8
import com.example.util.simpletimetracker.core.databinding.TimeAdjustmentItemLayoutBinding
8
9
import com.example.util.simpletimetracker.core.databinding.TimeAdjustmentViewLayoutBinding
9
10
import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
10
11
import com.example.util.simpletimetracker.feature_base_adapter.ViewHolderType
11
12
import com.example.util.simpletimetracker.feature_base_adapter.createRecyclerBindingAdapterDelegate
13
+
import com.example.util.simpletimetracker.feature_views.extension.dpToPx
12
14
import com.example.util.simpletimetracker.feature_views.extension.setOnClickWith
13
15
import com.google.android.flexbox.FlexDirection
14
16
import com.google.android.flexbox.FlexWrap
···
75
77
76
78
tvTimeAdjustmentItem.text = item.text
77
79
root.setOnClickWith(item, onItemClick)
80
+
val padding = (if (item is ViewData.Now) 12 else 4).dpToPx()
81
+
tvTimeAdjustmentItem.updatePadding(left = padding, right = padding)
78
82
79
83
(root.layoutParams as? FlexboxLayoutManager.LayoutParams)?.apply {
80
84
flexGrow = if (item is ViewData.Now) 0f else 1f
+1
-1
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt
+1
-1
features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/interactor/ChangeRecordViewDataInteractor.kt
···
77
77
78
78
fun getTimeAdjustmentItems(): List<ViewHolderType> {
79
79
return listOf(
80
-
TimeAdjustmentView.ViewData.Now(text = resourceRepo.getString(R.string.time_now)),
81
80
TimeAdjustmentView.ViewData.Adjust(text = "-30", value = -30),
82
81
TimeAdjustmentView.ViewData.Adjust(text = "-5", value = -5),
83
82
TimeAdjustmentView.ViewData.Adjust(text = "-1", value = -1),
84
83
TimeAdjustmentView.ViewData.Adjust(text = "+1", value = +1),
85
84
TimeAdjustmentView.ViewData.Adjust(text = "+5", value = +5),
86
85
TimeAdjustmentView.ViewData.Adjust(text = "+30", value = +30),
86
+
TimeAdjustmentView.ViewData.Now(text = resourceRepo.getString(R.string.time_now)),
87
87
)
88
88
}
89
89
+1
-1
features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
+1
-1
features/feature_change_record_type/src/main/java/com/example/util/simpletimetracker/feature_change_record_type/view/ChangeRecordTypeFragment.kt
···
7
7
import android.view.ViewGroup
8
8
import androidx.cardview.widget.CardView
9
9
import androidx.core.view.isVisible
10
+
import androidx.core.view.updatePadding
10
11
import androidx.core.widget.doAfterTextChanged
11
12
import androidx.fragment.app.viewModels
12
13
import androidx.recyclerview.widget.GridLayoutManager
···
58
59
import com.example.util.simpletimetracker.feature_views.extension.rotateUp
59
60
import com.example.util.simpletimetracker.feature_views.extension.setOnClick
60
61
import com.example.util.simpletimetracker.feature_views.extension.setSpanSizeLookup
61
-
import com.example.util.simpletimetracker.feature_views.extension.updatePadding
62
62
import com.example.util.simpletimetracker.feature_views.viewData.RecordTypeIcon
63
63
import com.example.util.simpletimetracker.navigation.params.screen.ChangeRecordTypeParams
64
64
import com.google.android.flexbox.FlexDirection
+1
-1
features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/StatisticsDetailCardView.kt
+1
-1
features/feature_statistics_detail/src/main/java/com/example/util/simpletimetracker/feature_statistics_detail/customView/StatisticsDetailCardView.kt
···
5
5
import android.view.LayoutInflater
6
6
import android.widget.FrameLayout
7
7
import androidx.core.content.res.ResourcesCompat
8
+
import androidx.core.view.updatePadding
8
9
import com.example.util.simpletimetracker.feature_base_adapter.BaseRecyclerAdapter
9
10
import com.example.util.simpletimetracker.feature_views.extension.dpToPx
10
11
import com.example.util.simpletimetracker.feature_views.extension.spToPx
11
-
import com.example.util.simpletimetracker.feature_views.extension.updatePadding
12
12
import com.example.util.simpletimetracker.feature_statistics_detail.R
13
13
import com.example.util.simpletimetracker.feature_statistics_detail.adapter.createStatisticsDetailCardAdapterDelegate
14
14
import com.example.util.simpletimetracker.feature_statistics_detail.databinding.StatisticsDetailCardViewBinding
-9
features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt
-9
features/feature_views/src/main/java/com/example/util/simpletimetracker/feature_views/extension/ViewExtensions.kt
···
120
120
}
121
121
}
122
122
123
-
fun View.updatePadding(
124
-
left: Int = paddingLeft,
125
-
top: Int = paddingTop,
126
-
right: Int = paddingRight,
127
-
bottom: Int = paddingBottom,
128
-
) {
129
-
setPadding(left, top, right, bottom)
130
-
}
131
-
132
123
fun View.getBitmapFromView(): Bitmap {
133
124
val defaultSize by lazy { 100.dpToPx() }
134
125
fun Int.checkValue(): Int = this.takeUnless { it <= 0 } ?: defaultSize