Revert "Changed arrow colors and removed an old way"

This reverts commit ce114e6b69.

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)
         }

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
+        }
+    }
 }

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()

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

app/src/main/res/layout/activity_settings.xml

@@ -313,6 +313,22 @@
                     android:text="@string/disable_proximity_sensor" />
 
             </RelativeLayout>
+
+            <RelativeLayout
+                android:id="@+id/settings_enable_swipe_to_answer_holder"
+                style="@style/SettingsHolderCheckboxStyle"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@drawable/ripple_bottom_corners">
+
+                <com.simplemobiletools.commons.views.MyAppCompatCheckbox
+                    android:id="@+id/settings_enable_swipe_to_answer"
+                    style="@style/SettingsCheckboxStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/enable_swipe_to_answer" />
+
+            </RelativeLayout>
         </LinearLayout>
     </LinearLayout>
 </ScrollView>

app/src/main/res/values-cs/strings.xml

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Seskupte další hovory se stejným číslem v protokolu hovorů</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Dialer - Spravujte své telefonní hovory snadno</string>

app/src/main/res/values-da/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Gruppér efterfølgende opkald med samme nummer i opkaldsloggen</string>
     <string name="open_dialpad_by_default">Åben det numeriske tastatur som standard når appen åbner</string>
     <string name="disable_proximity_sensor">Deaktivér nærhedssensor under opkald</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">In der Anrufliste aufeinanderfolgende Anrufe mit derselben Nummer gruppieren</string>
     <string name="open_dialpad_by_default">Öffnen Sie die Wähltastatur als Standard, wenn die App geöffnet wird</string>
     <string name="disable_proximity_sensor">Näherungssensor bei Anrufen deaktivieren</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Schlichtes Telefon – Verwalten Sie Ihre Anrufe ganz einfach</string>

app/src/main/res/values-el/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Ομαδοποίηση των επόμενων κλήσεων του ίδιου αριθμού στο αρχείο καταγραφής κλήσεων</string>
     <string name="open_dialpad_by_default">Ανοίξτε το πληκτρολόγιο από προεπιλογή όταν ανοίγει η εφαρμογή</string>
     <string name="disable_proximity_sensor">Απενεργοποίηση του αισθητήρα εγγύτητας κατά τη διάρκεια κλήσεων</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Agrupar llamadas subsecuentes con el mísmo número en el registro de llamadas</string>
     <string name="open_dialpad_by_default">Abrir el teclado de marcado de forma predeterminada al abrir la aplicación</string>
     <string name="disable_proximity_sensor">Deshabilitar el sensor de proximidad durante las llamadas</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

app/src/main/res/values-fi/strings.xml

@@ -51,6 +51,8 @@
     <string name="group_subsequent_calls">Ryhmitä saman numeron peräkkäiset puhelut puheluhistoriassa</string>
     <string name="open_dialpad_by_default">Avaa numeronäppäimistö, kun sovellus avataan</string>
     <string name="disable_proximity_sensor">Poista läheisyysanturi käytöstä puheluiden aikana</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
+
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Dialer - Hallitse puheluitasi helposti</string>

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

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Regrouper les appels suivants avec le même numéro dans le journal des appels</string>
     <string name="open_dialpad_by_default">Ouvrir le pavé numérique par défaut à l\'ouverture de l\'application</string>
     <string name="disable_proximity_sensor">Désactiver le capteur de proximité pendant les appels</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Téléphone – Gérez facilement vos appels</string>

app/src/main/res/values-gl/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Agrupar, no rexisto, as chamadas para o mesmo contacto</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

app/src/main/res/values-hu/strings.xml

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Ugyanazon szám egymást követő hívásainak csoportosítása a hívásnaplóban</string>
     <string name="open_dialpad_by_default">Tárcsázó alapértelmezett kinyitása az alkalmazás megnyitásakor</string>
     <string name="disable_proximity_sensor">Közelségérzékelő kikapcsolása a hívások során</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Dialer – Telefonhívások kezelése egyszerűen</string>

