diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt index e92e1e54..c89ffefc 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -17,6 +17,7 @@ import android.view.KeyEvent import android.view.MotionEvent import android.view.View import android.view.ViewConfiguration +import androidx.core.view.isVisible import com.reddit.indicatorfastscroll.FastScrollItemIndicator import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.helpers.* @@ -53,6 +54,21 @@ class DialpadActivity : SimpleActivity() { return } + if (config.hideDialpadNumbers) { + dialpad_1_holder.isVisible = false + dialpad_2_holder.isVisible = false + dialpad_3_holder.isVisible = false + dialpad_4_holder.isVisible = false + dialpad_5_holder.isVisible = false + dialpad_6_holder.isVisible = false + dialpad_7_holder.isVisible = false + dialpad_8_holder.isVisible = false + dialpad_9_holder.isVisible = false + dialpad_plus_holder.isVisible = true + dialpad_0_holder.visibility = View.INVISIBLE + } + + setupOptionsMenu() speedDialValues = config.getSpeedDialValues() privateCursor = getMyContactsCursor(favoritesOnly = false, withPhoneNumbersOnly = true) @@ -89,6 +105,7 @@ class DialpadActivity : SimpleActivity() { setupCharClick(dialpad_8_holder, '8') setupCharClick(dialpad_9_holder, '9') setupCharClick(dialpad_0_holder, '0') + setupCharClick(dialpad_plus_holder, '+') setupCharClick(dialpad_asterisk_holder, '*', longClickable = false) setupCharClick(dialpad_hashtag_holder, '#', longClickable = false) 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 7d6e339c..4cadae89 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt @@ -43,6 +43,7 @@ class SettingsActivity : SimpleActivity() { setupGroupSubsequentCalls() setupStartNameWithSurname() setupDialpadVibrations() + setupDialpadNumbers() setupDialpadBeeps() setupShowCallConfirmation() setupDisableProximitySensor() @@ -234,6 +235,14 @@ class SettingsActivity : SimpleActivity() { } } + private fun setupDialpadNumbers() { + settings_hide_dialpad_numbers.isChecked = config.hideDialpadNumbers + settings_hide_dialpad_numbers_holder.setOnClickListener { + settings_hide_dialpad_numbers.toggle() + config.hideDialpadNumbers = settings_hide_dialpad_numbers.isChecked + } + } + private fun setupDialpadBeeps() { settings_dialpad_beeps.isChecked = config.dialpadBeeps settings_dialpad_beeps_holder.setOnClickListener { 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 6f31cc0c..bc85652d 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Config.kt @@ -76,6 +76,10 @@ class Config(context: Context) : BaseConfig(context) { get() = prefs.getBoolean(DIALPAD_VIBRATION, true) set(dialpadVibration) = prefs.edit().putBoolean(DIALPAD_VIBRATION, dialpadVibration).apply() + var hideDialpadNumbers: Boolean + get() = prefs.getBoolean(HIDE_DIALPAD_NUMBERS, false) + set(hideDialpadNumbers) = prefs.edit().putBoolean(HIDE_DIALPAD_NUMBERS, hideDialpadNumbers).apply() + var dialpadBeeps: Boolean get() = prefs.getBoolean(DIALPAD_BEEPS, true) set(dialpadBeeps) = prefs.edit().putBoolean(DIALPAD_BEEPS, dialpadBeeps).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 7c970ed9..a1329979 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/helpers/Constants.kt @@ -17,6 +17,7 @@ const val FAVORITES_CUSTOM_ORDER_SELECTED = "favorites_custom_order_selected" const val WAS_OVERLAY_SNACKBAR_CONFIRMED = "was_overlay_snackbar_confirmed" const val DIALPAD_VIBRATION = "dialpad_vibration" const val DIALPAD_BEEPS = "dialpad_beeps" +const val HIDE_DIALPAD_NUMBERS = "hide_dialpad_numbers" const val ALWAYS_SHOW_FULLSCREEN = "always_show_fullscreen" 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 4c3df964..34a0ccea 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -227,6 +227,22 @@ + + + + + + @@ -61,7 +63,8 @@ android:layout_centerHorizontal="true" android:layout_marginBottom="@dimen/medium_margin" android:gravity="center_horizontal" - android:text="ABC" /> + android:text="ABC" + android:visibility="gone" /> @@ -166,6 +172,7 @@ android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/six" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="@+id/dialpad_5_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_5_holder" @@ -198,6 +205,7 @@ android:layout_marginStart="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/seven" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_8_holder" app:layout_constraintStart_toStartOf="parent" @@ -230,6 +238,7 @@ android:layout_marginBottom="@dimen/medium_margin" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/eight" + android:visibility="visible" app:layout_constraintBottom_toTopOf="@+id/dialpad_0_holder" app:layout_constraintEnd_toStartOf="@+id/dialpad_9_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_7_holder"> @@ -261,6 +270,7 @@ android:layout_marginEnd="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/nine" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="@+id/dialpad_8_holder" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toEndOf="@+id/dialpad_8_holder" @@ -315,6 +325,7 @@ android:layout_marginBottom="@dimen/activity_margin" android:background="?attr/selectableItemBackgroundBorderless" android:contentDescription="@string/zero" + android:visibility="visible" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/dialpad_hashtag_holder" app:layout_constraintStart_toEndOf="@+id/dialpad_asterisk_holder"> @@ -343,6 +354,31 @@ + + + + + +