From f0fda44685021aa4b9423278db2b2448ae685151 Mon Sep 17 00:00:00 2001 From: Agnieszka C <85929121+Aga-C@users.noreply.github.com> Date: Wed, 22 Dec 2021 22:17:21 +0100 Subject: [PATCH] Revert "Changed arrow colors and removed an old way" This reverts commit ce114e6b696fad7f26a4043fade695ad7fb814ab. --- .../dialer/activities/CallActivity.kt | 18 ++++++++++++++---- .../dialer/activities/SettingsActivity.kt | 9 +++++++++ .../simplemobiletools/dialer/helpers/Config.kt | 4 ++++ .../dialer/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 16 ++++++++++++++++ app/src/main/res/values-cs/strings.xml | 1 + app/src/main/res/values-da/strings.xml | 1 + app/src/main/res/values-de/strings.xml | 1 + app/src/main/res/values-el/strings.xml | 1 + app/src/main/res/values-es/strings.xml | 1 + app/src/main/res/values-fi/strings.xml | 2 ++ app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-gl/strings.xml | 1 + app/src/main/res/values-hu/strings.xml | 1 + app/src/main/res/values-id/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 2 ++ app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ml/strings.xml | 1 + app/src/main/res/values-nl/strings.xml | 1 + app/src/main/res/values-pl/strings.xml | 1 + app/src/main/res/values-pt/strings.xml | 1 + app/src/main/res/values-ru/strings.xml | 1 + app/src/main/res/values-sk/strings.xml | 1 + app/src/main/res/values-sv/strings.xml | 1 + app/src/main/res/values-tr/strings.xml | 1 + app/src/main/res/values-uk/strings.xml | 1 + app/src/main/res/values-zh-rCN/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 28 files changed, 69 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index 68b8d02f..58a2e698 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -98,7 +98,20 @@ class CallActivity : SimpleActivity() { } private fun initButtons() { - handleSwipe() + if (config.enableSwipeToAnswer) { + handleSwipe() + } else { + call_draggable.beGone() + call_draggable_background.beGone() + + call_decline.setOnClickListener { + endCall() + } + + call_accept.setOnClickListener { + acceptCall() + } + } call_toggle_microphone.setOnClickListener { toggleMicrophone() @@ -170,9 +183,6 @@ class CallActivity : SimpleActivity() { leftArrowTranslation = -call_decline.x rightArrowTranslation = call_decline.x - call_left_arrow.applyColorFilter(getColor(R.color.md_red_400)) - call_right_arrow.applyColorFilter(getColor(R.color.md_green_400)) - startArrowAnimation(call_left_arrow, initialLeftArrowX, initialLeftArrowScaleX, initialLeftArrowScaleY, leftArrowTranslation) startArrowAnimation(call_right_arrow, initialRightArrowX, initialRightArrowScaleX, initialRightArrowScaleY, rightArrowTranslation) } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt index 9333fa4a..5807acbf 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt @@ -40,6 +40,7 @@ class SettingsActivity : SimpleActivity() { setupStartNameWithSurname() setupShowCallConfirmation() setupDisableProximitySensor() + setupEnableSwipeToAnswer() updateTextColors(settings_holder) invalidateOptionsMenu() @@ -220,4 +221,12 @@ class SettingsActivity : SimpleActivity() { config.disableProximitySensor = settings_disable_proximity_sensor.isChecked } } + + private fun setupEnableSwipeToAnswer() { + settings_enable_swipe_to_answer.isChecked = config.enableSwipeToAnswer + settings_enable_swipe_to_answer_holder.setOnClickListener { + settings_enable_swipe_to_answer.toggle() + config.enableSwipeToAnswer = settings_enable_swipe_to_answer.isChecked + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt index f199fce1..42f70347 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt @@ -52,6 +52,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(DISABLE_PROXIMITY_SENSOR, false) set(disableProximitySensor) = prefs.edit().putBoolean(DISABLE_PROXIMITY_SENSOR, disableProximitySensor).apply() + var enableSwipeToAnswer: Boolean + get() = prefs.getBoolean(ENABLE_SWIPE_TO_ANSWER, false) + set(enableSwipeToAnswer) = prefs.edit().putBoolean(ENABLE_SWIPE_TO_ANSWER, enableSwipeToAnswer).apply() + var showTabs: Int get() = prefs.getInt(SHOW_TABS, ALL_TABS_MASK) set(showTabs) = prefs.edit().putInt(SHOW_TABS, showTabs).apply() diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt index 0f73df60..0cfc6bc2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt @@ -10,6 +10,7 @@ const val REMEMBER_SIM_PREFIX = "remember_sim_" const val GROUP_SUBSEQUENT_CALLS = "group_subsequent_calls" const val OPEN_DIAL_PAD_AT_LAUNCH = "open_dial_pad_at_launch" const val DISABLE_PROXIMITY_SENSOR = "disable_proximity_sensor" +const val ENABLE_SWIPE_TO_ANSWER = "enable_swipe_to_answer" const val SHOW_TABS = "show_tabs" const val ALL_TABS_MASK = TAB_CONTACTS or TAB_FAVORITES or TAB_CALL_HISTORY diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 3b59ab2b..27a7bc9c 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -313,6 +313,22 @@ android:text="@string/disable_proximity_sensor" /> + + + + + + diff --git a/app/src/main/res/values-cs/strings.xml b/app/src/main/res/values-cs/strings.xml index 9d1381d1..e2864a22 100644 --- a/app/src/main/res/values-cs/strings.xml +++ b/app/src/main/res/values-cs/strings.xml @@ -51,6 +51,7 @@ Seskupte další hovory se stejným číslem v protokolu hovorů Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call Simple Dialer - Spravujte své telefonní hovory snadno diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 00eb046a..1b6feac3 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -56,6 +56,7 @@ Gruppér efterfølgende opkald med samme nummer i opkaldsloggen Åben det numeriske tastatur som standard når appen åbner Deaktivér nærhedssensor under opkald + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 3c5cb417..40ddad08 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -51,6 +51,7 @@ In der Anrufliste aufeinanderfolgende Anrufe mit derselben Nummer gruppieren Öffnen Sie die Wähltastatur als Standard, wenn die App geöffnet wird Näherungssensor bei Anrufen deaktivieren + Enable swipe to answer an incoming call Schlichtes Telefon – Verwalten Sie Ihre Anrufe ganz einfach diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 7bc3c005..de7240fb 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -56,6 +56,7 @@ Ομαδοποίηση των επόμενων κλήσεων του ίδιου αριθμού στο αρχείο καταγραφής κλήσεων Ανοίξτε το πληκτρολόγιο από προεπιλογή όταν ανοίγει η εφαρμογή Απενεργοποίηση του αισθητήρα εγγύτητας κατά τη διάρκεια κλήσεων + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index c43d3c75..f19390b9 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -56,6 +56,7 @@ Agrupar llamadas subsecuentes con el mísmo número en el registro de llamadas Abrir el teclado de marcado de forma predeterminada al abrir la aplicación Deshabilitar el sensor de proximidad durante las llamadas + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml index dd01eedf..a3f14531 100644 --- a/app/src/main/res/values-fi/strings.xml +++ b/app/src/main/res/values-fi/strings.xml @@ -51,6 +51,8 @@ Ryhmitä saman numeron peräkkäiset puhelut puheluhistoriassa Avaa numeronäppäimistö, kun sovellus avataan Poista läheisyysanturi käytöstä puheluiden aikana + Enable swipe to answer an incoming call + Simple Dialer - Hallitse puheluitasi helposti diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 058957e1..ee411fb8 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -51,6 +51,7 @@ Regrouper les appels suivants avec le même numéro dans le journal des appels Ouvrir le pavé numérique par défaut à l\'ouverture de l\'application Désactiver le capteur de proximité pendant les appels + Enable swipe to answer an incoming call Simple Téléphone – Gérez facilement vos appels diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index b26186f7..89c81093 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -56,6 +56,7 @@ Agrupar, no rexisto, as chamadas para o mesmo contacto Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml index 2dd26a0a..43619cc5 100644 --- a/app/src/main/res/values-hu/strings.xml +++ b/app/src/main/res/values-hu/strings.xml @@ -51,6 +51,7 @@ Ugyanazon szám egymást követő hívásainak csoportosítása a hívásnaplóban Tárcsázó alapértelmezett kinyitása az alkalmazás megnyitásakor Közelségérzékelő kikapcsolása a hívások során + Enable swipe to answer an incoming call Simple Dialer – Telefonhívások kezelése egyszerűen diff --git a/app/src/main/res/values-id/strings.xml b/app/src/main/res/values-id/strings.xml index e9a6f5a5..d63774eb 100644 --- a/app/src/main/res/values-id/strings.xml +++ b/app/src/main/res/values-id/strings.xml @@ -56,6 +56,7 @@ Kelompokkan panggilan berikutnya dengan nomor yang sama di log panggilan Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index a51883ae..6344a577 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -51,6 +51,8 @@ Raggruppa chiamate successive con lo stesso numero nel registro delle chiamate Apri il tastierino per impostazione predefinita quando l\'app si apre Disattiva il sensore di prossimità durante le chiamate + Enable swipe to answer an incoming call + Simple Dialer - Gestisci le chiamate diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index bb936505..28cd443c 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -56,6 +56,7 @@ 後続の通話をコールログの同じ番号でグループ化する Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-ml/strings.xml b/app/src/main/res/values-ml/strings.xml index 8321579f..bacd3d7a 100644 --- a/app/src/main/res/values-ml/strings.xml +++ b/app/src/main/res/values-ml/strings.xml @@ -56,6 +56,7 @@ കോൾ ലോഗിൽ അതേ നമ്പറുള്ള കോളുകൾ ഗ്രൂപ്പുചെയ്യുക Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call an incoming call diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 45c4654d..56768355 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -56,6 +56,7 @@ Oproepgeschiedenis: opeenvolgende items van hetzelfde nummer groeperen Standaard het toetsenblok openen bij starten Nabijheidssensor uitschakelen tijdens bellen + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index 962f91ba..302dab81 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -51,6 +51,7 @@ Grupuj kolejne połączenia z tym samym numerem w rejestrze połączeń Otwieraj panel wybierania numeru domyślnie przy uruchomieniu aplikacji Wyłączaj czujnik zbliżeniowy podczas połączeń + Włącz gest przesunięcia do odpowiadania na połączenia przychodzące Prosty telefon - Łatwe połączenia telefoniczne diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 95d92f32..2274425d 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -56,6 +56,7 @@ Agrupar, no registo, as chamadas para o mesmo contacto Mostrar teclado de marcação ao abrir a aplicação Desativar sensor de proximidade durante as chamadas + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 5d8eb1fd..e357e540 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -51,6 +51,7 @@ Группировать последующие вызовы с тем же номером в журнале вызовов По умолчанию открывать номеронабиратель при запуске приложения Отключать датчик приближения во время вызовов + Enable swipe to answer an incoming call Simple Dialer - управление телефонными звонками diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index da3eefb1..ba4e3b23 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -56,6 +56,7 @@ Zoskupiť susedné volania s rovnakým číslom v histórií volaní Otvoriť číselník po spustení apky Vypnúť počas hovorov senzor priblíženia + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 63c66ca3..3bb6bdfa 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -56,6 +56,7 @@ Gruppera samtal till och från samma nummer i samtalshistoriken Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index bbefcc88..f940b2ed 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -51,6 +51,7 @@ Arama kaydında aynı numaraya sahip sonraki aramaları gruplandır Uygulama açıldığında varsayılan olarak tuş takımını aç Aramalar sırasında yakınlık sensörünü devre dışı bırak + Enable swipe to answer an incoming call Basit Çevirici - Aramaları kolayca yönetin diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index 672574bd..9c84cd6a 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -56,6 +56,7 @@ Group subsequent calls with the same number at the call log Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index b9bd7898..928e0ab5 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -51,6 +51,7 @@ 在通话记录中将同一号码的后续呼叫合并为一组 应用程序打开时默认打开拨号盘 在通话期间禁用接近传感器 + Enable swipe to answer an incoming call 简易拨号器 - 轻松管理您的手机通话 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d2b08bb4..9c48cb29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -56,6 +56,7 @@ Group subsequent calls with the same number at the call log Open the dialpad by default when the app opens Disable proximity sensor during calls + Enable swipe to answer an incoming call