From 8244cf9875cd182c5266369f1304e0a9eb9c103a Mon Sep 17 00:00:00 2001 From: tibbi Date: Wed, 4 Jan 2023 10:59:52 +0100 Subject: [PATCH] updating commons --- app/build.gradle | 2 +- .../dialer/activities/CallActivity.kt | 9 +++------ .../dialer/activities/ConferenceActivity.kt | 2 +- .../dialer/activities/DialpadActivity.kt | 6 +++--- .../dialer/activities/MainActivity.kt | 2 +- .../dialer/activities/ManageSpeedDialActivity.kt | 2 +- .../dialer/activities/SettingsActivity.kt | 2 +- .../res/drawable/dialpad_button_background.xml | 14 -------------- app/src/main/res/values/styles.xml | 2 +- 9 files changed, 12 insertions(+), 29 deletions(-) delete mode 100644 app/src/main/res/drawable/dialpad_button_background.xml diff --git a/app/build.gradle b/app/build.gradle index a999c61a..48c03a06 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -62,7 +62,7 @@ android { } dependencies { - implementation 'com.github.SimpleMobileTools:Simple-Commons:7e489f7121' + implementation 'com.github.SimpleMobileTools:Simple-Commons:48be8434c3' implementation 'com.github.tibbi:IndicatorFastScroll:4524cd0b61' implementation 'me.grantland:autofittextview:0.2.1' } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt index 2e9b7d0a..78713fcb 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt @@ -23,10 +23,7 @@ import android.widget.ImageView import androidx.core.content.res.ResourcesCompat import androidx.core.view.children import com.simplemobiletools.commons.extensions.* -import com.simplemobiletools.commons.helpers.LOWER_ALPHA -import com.simplemobiletools.commons.helpers.MINUTE_SECONDS -import com.simplemobiletools.commons.helpers.isOreoMr1Plus -import com.simplemobiletools.commons.helpers.isOreoPlus +import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.models.SimpleListItem import com.simplemobiletools.dialer.R import com.simplemobiletools.dialer.dialogs.DynamicBottomSheetChooserDialog @@ -203,8 +200,8 @@ class CallActivity : SimpleActivity() { dialpad_asterisk_holder, dialpad_hashtag_holder ).forEach { - it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme) - it.background?.alpha = 50 + it.background = ResourcesCompat.getDrawable(resources, R.drawable.pill_background, theme) + it.background?.alpha = LOWER_ALPHA_INT } dialpad_0_holder.setOnLongClickListener { dialpadPressed('+'); true } diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt index 91316666..a4da2049 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt @@ -13,7 +13,7 @@ class ConferenceActivity : SimpleActivity() { isMaterialActivity = true super.onCreate(savedInstanceState) setContentView(R.layout.activity_conference) - updateMaterialActivityViews(conference_coordinator, conference_list, true) + updateMaterialActivityViews(conference_coordinator, conference_list, useTransparentNavigation = true, useTopSearchMenu = false) setupMaterialScrollListener(conference_list, conference_toolbar) conference_list.adapter = ConferenceCallsAdapter(this, conference_list, ArrayList(CallManager.getConferenceCalls())) {} } 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 b6262f07..e36cae24 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/DialpadActivity.kt @@ -51,7 +51,7 @@ class DialpadActivity : SimpleActivity() { setContentView(R.layout.activity_dialpad) hasRussianLocale = Locale.getDefault().language == "ru" - updateMaterialActivityViews(dialpad_coordinator, dialpad_holder, true) + updateMaterialActivityViews(dialpad_coordinator, dialpad_holder, useTransparentNavigation = true, useTopSearchMenu = false) setupMaterialScrollListener(dialpad_list, dialpad_toolbar) updateNavigationBarColor(getProperBackgroundColor()) @@ -88,8 +88,8 @@ class DialpadActivity : SimpleActivity() { dialpad_asterisk_holder, dialpad_hashtag_holder ).forEach { - it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme) - it.background?.alpha = 50 + it.background = ResourcesCompat.getDrawable(resources, R.drawable.pill_background, theme) + it.background?.alpha = LOWER_ALPHA_INT } setupOptionsMenu() diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt index 23ddd127..a301244f 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/MainActivity.kt @@ -59,7 +59,7 @@ class MainActivity : SimpleActivity() { appLaunched(BuildConfig.APPLICATION_ID) setupOptionsMenu() refreshMenuItems() - updateMaterialActivityViews(main_coordinator, main_holder, false) + updateMaterialActivityViews(main_coordinator, main_holder, useTransparentNavigation = false, useTopSearchMenu = false) launchedDialer = savedInstanceState?.getBoolean(OPEN_DIAL_PAD_AT_LAUNCH) ?: false diff --git a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt index 0d272a02..fccad533 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ManageSpeedDialActivity.kt @@ -23,7 +23,7 @@ class ManageSpeedDialActivity : SimpleActivity(), RemoveSpeedDialListener { super.onCreate(savedInstanceState) setContentView(R.layout.activity_manage_speed_dial) - updateMaterialActivityViews(manage_speed_dial_coordinator, manage_speed_dial_holder, true) + updateMaterialActivityViews(manage_speed_dial_coordinator, manage_speed_dial_holder, useTransparentNavigation = true, useTopSearchMenu = false) setupMaterialScrollListener(manage_speed_dial_scrollview, manage_speed_dial_toolbar) speedDialValues = config.getSpeedDialValues() 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 3583e00d..827ac53b 100644 --- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt +++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/SettingsActivity.kt @@ -26,7 +26,7 @@ class SettingsActivity : SimpleActivity() { super.onCreate(savedInstanceState) setContentView(R.layout.activity_settings) - updateMaterialActivityViews(settings_coordinator, settings_holder, true) + updateMaterialActivityViews(settings_coordinator, settings_holder, useTransparentNavigation = true, useTopSearchMenu = false) setupMaterialScrollListener(settings_nested_scrollview, settings_toolbar) } diff --git a/app/src/main/res/drawable/dialpad_button_background.xml b/app/src/main/res/drawable/dialpad_button_background.xml deleted file mode 100644 index 6ccafa8e..00000000 --- a/app/src/main/res/drawable/dialpad_button_background.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5e0f4471..e5e257a8 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -3,7 +3,7 @@