diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt index e96946e7..ee44d1ff 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/MainActivity.kt @@ -26,6 +26,7 @@ class MainActivity : SimpleActivity() { private var storedTextColor = 0 private var storedBackgroundColor = 0 private var storedPrimaryColor = 0 + private var storedShowPhoneNumbers = false private var storedStartNameWithSurname = false override fun onCreate(savedInstanceState: Bundle?) { @@ -58,6 +59,11 @@ class MainActivity : SimpleActivity() { return } + if (storedShowPhoneNumbers != config.showPhoneNumbers) { + restartActivity() + return + } + val configTextColor = config.textColor if (storedTextColor != configTextColor) { main_tabs_holder.getTabAt(getOtherViewPagerItem(viewpager.currentItem))?.icon?.applyColorFilter(configTextColor) @@ -124,6 +130,7 @@ class MainActivity : SimpleActivity() { storedTextColor = textColor storedBackgroundColor = backgroundColor storedPrimaryColor = primaryColor + storedShowPhoneNumbers = showPhoneNumbers storedStartNameWithSurname = startNameWithSurname } } diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt index 5bc39421..d8160ba2 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/activities/SettingsActivity.kt @@ -21,6 +21,7 @@ class SettingsActivity : SimpleActivity() { setupCustomizeColors() setupUseEnglish() setupShowInfoBubble() + setupShowPhoneNumbers() setupCallContactOnClick() setupStartNameWithSurname() updateTextColors(settings_holder) @@ -50,6 +51,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupShowPhoneNumbers() { + settings_show_phone_numbers.isChecked = config.showPhoneNumbers + settings_show_phone_numbers_holder.setOnClickListener { + settings_show_phone_numbers.toggle() + config.showPhoneNumbers = settings_show_phone_numbers.isChecked + } + } + private fun setupCallContactOnClick() { settings_call_contact_on_click.isChecked = config.callContact settings_call_contact_on_click_holder.setOnClickListener { diff --git a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt index 22225667..58cfe84d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt +++ b/app/src/main/kotlin/com/simplemobiletools/contacts/adapters/ContactsAdapter.kt @@ -21,7 +21,7 @@ import com.simplemobiletools.contacts.extensions.config import com.simplemobiletools.contacts.extensions.openContact import com.simplemobiletools.contacts.helpers.ContactsHelper import com.simplemobiletools.contacts.models.Contact -import kotlinx.android.synthetic.main.item_contact.view.* +import kotlinx.android.synthetic.main.item_contact_with_number.view.* class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList, val listener: RefreshRecyclerViewListener?, recyclerView: MyRecyclerView, itemClick: (Any) -> Unit) : MyRecyclerViewAdapter(activity, recyclerView, itemClick) { @@ -29,9 +29,11 @@ class ContactsAdapter(activity: SimpleActivity, var contactItems: MutableList + + + + + + + + + + + + diff --git a/app/src/main/res/layout/item_contact.xml b/app/src/main/res/layout/item_contact_with_number.xml similarity index 94% rename from app/src/main/res/layout/item_contact.xml rename to app/src/main/res/layout/item_contact_with_number.xml index b49bbcef..7e982ee7 100644 --- a/app/src/main/res/layout/item_contact.xml +++ b/app/src/main/res/layout/item_contact_with_number.xml @@ -24,7 +24,7 @@ android:src="@drawable/ic_person"/> + + + + + + + + + + diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b1b6f005..b171058a 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -19,6 +19,7 @@ Kontakt bei Klick anrufen Namen mit Vornamen beginnen + Show phone numbers on the main screen Email diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index ba863ffd..e3de362d 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -19,6 +19,7 @@ 클릭으로 전화걸기 성을 먼저 표시하기 + Show phone numbers on the main screen 이메일 diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml index 28ec7cce..f7d6829e 100644 --- a/app/src/main/res/values-pt/strings.xml +++ b/app/src/main/res/values-pt/strings.xml @@ -19,6 +19,7 @@ Call contact on click Start name with surname + Show phone numbers on the main screen E-mail diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index de0012d5..9574a8bb 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -19,6 +19,7 @@ Вызывать контакт при нажатии Отображать сначала фамилии + Show phone numbers on the main screen Email diff --git a/app/src/main/res/values-sk/strings.xml b/app/src/main/res/values-sk/strings.xml index 0ea27c5b..af66f20f 100644 --- a/app/src/main/res/values-sk/strings.xml +++ b/app/src/main/res/values-sk/strings.xml @@ -19,6 +19,7 @@ Zavolať kontakt po kliknutí Začať meno priezviskom + Zobraziť telefónne čísla na hlavnej obrazovke Email diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 816b8965..2b2d3682 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,6 +19,7 @@ Call contact on click Start name with surname + Show phone numbers on the main screen Email