change timer stop back to click from long click

app/src/androidTest/java/com/example/util/simpletimetracker/SettingsBackupTest.kt

@@ -514,6 +514,7 @@ class SettingsBackupTest : BaseUiTest() {
         activityList.take(3).forEach { clickOnViewWithText(it.name) }
         clickOnViewWithText(R.string.duration_dialog_save)
         clickOnViewWithText(R.string.backup_options_import)
+        clickOnViewWithText(R.string.ok)
 
         // Check message
         tryAction { checkViewIsDisplayed(withText(R.string.message_import_complete)) }

features/feature_running_records/src/main/java/com/example/util/simpletimetracker/feature_running_records/viewModel/RunningRecordsViewModel.kt

@@ -145,7 +145,7 @@ class RunningRecordsViewModel @Inject constructor(
 
     // TODO change strings
     @Suppress("UNUSED_PARAMETER")
-    fun onRunningRecordLongClick(
+    fun onRunningRecordClick(
         item: RunningRecordViewData,
         sharedElements: Pair<Any, String>,
     ) {
@@ -156,7 +156,7 @@ class RunningRecordsViewModel @Inject constructor(
         }
     }
 
-    fun onRunningRecordClick(
+    fun onRunningRecordLongClick(
         item: RunningRecordViewData,
         sharedElements: Pair<Any, String>,
     ) = viewModelScope.launch {

features/feature_settings/src/main/java/com/example/util/simpletimetracker/feature_settings/partialRestore/viewModel/PartialRestoreViewModel.kt

@@ -209,8 +209,8 @@ class PartialRestoreViewModel @Inject constructor(
         )
     }
 
-    private suspend fun onFilterChange() {
-        val originalData = settingsFileWorkDelegate.partialBackupRestoreData ?: return
+    private suspend fun onFilterChange() = withContext(Dispatchers.Default) {
+        val originalData = settingsFileWorkDelegate.partialBackupRestoreData ?: return@withContext
         val newSelectableData = originalData
             .copy(
                 types = originalData.types.filter {
@@ -231,9 +231,8 @@ class PartialRestoreViewModel @Inject constructor(
             )
         settingsFileWorkDelegate.partialBackupRestoreDataSelectable = newSelectableData
         filters = filters.mapValues { (filter, ids) ->
-            ids.filter {
-                it in newSelectableData.getIds(filter, existing = false)
-            }.toSet()
+            val newIds = newSelectableData.getIds(filter, existing = false)
+            ids.filter { it in newIds }.toSet()
         }
     }
 

resources/src/main/res/values-ar/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">لبدء التتبع ، أضف الأنشطة بالنقر فوق الزر %s أو استخدم الإعدادات المسبقة الافتراضية بالنقر فوق الزر %s</string>
     <string name="running_records_empty">انقر على النشاط لبدء التتبع</string>
-    <string name="running_records_has_timers">انقر لفترة طويلة لإيقاف التتبع</string>
+    <string name="running_records_has_timers">انقر على البطاقة لإيقاف التتبع</string>
     <string name="running_records_empty_hint">انقر طويلا للتعديل</string>
     <string name="running_records_add_type">يضيف</string>
     <string name="running_records_add_filter">أضف عامل تصفية</string>

resources/src/main/res/values-ca/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Per començar el seguiment, afegiu activitats fent clic al botó %s o utilitzeu els valors predeterminats fent clic al botó %s</string>
     <string name="running_records_empty">Feu clic en una activitat per a començar a enregistrar</string>
-    <string name="running_records_has_timers">Feu clic llarg per aturar l\'enregistrament</string>
+    <string name="running_records_has_timers">Feu clic en una targeta per aturar l\'enregistrament</string>
     <string name="running_records_empty_hint">Mantingueu premut per editar</string>
     <string name="running_records_add_type">Afegeix</string>
     <string name="running_records_add_filter">Afegeix filtre</string>

resources/src/main/res/values-de/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">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</string>
     <string name="running_records_empty">Klicke auf Aktivität, um die Erfassung zu starten</string>
-    <string name="running_records_has_timers">Klicken Sie lange, um die Verfolgung zu beenden</string>
+    <string name="running_records_has_timers">Klicken Sie auf die Karte, um die Verfolgung zu beenden</string>
     <string name="running_records_empty_hint">Zum Bearbeiten lange klicken</string>
     <string name="running_records_add_type">Hinz.</string>
     <string name="running_records_add_filter">Filter hinzufügen</string>

resources/src/main/res/values-es/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">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</string>
     <string name="running_records_empty">Haga clic en una actividad para iniciar el temporizador</string>
-    <string name="running_records_has_timers">Haga clic largo para detener el seguimiento</string>
+    <string name="running_records_has_timers">Haga clic en la tarjeta para detener el seguimiento</string>
     <string name="running_records_empty_hint">Mantenga pulsado para editar</string>
     <string name="running_records_add_type">Añadir</string>
     <string name="running_records_add_filter">Añadir filtro</string>

resources/src/main/res/values-fa/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">برای شروع ردیابی، با کلیک بر روی دکمه %s فعالیت ها را اضافه کنید یا با کلیک بر روی دکمه %s از تنظیمات پیش فرض استفاده کنید</string>
     <string name="running_records_empty">فعالیت را برای شروع اندازه گیری لمس کنید</string>
-    <string name="running_records_has_timers">برای توقف ردیابی کلیک طولانی کنید</string>
+    <string name="running_records_has_timers">برای توقف اندازه گیری  کارت را لمس کنید</string>
     <string name="running_records_empty_hint">برای ویرایش لمس کنید و نگه دارید</string>
     <string name="running_records_add_type">اضافه کردن</string>
     <string name="running_records_add_filter">اضافه کردن فیلتر</string>

resources/src/main/res/values-fr/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">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</string>
     <string name="running_records_empty">Cliquez longuement pour éditer</string>
-    <string name="running_records_has_timers">Cliquez longuement pour arrêter le suivi</string>
+    <string name="running_records_has_timers">Cliquez sur la carte pour arrêter le suivi</string>
     <string name="running_records_empty_hint">Cliquez longuement pour éditer</string>
     <string name="running_records_add_type">Ajouter</string>
     <string name="running_records_add_filter">Ajouter un filtre</string>

resources/src/main/res/values-hi/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">ट्रैकिंग शुरू करने के लिए, %s बटन पर क्लिक करके गतिविधियाँ जोड़ें या %s बटन पर क्लिक करके डिफ़ॉल्ट प्रीसेट का उपयोग करें</string>
     <string name="running_records_empty">ट्रैकिंग शुरू करने के लिए गतिविधि पर क्लिक करें</string>
-    <string name="running_records_has_timers">ट्रैकिंग रोकने के लिए लंबा क्लिक करें</string>
+    <string name="running_records_has_timers">ट्रैकिंग बंद करने के लिए कार्ड पर क्लिक करें</string>
     <string name="running_records_empty_hint">संपादित करने के लिए लंबी क्लिक करें</string>
     <string name="running_records_add_type">जोड़ें</string>
     <string name="running_records_add_filter">फ़िल्टर जोड़ें</string>

resources/src/main/res/values-in/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Untuk memulai pelacakan, tambahkan aktivitas dengan mengklik tombol %s atau gunakan preset default dengan mengklik tombol %s</string>
     <string name="running_records_empty">Ketuk pada kegiatan untuk mulai melacak</string>
-    <string name="running_records_has_timers">Klik panjang untuk menghentikan pelacakan</string>
+    <string name="running_records_has_timers">Klik pada kartu untuk menghentikan pelacakan</string>
     <string name="running_records_empty_hint">Ketuk lama untuk menyunting</string>
     <string name="running_records_add_type">Tambah</string>
     <string name="running_records_add_filter">Tambahkan filter</string>

resources/src/main/res/values-it/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Per avviare il tracciamento, aggiungi attività facendo clic sul pulsante %s o utilizza i preset predefiniti facendo clic sul pulsante %s</string>
     <string name="running_records_empty">Clicca sull\'attività per iniziare il tracciamento</string>
-    <string name="running_records_has_timers">Clic lungo per interrompere il tracciamento</string>
+    <string name="running_records_has_timers">Fare clic sulla carta per interrompere il tracciamento</string>
     <string name="running_records_empty_hint">Tieni premuto per modificare</string>
     <string name="running_records_add_type">Aggiungi</string>
     <string name="running_records_add_filter">Aggiungi filtro</string>

resources/src/main/res/values-iw/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">כדי להתחיל מעקב, הוסף פעילויות על ידי לחיצה על כפתור %s או השתמש בקביעות ברירת מחדל על ידי לחיצה על כפתור %s</string>
     <string name="running_records_empty">לחץ על פעילות כדי להתחיל מעקב</string>
-    <string name="running_records_has_timers">לחץ לחיצה ארוכה כדי להפסיק את המעקב</string>
+    <string name="running_records_has_timers">לחץ על כרטיס כדי לעצור מעקב</string>
     <string name="running_records_empty_hint">לחץ לחיצה ארוכה כדי לערוך</string>
     <string name="running_records_add_type">הוסף</string>
     <string name="running_records_add_filter">הוסף מסנן</string>

resources/src/main/res/values-ja/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">追跡を開始するには、%s ボタンをクリックしてアクティビティを追加するか、%s ボタンをクリックしてデフォルトのプリセットを使用します。</string>
     <string name="running_records_empty">計測を開始するアクティビティをタップ</string>
-    <string name="running_records_has_timers">長押しして追跡を停止します</string>
+    <string name="running_records_has_timers">カードをクリックして追跡を停止します</string>
     <string name="running_records_empty_hint">長押しで編集</string>
     <string name="running_records_add_type">追加</string>
     <string name="running_records_add_filter">フィルタを追加</string>

resources/src/main/res/values-ko/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">기록을 시작하기 위해 %s 버튼을 눌러 활동을 추가하거나 %s 버튼을 눌러 기본 템플릿을 사용하세요</string>
     <string name="running_records_empty">활동을 눌러 기록을 시작하세요</string>
-    <string name="running_records_has_timers">추적을 중지하려면 길게 클릭하세요</string>
+    <string name="running_records_has_timers">카드를 눌러 기록을 멈추세요</string>
     <string name="running_records_empty_hint">길게 눌러 수정하세요</string>
     <string name="running_records_add_type">추가</string>
     <string name="running_records_add_filter">필터 추가</string>

resources/src/main/res/values-nl/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">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</string>
     <string name="running_records_empty">Klik op activiteit om het volgen te starten</string>
-    <string name="running_records_has_timers">Klik lang om het volgen te stoppen</string>
+    <string name="running_records_has_timers">Klik op de kaart om het volgen te stoppen</string>
     <string name="running_records_empty_hint">Lang klikken om te bewerken</string>
     <string name="running_records_add_type">Toevoegen</string>
     <string name="running_records_add_filter">Filter toevoegen</string>

resources/src/main/res/values-pl/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Aby rozpocząć śledzenie, dodaj aktywność, klikając przycisk %s lub użyj domyślnych, klikając przycisk %s</string>
     <string name="running_records_empty">Kliknij aktywność, aby rozpocząć śledzenie</string>
-    <string name="running_records_has_timers">Długie kliknięcie, aby zatrzymać śledzenie</string>
+    <string name="running_records_has_timers">Kliknij kartę, aby zatrzymać śledzenie</string>
     <string name="running_records_empty_hint">Przytrzymaj, aby edytować</string>
     <string name="running_records_add_type">Dodaj</string>
     <string name="running_records_add_filter">Dodaj filtr</string>

resources/src/main/res/values-pt-rPT/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Para iniciar o registo, adicionar atividades clicando no botão %s ou usar as definições padrão clicando no botão %s</string>
     <string name="running_records_empty">Clicar na atividade para começar a registar</string>
-    <string name="running_records_has_timers">Clique longo para parar o registo</string>
+    <string name="running_records_has_timers">Clicar no cartão para parar o registo</string>
     <string name="running_records_empty_hint">Clicar e segurar para editar</string>
     <string name="running_records_add_type">Adicionar</string>
     <string name="running_records_add_filter">Adicionar filtro</string>

resources/src/main/res/values-pt/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Para iniciar o rastreamento, adicione atividades clicando no botão %s ou use as predefinições padrão clicando no botão %s</string>
     <string name="running_records_empty">Clique na atividade para começar a monitorar</string>
-    <string name="running_records_has_timers">Clique longo para parar de rastrear</string>
+    <string name="running_records_has_timers">Clique no cartão para parar de rastrear</string>
     <string name="running_records_empty_hint">Clique e segure para editar</string>
     <string name="running_records_add_type">Adicionar</string>
     <string name="running_records_add_filter">Adicionar filtro</string>

resources/src/main/res/values-ro/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Pentru a începe urmărirea, adaugă activitatea prin apăsarea butonului %s sau folosește setările de bază apăsând butonul %s</string>
     <string name="running_records_empty">Apasă pe activitate pentru a începe urmărirea</string>
-    <string name="running_records_has_timers">Faceți clic lung pentru a înceta urmărirea</string>
+    <string name="running_records_has_timers">Apasă pe o carte pentru a înceta urmărirea</string>
     <string name="running_records_empty_hint">Apasă lung pentru a edita</string>
     <string name="running_records_add_type">Adaugă</string>
     <string name="running_records_add_filter">Adaugă filtru</string>

resources/src/main/res/values-ru/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Чтобы начать отслеживание, добавьте активности нажав кнопку %s, или используйте предустановки по умолчанию нажав кнопку %s</string>
     <string name="running_records_empty">Нажмите на активность, чтобы начать отслеживание</string>
-    <string name="running_records_has_timers">Нажмите и удерживайте, чтобы прекратить отслеживание</string>
+    <string name="running_records_has_timers">Нажмите на карточку, чтобы прекратить отслеживание</string>
     <string name="running_records_empty_hint">Нажмите и удерживайте для редактирования</string>
     <string name="running_records_add_type">Добав.</string>
     <string name="running_records_add_filter">Добавить фильтр</string>

resources/src/main/res/values-sv/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">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</string>
     <string name="running_records_empty">Tryck på en aktivitet för att påbörja tidtagning</string>
-    <string name="running_records_has_timers">Långklicka för att sluta spåra</string>
+    <string name="running_records_has_timers">Klicka på kortet för att sluta spåra</string>
     <string name="running_records_empty_hint">Håll intryckt för att redigera</string>
     <string name="running_records_add_type">Lägg till</string>
     <string name="running_records_add_filter">Lägg till filter</string>

resources/src/main/res/values-tr/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">İzlemeye başlamak için %s düğmesine tıklayarak etkinlikler ekleyin veya %s düğmesine tıklayarak varsayılan ön ayarları kullanın</string>
     <string name="running_records_empty">Takip etmeye başlamak için bir aktiviteye tıklayın</string>
-    <string name="running_records_has_timers">İzlemeyi durdurmak için uzun tıklayın</string>
+    <string name="running_records_has_timers">İzlemeyi durdurmak için karta tıklayın</string>
     <string name="running_records_empty_hint">Düzenlemek için uzun dokunun</string>
     <string name="running_records_add_type">Ekle</string>
     <string name="running_records_add_filter">Filtre ekle</string>

resources/src/main/res/values-uk/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Щоб розпочати відстеження, додайте дії, натиснувши кнопку %s, або використайте стандартні налаштування, натиснувши кнопку %s</string>
     <string name="running_records_empty">Натисніть на активність, щоб почати відстеження</string>
-    <string name="running_records_has_timers">Натисність та утримуйте, щоб припинити відстеження</string>
+    <string name="running_records_has_timers">Натисніть картку, щоб припинити відстеження</string>
     <string name="running_records_empty_hint">Натисність та утримуйте для редагування</string>
     <string name="running_records_add_type">Додати</string>
     <string name="running_records_add_filter">Додати фільтр</string>

resources/src/main/res/values-vi/strings.xml

@@ -242,7 +242,7 @@
     <!--  Running records  -->
     <string name="running_records_types_empty">Để 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</string>
     <string name="running_records_empty">Nhấp vào hoạt động để bắt đầu theo dõi</string>
-    <string name="running_records_has_timers">Nhấp chuột dài để dừng theo dõi</string>
+    <string name="running_records_has_timers">Bấm vào thẻ để ngừng theo dõi</string>
     <string name="running_records_empty_hint">Nhấn lâu để chỉnh sửa</string>
     <string name="running_records_add_type">Thêm</string>
     <string name="running_records_add_filter">Thêm bộ lọc</string>