From e8c2f1db91e24eae742c9752951826a76be46345 Mon Sep 17 00:00:00 2001 From: tibbi Date: Mon, 19 Nov 2018 20:57:17 +0100 Subject: [PATCH] fix #294, add an option to hide the dialpad on the main screen --- .../contacts/pro/activities/MainActivity.kt | 10 +++++--- .../pro/activities/SettingsActivity.kt | 12 +++++++++- .../contacts/pro/helpers/Config.kt | 4 ++++ .../contacts/pro/helpers/Constants.kt | 1 + app/src/main/res/layout/activity_settings.xml | 24 +++++++++++++++++++ app/src/main/res/values-az/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-eu/strings.xml | 1 + app/src/main/res/values-fr/strings.xml | 1 + app/src/main/res/values-hr/strings.xml | 1 + app/src/main/res/values-it/strings.xml | 1 + app/src/main/res/values-ja/strings.xml | 1 + app/src/main/res/values-ko-rKR/strings.xml | 1 + app/src/main/res/values-lt/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-zh-rTW/strings.xml | 1 + app/src/main/res/values/strings.xml | 1 + 22 files changed, 64 insertions(+), 4 deletions(-) diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt index e2f72172..842029ee 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/MainActivity.kt @@ -159,11 +159,15 @@ class MainActivity : SimpleActivity(), RefreshContactsListener { } } } - isFirstResume = false val dialpadIcon = resources.getColoredDrawableWithColor(R.drawable.ic_dialpad, if (isBlackAndWhiteTheme()) Color.BLACK else Color.WHITE) - main_dialpad_button.setImageDrawable(dialpadIcon) - main_dialpad_button.background.applyColorFilter(getAdjustedPrimaryColor()) + main_dialpad_button.apply { + setImageDrawable(dialpadIcon) + background.applyColorFilter(getAdjustedPrimaryColor()) + beVisibleIf(config.showDialpadButton) + } + + isFirstResume = false } override fun onPause() { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt index 0950612b..47b2f1d1 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/activities/SettingsActivity.kt @@ -2,7 +2,8 @@ package com.simplemobiletools.contacts.pro.activities import android.os.Bundle import com.simplemobiletools.commons.dialogs.RadioGroupDialog -import com.simplemobiletools.commons.extensions.* +import com.simplemobiletools.commons.extensions.beVisibleIf +import com.simplemobiletools.commons.extensions.updateTextColors import com.simplemobiletools.commons.models.RadioItem import com.simplemobiletools.contacts.pro.R import com.simplemobiletools.contacts.pro.dialogs.ManageVisibleFieldsDialog @@ -35,6 +36,7 @@ class SettingsActivity : SimpleActivity() { setupUse24HourTimeFormat() setupFilterDuplicates() setupShowCallConfirmation() + setupShowDialpadButton() setupOnContactClick() updateTextColors(settings_holder) } @@ -123,6 +125,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupShowDialpadButton() { + settings_show_dialpad_button.isChecked = config.showDialpadButton + settings_show_dialpad_button_holder.setOnClickListener { + settings_show_dialpad_button.toggle() + config.showDialpadButton = settings_show_dialpad_button.isChecked + } + } + private fun setupOnContactClick() { settings_on_contact_click.text = getOnContactClickText() settings_on_contact_click_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt index bd1fbcd3..483ac685 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Config.kt @@ -60,4 +60,8 @@ class Config(context: Context) : BaseConfig(context) { var showCallConfirmation: Boolean get() = prefs.getBoolean(SHOW_CALL_CONFIRMATION, false) set(showCallConfirmation) = prefs.edit().putBoolean(SHOW_CALL_CONFIRMATION, showCallConfirmation).apply() + + var showDialpadButton: Boolean + get() = prefs.getBoolean(SHOW_DIALPAD_BUTTON, true) + set(showDialpadButton) = prefs.edit().putBoolean(SHOW_DIALPAD_BUTTON, showDialpadButton).apply() } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt index 9e7fec57..e3b294e7 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/pro/helpers/Constants.kt @@ -17,6 +17,7 @@ const val SHOW_CONTACT_FIELDS = "show_contact_fields" const val SHOW_TABS = "show_tabs" const val FILTER_DUPLICATES = "filter_duplicates" const val SHOW_CALL_CONFIRMATION = "show_call_confirmation" +const val SHOW_DIALPAD_BUTTON = "show_dialpad_button" const val CONTACT_ID = "contact_id" const val SMT_PRIVATE = "smt_private" // used at the contact source of local contacts hidden from other apps diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 167eb122..60c430c4 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -294,6 +294,30 @@ + + + + + + Ada soyaddan başla Telefon nömrələrini əsas ekranda göstər Kontakt görüntülərini göstər + Show a dialpad button on the main screen Kontakta toxunduqda Kontakta zəng et Kontakt detallarına bax diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 6dbca51b..f653cc24 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -52,6 +52,7 @@ Namen mit Nachnamen beginnen Telefonnummern im Hauptmenü zeigen Vorschaubilder der Kontakte zeigen + Show a dialpad button on the main screen Beim Klicken auf den Kontakt Kontakt anrufen Kontaktdetails anzeigen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 618c88fb..e6ec479a 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -52,6 +52,7 @@ Εμφάνιση πρώτα το επώνυμο Εμφάνιση τηλεφωνικών αριθμών στην κύρια οθόνη Εμφάνιση μικρογραφιών επαφής + Show a dialpad button on the main screen Στην επιλογή επαφής Κλήση επαφής Εμφάνιση λεπτομερειών επαφής diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index a1d9b4d0..4322fe92 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -52,6 +52,7 @@ Abizenaren arabera sailkatu Erakutsi telefono zenbakiak pantaila nagusian Show contact thumbnails + Show a dialpad button on the main screen Kontaktu sakatzean Kontaktua deitu Ikusi kontaktu detaileak diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index d51d9d93..76284263 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -52,6 +52,7 @@ Trier les contacts par nom de famille Afficher les numéros de téléphone Afficher les vignettes des contacts + Show a dialpad button on the main screen Sur appui du contact Appeler le contact Voir les détails du contact diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index 19d24c52..201ff756 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -52,6 +52,7 @@ Započnite imena s prezimenima Prikaži telefonske brojeve na glavnom zaslonu Prikaži sličice kontakata + Show a dialpad button on the main screen Prilikom dodira kontakta Nazovi kontakt Prikaži pojedinosti o kontaktu diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index dd4efaa4..50ac868d 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -52,6 +52,7 @@ Prima il nome poi il cognome Mostra i numeri di telefono nella schermata principale Mostra le anteprime dei contatti + Show a dialpad button on the main screen Al click sul contatto Chiama contatto Visualizza i dettagli del contatto diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index d22b12f6..726b78a4 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -52,6 +52,7 @@ 姓を先に表示 メイン画面に電話番号を表示 連絡先のサムネイルを表示 + Show a dialpad button on the main screen 連絡先をタップ 連絡先に発信 連絡先の詳細を表示 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 12228256..076c20dd 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -52,6 +52,7 @@ 성을 먼저 표시 메인 스크린에 전화번호 표시 Show contact thumbnails + Show a dialpad button on the main screen On contact click Call contact View contact details diff --git a/app/src/main/res/values-lt/strings.xml b/app/src/main/res/values-lt/strings.xml index e29dad0f..42fe0bc1 100644 --- a/app/src/main/res/values-lt/strings.xml +++ b/app/src/main/res/values-lt/strings.xml @@ -52,6 +52,7 @@ Pavardė rodoma pirma Rodyti telefono numerius pagrindiniame programos ekrane Rodyti kontaktų miniatiūras + Show a dialpad button on the main screen Ant kontakto paspaudimo Skambinti kontaktui Žiūrėti kontakto detales diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 60f1d6cc..d7418f79 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -52,6 +52,7 @@ Ordenar por apelido Mostrar número de telefone no ecrã principal Mostrar miniatura do contacto + Show a dialpad button on the main screen Ao tocar no contacto Ligar Ver detalhes diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index 6d5c8629..23911999 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -52,6 +52,7 @@ Показывать сначала фамилию Показывать номера телефонов на главном экране Показывать фото контакта + Show a dialpad button on the main screen При нажатии на контакт Позвонить контакту Просмотреть подробности о контакте diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 77d6cfe2..5c2dc3b0 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -52,6 +52,7 @@ Začať meno priezviskom Zobraziť telefónne čísla na hlavnej obrazovke Zobraziť obrázky kontaktov + Zobraziť tlačidlo pre číselník na hlavnej obrazovke Po kliknutí na kontakt Zavolať kontakt Zobraziť údaje kontaktu diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 53652727..96b0555b 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -52,6 +52,7 @@ Visa efternamn först Visa telefonnummer i huvudvyn Visa kontaktminiatyrer + Show a dialpad button on the main screen Vid kontakttryckning Ring kontakt Visa kontaktuppgifter diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index f94da90e..55f7f257 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -52,6 +52,7 @@ Soyadı ile başla Ana ekranda telefon numaralarını göster Kişi küçük resimlerini göster + Show a dialpad button on the main screen Kişi tıklandığında Kişiyi ara Kişi bilgilerini göster diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 3f730034..cce3c4e9 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -52,6 +52,7 @@ 姓氏在前 主畫面顯示電話號碼 顯示聯絡人縮圖 + Show a dialpad button on the main screen 點擊聯絡人 打電話給聯絡人 顯示聯絡人資料 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8bf9c12c..43c25176 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -52,6 +52,7 @@ Start name with surname Show phone numbers on the main screen Show contact thumbnails + Show a dialpad button on the main screen On contact click Call contact View contact details