app/src/main/res/values-id/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Kelompokkan panggilan berikutnya dengan nomor yang sama di log panggilan</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -51,6 +51,8 @@
     <string name="group_subsequent_calls">Raggruppa chiamate successive con lo stesso numero nel registro delle chiamate</string>
     <string name="open_dialpad_by_default">Apri il tastierino per impostazione predefinita quando l\'app si apre</string>
     <string name="disable_proximity_sensor">Disattiva il sensore di prossimità durante le chiamate</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
+
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Dialer - Gestisci le chiamate</string>

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">後続の通話をコールログの同じ番号でグループ化する</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

app/src/main/res/values-ml/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">കോൾ ലോഗിൽ അതേ നമ്പറുള്ള കോളുകൾ ഗ്രൂപ്പുചെയ്യുക</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Oproepgeschiedenis: opeenvolgende items van hetzelfde nummer groeperen</string>
     <string name="open_dialpad_by_default">Standaard het toetsenblok openen bij starten</string>
     <string name="disable_proximity_sensor">Nabijheidssensor uitschakelen tijdens bellen</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Grupuj kolejne połączenia z tym samym numerem w rejestrze połączeń</string>
     <string name="open_dialpad_by_default">Otwieraj panel wybierania numeru domyślnie przy uruchomieniu aplikacji</string>
     <string name="disable_proximity_sensor">Wyłączaj czujnik zbliżeniowy podczas połączeń</string>
+    <string name="enable_swipe_to_answer">Włącz gest przesunięcia do odpowiadania na połączenia przychodzące</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Prosty telefon - Łatwe połączenia telefoniczne</string>

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Agrupar, no registo, as chamadas para o mesmo contacto</string>
     <string name="open_dialpad_by_default">Mostrar teclado de marcação ao abrir a aplicação</string>
     <string name="disable_proximity_sensor">Desativar sensor de proximidade durante as chamadas</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Группировать последующие вызовы с тем же номером в журнале вызовов</string>
     <string name="open_dialpad_by_default">По умолчанию открывать номеронабиратель при запуске приложения</string>
     <string name="disable_proximity_sensor">Отключать датчик приближения во время вызовов</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Simple Dialer - управление телефонными звонками</string>

app/src/main/res/values-sk/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Zoskupiť susedné volania s rovnakým číslom v histórií volaní</string>
     <string name="open_dialpad_by_default">Otvoriť číselník po spustení apky</string>
     <string name="disable_proximity_sensor">Vypnúť počas hovorov senzor priblíženia</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Gruppera samtal till och från samma nummer i samtalshistoriken</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

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

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">Arama kaydında aynı numaraya sahip sonraki aramaları gruplandır</string>
     <string name="open_dialpad_by_default">Uygulama açıldığında varsayılan olarak tuş takımını aç</string>
     <string name="disable_proximity_sensor">Aramalar sırasında yakınlık sensörünü devre dışı bırak</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">Basit Çevirici - Aramaları kolayca yönetin</string>

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

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Group subsequent calls with the same number at the call log</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->

app/src/main/res/values-zh-rCN/strings.xml

@@ -51,6 +51,7 @@
     <string name="group_subsequent_calls">在通话记录中将同一号码的后续呼叫合并为一组</string>
     <string name="open_dialpad_by_default">应用程序打开时默认打开拨号盘</string>
     <string name="disable_proximity_sensor">在通话期间禁用接近传感器</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->
     <string name="app_title">简易拨号器 - 轻松管理您的手机通话</string>

app/src/main/res/values/strings.xml

@@ -56,6 +56,7 @@
     <string name="group_subsequent_calls">Group subsequent calls with the same number at the call log</string>
     <string name="open_dialpad_by_default">Open the dialpad by default when the app opens</string>
     <string name="disable_proximity_sensor">Disable proximity sensor during calls</string>
+    <string name="enable_swipe_to_answer">Enable swipe to answer an incoming call</string>
 
     <!-- Strings displayed only on Google Playstore. Optional, but good to have -->
     <!-- App title has to have less than 50 characters. If you cannot squeeze it, just remove a part of it -->