mirror of
https://github.com/SimpleMobileTools/Simple-Contacts.git
synced 2025-02-21 14:00:56 +01:00
remove the "Call contact on click" setting
This commit is contained in:
parent
67511c07d0
commit
b1c8b5a941
@ -24,7 +24,6 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
setupShowInfoBubble()
|
setupShowInfoBubble()
|
||||||
setupShowContactThumbnails()
|
setupShowContactThumbnails()
|
||||||
setupShowPhoneNumbers()
|
setupShowPhoneNumbers()
|
||||||
setupCallContactOnClick()
|
|
||||||
setupStartNameWithSurname()
|
setupStartNameWithSurname()
|
||||||
updateTextColors(settings_holder)
|
updateTextColors(settings_holder)
|
||||||
}
|
}
|
||||||
@ -77,14 +76,6 @@ class SettingsActivity : SimpleActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupCallContactOnClick() {
|
|
||||||
settings_call_contact_on_click.isChecked = config.callContact
|
|
||||||
settings_call_contact_on_click_holder.setOnClickListener {
|
|
||||||
settings_call_contact_on_click.toggle()
|
|
||||||
config.callContact = settings_call_contact_on_click.isChecked
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupStartNameWithSurname() {
|
private fun setupStartNameWithSurname() {
|
||||||
settings_start_with_surname.isChecked = config.startNameWithSurname
|
settings_start_with_surname.isChecked = config.startNameWithSurname
|
||||||
settings_start_with_surname_holder.setOnClickListener {
|
settings_start_with_surname_holder.setOnClickListener {
|
||||||
|
@ -51,7 +51,7 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList<Co
|
|||||||
|
|
||||||
override fun prepareActionMode(menu: Menu) {
|
override fun prepareActionMode(menu: Menu) {
|
||||||
menu.apply {
|
menu.apply {
|
||||||
findItem(R.id.cab_edit).isVisible = activity.config.callContact && isOneItemSelected()
|
findItem(R.id.cab_edit).isVisible = isOneItemSelected()
|
||||||
findItem(R.id.cab_remove).isVisible = isFavoritesFragment
|
findItem(R.id.cab_remove).isVisible = isFavoritesFragment
|
||||||
findItem(R.id.cab_select_all).isVisible = isFavoritesFragment
|
findItem(R.id.cab_select_all).isVisible = isFavoritesFragment
|
||||||
findItem(R.id.cab_add_to_favorites).isVisible = !isFavoritesFragment
|
findItem(R.id.cab_add_to_favorites).isVisible = !isFavoritesFragment
|
||||||
|
@ -119,7 +119,7 @@ abstract class MyViewPagerFragment(context: Context, attributeSet: AttributeSet)
|
|||||||
if (currAdapter == null || forceListRedraw) {
|
if (currAdapter == null || forceListRedraw) {
|
||||||
forceListRedraw = false
|
forceListRedraw = false
|
||||||
ContactsAdapter(activity as SimpleActivity, contacts, activity, this is FavoritesFragment, fragment_list, fragment_fastscroller) {
|
ContactsAdapter(activity as SimpleActivity, contacts, activity, this is FavoritesFragment, fragment_list, fragment_fastscroller) {
|
||||||
if (config.callContact) {
|
if (false) {
|
||||||
val contact = it as Contact
|
val contact = it as Contact
|
||||||
if (contact.phoneNumbers.isNotEmpty()) {
|
if (contact.phoneNumbers.isNotEmpty()) {
|
||||||
(activity as SimpleActivity).tryStartCall(it)
|
(activity as SimpleActivity).tryStartCall(it)
|
||||||
|
@ -14,10 +14,6 @@ class Config(context: Context) : BaseConfig(context) {
|
|||||||
get() = prefs.getInt(SORTING, SORT_BY_FIRST_NAME)
|
get() = prefs.getInt(SORTING, SORT_BY_FIRST_NAME)
|
||||||
set(sorting) = prefs.edit().putInt(SORTING, sorting).apply()
|
set(sorting) = prefs.edit().putInt(SORTING, sorting).apply()
|
||||||
|
|
||||||
var callContact: Boolean
|
|
||||||
get() = prefs.getBoolean(CALL_CONTACT_ON_CLICK, false)
|
|
||||||
set(callContact) = prefs.edit().putBoolean(CALL_CONTACT_ON_CLICK, callContact).apply()
|
|
||||||
|
|
||||||
var displayContactSources: Set<String>
|
var displayContactSources: Set<String>
|
||||||
get() = prefs.getStringSet(DISPLAY_CONTACT_SOURCES, hashSetOf("-1"))
|
get() = prefs.getStringSet(DISPLAY_CONTACT_SOURCES, hashSetOf("-1"))
|
||||||
set(displayContactSources) = prefs.edit().remove(DISPLAY_CONTACT_SOURCES).putStringSet(DISPLAY_CONTACT_SOURCES, displayContactSources).apply()
|
set(displayContactSources) = prefs.edit().remove(DISPLAY_CONTACT_SOURCES).putStringSet(DISPLAY_CONTACT_SOURCES, displayContactSources).apply()
|
||||||
|
@ -3,7 +3,6 @@ package com.simplemobiletools.contacts.helpers
|
|||||||
import android.provider.ContactsContract.CommonDataKinds
|
import android.provider.ContactsContract.CommonDataKinds
|
||||||
|
|
||||||
// shared prefs
|
// shared prefs
|
||||||
const val CALL_CONTACT_ON_CLICK = "call_contact_on_click"
|
|
||||||
const val SHOW_CONTACT_THUMBNAILS = "show_contact_thumbnails"
|
const val SHOW_CONTACT_THUMBNAILS = "show_contact_thumbnails"
|
||||||
const val SHOW_PHONE_NUMBERS = "show_phone_numbers"
|
const val SHOW_PHONE_NUMBERS = "show_phone_numbers"
|
||||||
const val DISPLAY_CONTACT_SOURCES = "display_contact_sources"
|
const val DISPLAY_CONTACT_SOURCES = "display_contact_sources"
|
||||||
|
@ -148,29 +148,6 @@
|
|||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/settings_call_contact_on_click_holder"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/medium_margin"
|
|
||||||
android:background="?attr/selectableItemBackground"
|
|
||||||
android:paddingBottom="@dimen/activity_margin"
|
|
||||||
android:paddingLeft="@dimen/normal_margin"
|
|
||||||
android:paddingRight="@dimen/normal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_margin">
|
|
||||||
|
|
||||||
<com.simplemobiletools.commons.views.MySwitchCompat
|
|
||||||
android:id="@+id/settings_call_contact_on_click"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="@null"
|
|
||||||
android:clickable="false"
|
|
||||||
android:paddingLeft="@dimen/medium_margin"
|
|
||||||
android:paddingStart="@dimen/medium_margin"
|
|
||||||
android:text="@string/call_contact_on_click"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/settings_start_with_surname_holder"
|
android:id="@+id/settings_start_with_surname_holder"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Foto entfernen</string>
|
<string name="remove_photo">Foto entfernen</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Kontakt bei Klick anrufen</string>
|
|
||||||
<string name="start_name_with_surname">Namen mit Nachnamen beginnen</string>
|
<string name="start_name_with_surname">Namen mit Nachnamen beginnen</string>
|
||||||
<string name="show_phone_numbers">Zeige Telefonnummern im Hauptmenü</string>
|
<string name="show_phone_numbers">Zeige Telefonnummern im Hauptmenü</string>
|
||||||
<string name="show_contact_thumbnails">Zeige Vorschaubilder für Kontakte</string>
|
<string name="show_contact_thumbnails">Zeige Vorschaubilder für Kontakte</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Supprimer la photo</string>
|
<string name="remove_photo">Supprimer la photo</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Appuyer pour appeler le contact</string>
|
|
||||||
<string name="start_name_with_surname">Commencer le nom par le surnom</string>
|
<string name="start_name_with_surname">Commencer le nom par le surnom</string>
|
||||||
<string name="show_phone_numbers">Afficher les numéros de téléphone sur l\'écran principal</string>
|
<string name="show_phone_numbers">Afficher les numéros de téléphone sur l\'écran principal</string>
|
||||||
<string name="show_contact_thumbnails">Afficher les vignettes des contacts</string>
|
<string name="show_contact_thumbnails">Afficher les vignettes des contacts</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">사진 삭제</string>
|
<string name="remove_photo">사진 삭제</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">클릭으로 전화걸기</string>
|
|
||||||
<string name="start_name_with_surname">성을 먼저 표시</string>
|
<string name="start_name_with_surname">성을 먼저 표시</string>
|
||||||
<string name="show_phone_numbers">메인 스크린에 전화번호 표시</string>
|
<string name="show_phone_numbers">메인 스크린에 전화번호 표시</string>
|
||||||
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Remove photo</string>
|
<string name="remove_photo">Remove photo</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Call contact on click</string>
|
|
||||||
<string name="start_name_with_surname">Start name with surname</string>
|
<string name="start_name_with_surname">Start name with surname</string>
|
||||||
<string name="show_phone_numbers">Show phone numbers on the main screen</string>
|
<string name="show_phone_numbers">Show phone numbers on the main screen</string>
|
||||||
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Удалить фото</string>
|
<string name="remove_photo">Удалить фото</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Вызывать контакт при нажатии</string>
|
|
||||||
<string name="start_name_with_surname">Показывать сначала фамилию</string>
|
<string name="start_name_with_surname">Показывать сначала фамилию</string>
|
||||||
<string name="show_phone_numbers">Показывать номера телефонов на главном экране</string>
|
<string name="show_phone_numbers">Показывать номера телефонов на главном экране</string>
|
||||||
<string name="show_contact_thumbnails">Показывать фото контакта</string>
|
<string name="show_contact_thumbnails">Показывать фото контакта</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Odstrániť foto</string>
|
<string name="remove_photo">Odstrániť foto</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Zavolať kontakt po kliknutí</string>
|
|
||||||
<string name="start_name_with_surname">Začať meno priezviskom</string>
|
<string name="start_name_with_surname">Začať meno priezviskom</string>
|
||||||
<string name="show_phone_numbers">Zobraziť telefónne čísla na hlavnej obrazovke</string>
|
<string name="show_phone_numbers">Zobraziť telefónne čísla na hlavnej obrazovke</string>
|
||||||
<string name="show_contact_thumbnails">Zobraziť obrázky kontaktov</string>
|
<string name="show_contact_thumbnails">Zobraziť obrázky kontaktov</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Ta bort foto</string>
|
<string name="remove_photo">Ta bort foto</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Ring kontakter när jag trycker på dem</string>
|
|
||||||
<string name="start_name_with_surname">Visa efternamn först</string>
|
<string name="start_name_with_surname">Visa efternamn först</string>
|
||||||
<string name="show_phone_numbers">Visa telefonnummer i huvudvyn</string>
|
<string name="show_phone_numbers">Visa telefonnummer i huvudvyn</string>
|
||||||
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
||||||
|
@ -21,7 +21,6 @@
|
|||||||
<string name="remove_photo">Remove photo</string>
|
<string name="remove_photo">Remove photo</string>
|
||||||
|
|
||||||
<!-- Settings -->
|
<!-- Settings -->
|
||||||
<string name="call_contact_on_click">Call contact on click</string>
|
|
||||||
<string name="start_name_with_surname">Start name with surname</string>
|
<string name="start_name_with_surname">Start name with surname</string>
|
||||||
<string name="show_phone_numbers">Show phone numbers on the main screen</string>
|
<string name="show_phone_numbers">Show phone numbers on the main screen</string>
|
||||||
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
<string name="show_contact_thumbnails">Show contact thumbnails</string>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user