diff --git a/core/src/main/res/drawable/action_stop.xml b/core/src/main/res/drawable/action_stop.xml new file mode 100644 index 000000000..ea6b2d3fb --- /dev/null +++ b/core/src/main/res/drawable/action_stop.xml @@ -0,0 +1,9 @@ + + + diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt index 7f1309acb..e9253da2d 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/view/ChangeRecordCore.kt @@ -180,6 +180,7 @@ class ChangeRecordCore( containerChangeRecordTimeStartedAdjust.listener = viewModel::onAdjustTimeStartedItemClick containerChangeRecordTimeEndedAdjust.listener = viewModel::onAdjustTimeEndedItemClick btnChangeRecordSave.setOnClick(viewModel::onSaveClick) + btnChangeRecordStop.setOnClick(viewModel::onStopClick) fragment.addOnBackPressedListener(action = viewModel::onBackPressed) } @@ -206,6 +207,10 @@ class ChangeRecordCore( owner = viewLifecycleOwner, observer = { setTimeEndedVisibility(it, binding) }, ) + stopButtonVisibility.observeOnce( + owner = viewLifecycleOwner, + observer = btnChangeRecordStop::visible::set, + ) types.observe(typesAdapter::replace) categories.observe { updateCategories(it, binding) } saveButtonEnabled.observe { enableModifyingButtons(it, binding) } @@ -318,6 +323,7 @@ class ChangeRecordCore( binding: ChangeRecordCoreLayoutBinding, ) = with(binding) { btnChangeRecordSave.isEnabled = isEnabled + btnChangeRecordStop.isEnabled = isEnabled } private fun setActionsViewData(data: List) { diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt index 5eee67abb..de4ddd4a4 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordBaseViewModel.kt @@ -114,6 +114,7 @@ abstract class ChangeRecordBaseViewModel( val timeEndedVisibility: LiveData by lazy { MutableLiveData(isTimeEndedAvailable) } val deleteIconVisibility: LiveData by lazy { MutableLiveData(isDeleteButtonVisible) } val statsIconVisibility: LiveData by lazy { MutableLiveData(isStatisticsButtonVisible) } + val stopButtonVisibility: LiveData by lazy { MutableLiveData(isStopButtonVisible) } protected var newTypeId: Long = 0 protected var newTimeEnded: Long = 0 @@ -133,6 +134,7 @@ abstract class ChangeRecordBaseViewModel( protected abstract suspend fun updatePreview() protected abstract fun getChangeCategoryParams(data: ChangeTagData): ChangeRecordTagFromScreen protected abstract suspend fun onSaveClickDelegate(doAfter: suspend () -> Unit = {}) + protected open suspend fun onStopClickDelegate() {} protected open suspend fun sendPreviewUpdate(fullUpdate: Boolean) {} protected abstract val forceSecondsInDurationDialog: Boolean protected abstract val mergeAvailable: Boolean @@ -144,6 +146,7 @@ abstract class ChangeRecordBaseViewModel( protected abstract val adjustNextRecordAvailable: Boolean protected abstract val isTimeEndedAvailable: Boolean protected abstract val isAdditionalActionsAvailable: Boolean + protected abstract val isStopButtonVisible: Boolean protected abstract val isDeleteButtonVisible: Boolean protected abstract val isStatisticsButtonVisible: Boolean @@ -280,6 +283,12 @@ abstract class ChangeRecordBaseViewModel( ) } + fun onStopClick() { + onRecordChangeButtonClick( + onProceed = ::onStopClickDelegate, + ) + } + fun onItemButtonClick(viewData: ChangeRecordButtonViewData) { changeRecordActionsDelegate.onItemButtonClick(viewData) } diff --git a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt index 348425a03..b8f0fc82a 100644 --- a/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt +++ b/features/feature_change_record/src/main/java/com/example/util/simpletimetracker/feature_change_record/viewModel/ChangeRecordViewModel.kt @@ -73,6 +73,7 @@ class ChangeRecordViewModel @Inject constructor( override val adjustNextRecordAvailable: Boolean get() = true override val isTimeEndedAvailable: Boolean get() = true override val isAdditionalActionsAvailable: Boolean get() = true + override val isStopButtonVisible: Boolean get() = false override val isDeleteButtonVisible: Boolean get() = recordId.orZero() != 0L override val isStatisticsButtonVisible: Boolean get() = extra is ChangeRecordParams.Tracked || diff --git a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml index 9bb799062..fadbcccae 100644 --- a/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml +++ b/features/feature_change_record/src/main/res/layout/change_record_core_layout.xml @@ -689,10 +689,24 @@ + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toStartOf="@id/btnChangeRecordStop" + app:layout_constraintStart_toStartOf="parent" /> + + diff --git a/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt b/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt index 63be7af55..7fa577de4 100644 --- a/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt +++ b/features/feature_change_running_record/src/main/java/com/example/util/simpletimetracker/feature_change_running_record/viewModel/ChangeRunningRecordViewModel.kt @@ -87,6 +87,7 @@ class ChangeRunningRecordViewModel @Inject constructor( override val showTimeEndedOnAdjustPreview: Boolean get() = false override val isTimeEndedAvailable: Boolean get() = false override val isAdditionalActionsAvailable: Boolean get() = false + override val isStopButtonVisible: Boolean get() = true override val isDeleteButtonVisible: Boolean get() = true override val isStatisticsButtonVisible: Boolean get() = true @@ -143,6 +144,12 @@ class ChangeRunningRecordViewModel @Inject constructor( router.back() } + override suspend fun onStopClickDelegate() { + runningRecordInteractor.get(extra.id) + ?.let { removeRunningRecordMediator.removeWithRecordAdd(it) } + router.back() + } + override suspend fun sendPreviewUpdate(fullUpdate: Boolean) { val recordPreview = record.value?.recordPreview ?: return val update = changeRunningRecordMapper.map( diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/model/RecordQuickActionsState.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/model/RecordQuickActionsState.kt index 0deebce32..5d748d0f3 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/model/RecordQuickActionsState.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/model/RecordQuickActionsState.kt @@ -30,5 +30,9 @@ data class RecordQuickActionsState( data class Merge( override val wrapBefore: Boolean, ) : Button + + data class Stop( + override val wrapBefore: Boolean, + ) : Button } } \ No newline at end of file diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/view/RecordQuickActionsDialogFragment.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/view/RecordQuickActionsDialogFragment.kt index b9bc937e0..5dfa1e7fa 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/view/RecordQuickActionsDialogFragment.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/view/RecordQuickActionsDialogFragment.kt @@ -64,6 +64,7 @@ class RecordQuickActionsDialogFragment : BaseBottomSheetFragment() { btnRecordQuickActionsRepeat.setOnClick(viewModel::onRepeatClicked) btnRecordQuickActionsDuplicate.setOnClick(viewModel::onDuplicateClicked) btnRecordQuickActionsMerge.setOnClick(viewModel::onMergeClicked) + btnRecordQuickActionsStop.setOnClick(viewModel::onStopClick) } override fun initViewModel(): Unit = with(viewModel) { @@ -114,6 +115,7 @@ class RecordQuickActionsDialogFragment : BaseBottomSheetFragment() { btnRecordQuickActionsRepeat to RecordQuickActionsState.Button.Repeat::class.java, btnRecordQuickActionsDuplicate to RecordQuickActionsState.Button.Duplicate::class.java, btnRecordQuickActionsMerge to RecordQuickActionsState.Button.Merge::class.java, + btnRecordQuickActionsStop to RecordQuickActionsState.Button.Stop::class.java, ) } diff --git a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/viewModel/RecordQuickActionsViewModel.kt b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/viewModel/RecordQuickActionsViewModel.kt index ac0591ad5..57b6d2ed1 100644 --- a/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/viewModel/RecordQuickActionsViewModel.kt +++ b/features/feature_dialogs/src/main/java/com/example/util/simpletimetracker/feature_dialogs/recordQuickActions/viewModel/RecordQuickActionsViewModel.kt @@ -18,6 +18,7 @@ import com.example.util.simpletimetracker.domain.interactor.RecordActionMergeMed import com.example.util.simpletimetracker.domain.interactor.RecordActionRepeatMediator import com.example.util.simpletimetracker.domain.interactor.RecordInteractor import com.example.util.simpletimetracker.domain.interactor.RemoveRunningRecordMediator +import com.example.util.simpletimetracker.domain.interactor.RunningRecordInteractor import com.example.util.simpletimetracker.domain.model.ChartFilterType import com.example.util.simpletimetracker.domain.model.Record import com.example.util.simpletimetracker.feature_dialogs.R @@ -42,6 +43,7 @@ class RecordQuickActionsViewModel @Inject constructor( private val recordActionContinueMediator: RecordActionContinueMediator, private val recordActionMergeMediator: RecordActionMergeMediator, private val removeRunningRecordMediator: RemoveRunningRecordMediator, + private val runningRecordInteractor: RunningRecordInteractor, ) : BaseViewModel() { lateinit var extra: RecordQuickActionsParams @@ -74,6 +76,10 @@ class RecordQuickActionsViewModel @Inject constructor( onButtonClick(onProceed = ::onMerge) } + fun onStopClick() { + onButtonClick(onProceed = ::onStop) + } + private suspend fun goToStatistics() { val params = extra.type ?: return val preview = extra.preview ?: return @@ -161,8 +167,7 @@ class RecordQuickActionsViewModel @Inject constructor( } private suspend fun onMerge() { - val record = extra.type as? Type.RecordUntracked - ?: return + val record = extra.type as? Type.RecordUntracked ?: return val prevRecord = recordInteractor.getPrev(timeStarted = record.timeStarted).firstOrNull() recordActionMergeMediator.execute( prevRecord = prevRecord, @@ -171,6 +176,13 @@ class RecordQuickActionsViewModel @Inject constructor( ) } + private suspend fun onStop() { + val record = extra.type as? Type.RecordRunning ?: return + runningRecordInteractor.get(record.id) + ?.let { removeRunningRecordMediator.removeWithRecordAdd(it) } + exit() + } + private suspend fun getTrackedRecord(): Record? { val recordId = (extra.type as? Type.RecordTracked)?.id ?: return null @@ -222,6 +234,7 @@ class RecordQuickActionsViewModel @Inject constructor( is Type.RecordRunning -> listOf( RecordQuickActionsState.Button.Statistics(false), RecordQuickActionsState.Button.Delete(false), + RecordQuickActionsState.Button.Stop(true) ) null -> emptyList() } diff --git a/features/feature_dialogs/src/main/res/layout/record_quick_actions_dialog_fragment.xml b/features/feature_dialogs/src/main/res/layout/record_quick_actions_dialog_fragment.xml index e76ec0831..b584b3f9c 100644 --- a/features/feature_dialogs/src/main/res/layout/record_quick_actions_dialog_fragment.xml +++ b/features/feature_dialogs/src/main/res/layout/record_quick_actions_dialog_fragment.xml @@ -256,6 +256,42 @@ + + + + + + + + + + + + diff --git a/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt b/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt index dde596d24..87cad5eda 100644 --- a/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt +++ b/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/view/RunningRecordsFragment.kt @@ -94,7 +94,7 @@ class RunningRecordsFragment : } } - override fun initViewModel() = with(binding) { + override fun initViewModel() { with(viewModel) { runningRecords.observe(runningRecordsAdapter::replace) resetScreen.observe { resetScreen() } diff --git a/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt b/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt index 2d4c3460f..7f92fd2b9 100644 --- a/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt +++ b/features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt @@ -143,8 +143,12 @@ class RunningRecordsViewModel @Inject constructor( } } + // TODO change strings @Suppress("UNUSED_PARAMETER") - fun onRunningRecordClick(item: RunningRecordViewData, sharedElements: Pair) { + fun onRunningRecordLongClick( + item: RunningRecordViewData, + sharedElements: Pair, + ) { viewModelScope.launch { runningRecordInteractor.get(item.id) ?.let { removeRunningRecordMediator.removeWithRecordAdd(it) } @@ -152,7 +156,7 @@ class RunningRecordsViewModel @Inject constructor( } } - fun onRunningRecordLongClick( + fun onRunningRecordClick( item: RunningRecordViewData, sharedElements: Pair, ) = viewModelScope.launch { diff --git a/resources/src/main/res/values-ar/strings.xml b/resources/src/main/res/values-ar/strings.xml index 0b400bb54..5e03bbacc 100644 --- a/resources/src/main/res/values-ar/strings.xml +++ b/resources/src/main/res/values-ar/strings.xml @@ -242,7 +242,7 @@ لبدء التتبع ، أضف الأنشطة بالنقر فوق الزر %s أو استخدم الإعدادات المسبقة الافتراضية بالنقر فوق الزر %s انقر على النشاط لبدء التتبع - انقر على البطاقة لإيقاف التتبع + انقر لفترة طويلة لإيقاف التتبع انقر طويلا للتعديل يضيف أضف عامل تصفية diff --git a/resources/src/main/res/values-ca/strings.xml b/resources/src/main/res/values-ca/strings.xml index 4b5c05015..2b24e1df8 100644 --- a/resources/src/main/res/values-ca/strings.xml +++ b/resources/src/main/res/values-ca/strings.xml @@ -242,7 +242,7 @@ Per començar el seguiment, afegiu activitats fent clic al botó %s o utilitzeu els valors predeterminats fent clic al botó %s Feu clic en una activitat per a començar a enregistrar - Feu clic en una targeta per aturar l\'enregistrament + Feu clic llarg per aturar l\'enregistrament Mantingueu premut per editar Afegeix Afegeix filtre diff --git a/resources/src/main/res/values-de/strings.xml b/resources/src/main/res/values-de/strings.xml index 72e8853cd..c23700ea0 100644 --- a/resources/src/main/res/values-de/strings.xml +++ b/resources/src/main/res/values-de/strings.xml @@ -242,7 +242,7 @@ Um mit der Verfolgung zu beginnen, fügen Sie Aktivitäten hinzu, indem Sie auf die Schaltfläche %s klicken, oder verwenden Sie Standardvoreinstellungen, indem Sie auf die Schaltfläche %s klicken Klicke auf Aktivität, um die Erfassung zu starten - Klicken Sie auf die Karte, um die Verfolgung zu beenden + Klicken Sie lange, um die Verfolgung zu beenden Zum Bearbeiten lange klicken Hinz. Filter hinzufügen diff --git a/resources/src/main/res/values-es/strings.xml b/resources/src/main/res/values-es/strings.xml index 2b6c46c02..63ef2c7a3 100644 --- a/resources/src/main/res/values-es/strings.xml +++ b/resources/src/main/res/values-es/strings.xml @@ -242,7 +242,7 @@ Para comenzar a rastrear, agregue actividades haciendo clic en el botón %s o use los ajustes preestablecidos predeterminados haciendo clic en el botón %s Haga clic en una actividad para iniciar el temporizador - Haga clic en la tarjeta para detener el seguimiento + Haga clic largo para detener el seguimiento Mantenga pulsado para editar Añadir Añadir filtro diff --git a/resources/src/main/res/values-fa/strings.xml b/resources/src/main/res/values-fa/strings.xml index a82d8e447..8649e1d2f 100644 --- a/resources/src/main/res/values-fa/strings.xml +++ b/resources/src/main/res/values-fa/strings.xml @@ -242,7 +242,7 @@ برای شروع ردیابی، با کلیک بر روی دکمه %s فعالیت ها را اضافه کنید یا با کلیک بر روی دکمه %s از تنظیمات پیش فرض استفاده کنید فعالیت را برای شروع اندازه گیری لمس کنید - برای توقف اندازه گیری کارت را لمس کنید + برای توقف ردیابی کلیک طولانی کنید برای ویرایش لمس کنید و نگه دارید اضافه کردن اضافه کردن فیلتر diff --git a/resources/src/main/res/values-fr/strings.xml b/resources/src/main/res/values-fr/strings.xml index 205e52ddc..06ea6ef0a 100644 --- a/resources/src/main/res/values-fr/strings.xml +++ b/resources/src/main/res/values-fr/strings.xml @@ -242,7 +242,7 @@ Pour commencer le suivi, ajoutez des activités en cliquant sur le bouton %s ou utilisez les préréglages par défaut en cliquant sur le bouton %s Cliquez longuement pour éditer - Cliquez sur la carte pour arrêter le suivi + Cliquez longuement pour arrêter le suivi Cliquez longuement pour éditer Ajouter Ajouter un filtre diff --git a/resources/src/main/res/values-hi/strings.xml b/resources/src/main/res/values-hi/strings.xml index 076d0c3bd..c3574866d 100644 --- a/resources/src/main/res/values-hi/strings.xml +++ b/resources/src/main/res/values-hi/strings.xml @@ -242,7 +242,7 @@ ट्रैकिंग शुरू करने के लिए, %s बटन पर क्लिक करके गतिविधियाँ जोड़ें या %s बटन पर क्लिक करके डिफ़ॉल्ट प्रीसेट का उपयोग करें ट्रैकिंग शुरू करने के लिए गतिविधि पर क्लिक करें - ट्रैकिंग बंद करने के लिए कार्ड पर क्लिक करें + ट्रैकिंग रोकने के लिए लंबा क्लिक करें संपादित करने के लिए लंबी क्लिक करें जोड़ें फ़िल्टर जोड़ें diff --git a/resources/src/main/res/values-in/strings.xml b/resources/src/main/res/values-in/strings.xml index f7d782b37..dc381ecf8 100644 --- a/resources/src/main/res/values-in/strings.xml +++ b/resources/src/main/res/values-in/strings.xml @@ -242,7 +242,7 @@ Untuk memulai pelacakan, tambahkan aktivitas dengan mengklik tombol %s atau gunakan preset default dengan mengklik tombol %s Ketuk pada kegiatan untuk mulai melacak - Klik pada kartu untuk menghentikan pelacakan + Klik panjang untuk menghentikan pelacakan Ketuk lama untuk menyunting Tambah Tambahkan filter diff --git a/resources/src/main/res/values-it/strings.xml b/resources/src/main/res/values-it/strings.xml index 0e44f053d..4927f1090 100644 --- a/resources/src/main/res/values-it/strings.xml +++ b/resources/src/main/res/values-it/strings.xml @@ -242,7 +242,7 @@ Per avviare il tracciamento, aggiungi attività facendo clic sul pulsante %s o utilizza i preset predefiniti facendo clic sul pulsante %s Clicca sull\'attività per iniziare il tracciamento - Fare clic sulla carta per interrompere il tracciamento + Clic lungo per interrompere il tracciamento Tieni premuto per modificare Aggiungi Aggiungi filtro diff --git a/resources/src/main/res/values-iw/strings.xml b/resources/src/main/res/values-iw/strings.xml index 97d6db0c0..3476aceab 100644 --- a/resources/src/main/res/values-iw/strings.xml +++ b/resources/src/main/res/values-iw/strings.xml @@ -242,7 +242,7 @@ כדי להתחיל מעקב, הוסף פעילויות על ידי לחיצה על כפתור %s או השתמש בקביעות ברירת מחדל על ידי לחיצה על כפתור %s לחץ על פעילות כדי להתחיל מעקב - לחץ על כרטיס כדי לעצור מעקב + לחץ לחיצה ארוכה כדי להפסיק את המעקב לחץ לחיצה ארוכה כדי לערוך הוסף הוסף מסנן diff --git a/resources/src/main/res/values-ja/strings.xml b/resources/src/main/res/values-ja/strings.xml index a4305b899..1bcaabe3e 100644 --- a/resources/src/main/res/values-ja/strings.xml +++ b/resources/src/main/res/values-ja/strings.xml @@ -242,7 +242,7 @@ 追跡を開始するには、%s ボタンをクリックしてアクティビティを追加するか、%s ボタンをクリックしてデフォルトのプリセットを使用します。 計測を開始するアクティビティをタップ - カードをクリックして追跡を停止します + 長押しして追跡を停止します 長押しで編集 追加 フィルタを追加 diff --git a/resources/src/main/res/values-ko/strings.xml b/resources/src/main/res/values-ko/strings.xml index 77fc95e29..6249ea042 100644 --- a/resources/src/main/res/values-ko/strings.xml +++ b/resources/src/main/res/values-ko/strings.xml @@ -242,7 +242,7 @@ 기록을 시작하기 위해 %s 버튼을 눌러 활동을 추가하거나 %s 버튼을 눌러 기본 템플릿을 사용하세요 활동을 눌러 기록을 시작하세요 - 카드를 눌러 기록을 멈추세요 + 추적을 중지하려면 길게 클릭하세요 길게 눌러 수정하세요 추가 필터 추가 diff --git a/resources/src/main/res/values-nl/strings.xml b/resources/src/main/res/values-nl/strings.xml index 3f2de9ef5..be21727ee 100644 --- a/resources/src/main/res/values-nl/strings.xml +++ b/resources/src/main/res/values-nl/strings.xml @@ -242,7 +242,7 @@ Om het volgen te starten, voegt u activiteiten toe door op de %s-knop te klikken of gebruikt u standaardinstellingen door op de %s-knop te klikken Klik op activiteit om het volgen te starten - Klik op de kaart om het volgen te stoppen + Klik lang om het volgen te stoppen Lang klikken om te bewerken Toevoegen Filter toevoegen diff --git a/resources/src/main/res/values-pl/strings.xml b/resources/src/main/res/values-pl/strings.xml index 971d215f1..d0bb96c6c 100644 --- a/resources/src/main/res/values-pl/strings.xml +++ b/resources/src/main/res/values-pl/strings.xml @@ -242,7 +242,7 @@ Aby rozpocząć śledzenie, dodaj aktywność, klikając przycisk %s lub użyj domyślnych, klikając przycisk %s Kliknij aktywność, aby rozpocząć śledzenie - Kliknij kartę, aby zatrzymać śledzenie + Długie kliknięcie, aby zatrzymać śledzenie Przytrzymaj, aby edytować Dodaj Dodaj filtr diff --git a/resources/src/main/res/values-pt-rPT/strings.xml b/resources/src/main/res/values-pt-rPT/strings.xml index 7c8bfe0f4..6d0f7d1cd 100644 --- a/resources/src/main/res/values-pt-rPT/strings.xml +++ b/resources/src/main/res/values-pt-rPT/strings.xml @@ -242,7 +242,7 @@ Para iniciar o registo, adicionar atividades clicando no botão %s ou usar as definições padrão clicando no botão %s Clicar na atividade para começar a registar - Clicar no cartão para parar o registo + Clique longo para parar o registo Clicar e segurar para editar Adicionar Adicionar filtro diff --git a/resources/src/main/res/values-pt/strings.xml b/resources/src/main/res/values-pt/strings.xml index 912cfbb7c..ce1975d81 100644 --- a/resources/src/main/res/values-pt/strings.xml +++ b/resources/src/main/res/values-pt/strings.xml @@ -242,7 +242,7 @@ Para iniciar o rastreamento, adicione atividades clicando no botão %s ou use as predefinições padrão clicando no botão %s Clique na atividade para começar a monitorar - Clique no cartão para parar de rastrear + Clique longo para parar de rastrear Clique e segure para editar Adicionar Adicionar filtro diff --git a/resources/src/main/res/values-ro/strings.xml b/resources/src/main/res/values-ro/strings.xml index 127e91a1a..60dd77960 100644 --- a/resources/src/main/res/values-ro/strings.xml +++ b/resources/src/main/res/values-ro/strings.xml @@ -242,7 +242,7 @@ Pentru a începe urmărirea, adaugă activitatea prin apăsarea butonului %s sau folosește setările de bază apăsând butonul %s Apasă pe activitate pentru a începe urmărirea - Apasă pe o carte pentru a înceta urmărirea + Faceți clic lung pentru a înceta urmărirea Apasă lung pentru a edita Adaugă Adaugă filtru diff --git a/resources/src/main/res/values-ru/strings.xml b/resources/src/main/res/values-ru/strings.xml index cd9387468..1ebe4f205 100644 --- a/resources/src/main/res/values-ru/strings.xml +++ b/resources/src/main/res/values-ru/strings.xml @@ -242,7 +242,7 @@ Чтобы начать отслеживание, добавьте активности нажав кнопку %s, или используйте предустановки по умолчанию нажав кнопку %s Нажмите на активность, чтобы начать отслеживание - Нажмите на карточку, чтобы прекратить отслеживание + Нажмите и удерживайте, чтобы прекратить отслеживание Нажмите и удерживайте для редактирования Добав. Добавить фильтр diff --git a/resources/src/main/res/values-sv/strings.xml b/resources/src/main/res/values-sv/strings.xml index a7b26cbba..fd233e9af 100644 --- a/resources/src/main/res/values-sv/strings.xml +++ b/resources/src/main/res/values-sv/strings.xml @@ -242,7 +242,7 @@ För att börja spåra, lägg till aktiviteter genom att klicka på %s-knappen eller använd standardförinställningar genom att klicka på %s-knappen Tryck på en aktivitet för att påbörja tidtagning - Klicka på kortet för att sluta spåra + Långklicka för att sluta spåra Håll intryckt för att redigera Lägg till Lägg till filter diff --git a/resources/src/main/res/values-tr/strings.xml b/resources/src/main/res/values-tr/strings.xml index 00a6fac7d..2a15b4fde 100644 --- a/resources/src/main/res/values-tr/strings.xml +++ b/resources/src/main/res/values-tr/strings.xml @@ -242,7 +242,7 @@ İzlemeye başlamak için %s düğmesine tıklayarak etkinlikler ekleyin veya %s düğmesine tıklayarak varsayılan ön ayarları kullanın Takip etmeye başlamak için bir aktiviteye tıklayın - İzlemeyi durdurmak için karta tıklayın + İzlemeyi durdurmak için uzun tıklayın Düzenlemek için uzun dokunun Ekle Filtre ekle diff --git a/resources/src/main/res/values-uk/strings.xml b/resources/src/main/res/values-uk/strings.xml index 40f5cbfe8..670dc88da 100644 --- a/resources/src/main/res/values-uk/strings.xml +++ b/resources/src/main/res/values-uk/strings.xml @@ -242,7 +242,7 @@ Щоб розпочати відстеження, додайте дії, натиснувши кнопку %s, або використайте стандартні налаштування, натиснувши кнопку %s Натисніть на активність, щоб почати відстеження - Натисніть картку, щоб припинити відстеження + Натисність та утримуйте, щоб припинити відстеження Натисність та утримуйте для редагування Додати Додати фільтр diff --git a/resources/src/main/res/values-vi/strings.xml b/resources/src/main/res/values-vi/strings.xml index 3f7767ccc..d3ca658bf 100644 --- a/resources/src/main/res/values-vi/strings.xml +++ b/resources/src/main/res/values-vi/strings.xml @@ -242,7 +242,7 @@ Để bắt đầu theo dõi, hãy thêm hoạt động bằng cách nhấp vào nút %s hoặc sử dụng thiết đặt trước mặc định bằng cách nhấp vào nút %s Nhấp vào hoạt động để bắt đầu theo dõi - Bấm vào thẻ để ngừng theo dõi + Nhấp chuột dài để dừng theo dõi Nhấn lâu để chỉnh sửa Thêm Thêm bộ lọc diff --git a/resources/src/main/res/values-zh-rTW/strings.xml b/resources/src/main/res/values-zh-rTW/strings.xml index c35d03f40..67709c9aa 100644 --- a/resources/src/main/res/values-zh-rTW/strings.xml +++ b/resources/src/main/res/values-zh-rTW/strings.xml @@ -242,7 +242,7 @@ 要開始跟踪,請單擊 %s 按鈕添加活動,或單擊 %s 按鈕使用默認預設 點擊於活動來開始追蹤 - 單擊卡片以停止跟踪 + 長按停止跟蹤 長按編輯 新增 新增過濾 diff --git a/resources/src/main/res/values-zh/strings.xml b/resources/src/main/res/values-zh/strings.xml index 4aeebb380..0848d302b 100644 --- a/resources/src/main/res/values-zh/strings.xml +++ b/resources/src/main/res/values-zh/strings.xml @@ -242,7 +242,7 @@ 要开始跟踪,请单击 %s 按钮添加活动,或单击 %s 按钮使用默认预设 单击“活动”开始追踪 - 单击卡片以停止跟踪 + 长按停止跟踪 长按以编辑 添加 添加过滤器 diff --git a/resources/src/main/res/values/strings.xml b/resources/src/main/res/values/strings.xml index f469bc2ea..05fe9f8bf 100644 --- a/resources/src/main/res/values/strings.xml +++ b/resources/src/main/res/values/strings.xml @@ -242,7 +242,7 @@ To start tracking, add activities by clicking on %s button or use default presets by clicking on %s button Click on activity to start tracking - Click on card to stop tracking + Long click to stop tracking Long click to edit Add Add filter