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 bc17fb76..2e9b7d0a 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/CallActivity.kt
@@ -20,6 +20,7 @@ import android.view.WindowManager
import android.view.animation.AccelerateDecelerateInterpolator
import android.view.animation.OvershootInterpolator
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
@@ -88,7 +89,7 @@ class CallActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
updateState()
- updateNavigationBarColor(getBottomNavigationBackgroundColor())
+ updateNavigationBarColor(getProperBackgroundColor())
}
override fun onDestroy() {
@@ -187,6 +188,25 @@ class CallActivity : SimpleActivity() {
dialpad_8_holder.setOnClickListener { dialpadPressed('8') }
dialpad_9_holder.setOnClickListener { dialpadPressed('9') }
+ arrayOf(
+ dialpad_0_holder,
+ dialpad_1_holder,
+ dialpad_2_holder,
+ dialpad_3_holder,
+ dialpad_4_holder,
+ dialpad_5_holder,
+ dialpad_6_holder,
+ dialpad_7_holder,
+ dialpad_8_holder,
+ dialpad_9_holder,
+ dialpad_plus_holder,
+ dialpad_asterisk_holder,
+ dialpad_hashtag_holder
+ ).forEach {
+ it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme)
+ it.background?.alpha = 50
+ }
+
dialpad_0_holder.setOnLongClickListener { dialpadPressed('+'); true }
dialpad_asterisk_holder.setOnClickListener { dialpadPressed('*') }
dialpad_hashtag_holder.setOnClickListener { dialpadPressed('#') }
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 3114cd29..64ac3a7e 100644
--- a/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt
+++ b/app/src/main/kotlin/com/simplemobiletools/dialer/activities/ConferenceActivity.kt
@@ -10,10 +10,12 @@ import kotlinx.android.synthetic.main.activity_conference.*
class ConferenceActivity : SimpleActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
+ isMaterialActivity = true
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_conference)
-
- conference_calls_list.adapter = ConferenceCallsAdapter(this, conference_calls_list, ArrayList(CallManager.getConferenceCalls())) {}
+ updateMaterialActivityViews(conference_coordinator, conference_frame, true)
+ setupMaterialScrollListener(conference_list, conference_toolbar)
+ conference_list.adapter = ConferenceCallsAdapter(this, conference_list, ArrayList(CallManager.getConferenceCalls())) {}
}
override fun onResume() {
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 eeaf8ce6..b6262f07 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.content.res.ResourcesCompat
import androidx.core.view.isVisible
import com.reddit.indicatorfastscroll.FastScrollItemIndicator
import com.simplemobiletools.commons.extensions.*
@@ -50,6 +51,10 @@ class DialpadActivity : SimpleActivity() {
setContentView(R.layout.activity_dialpad)
hasRussianLocale = Locale.getDefault().language == "ru"
+ updateMaterialActivityViews(dialpad_coordinator, dialpad_holder, true)
+ setupMaterialScrollListener(dialpad_list, dialpad_toolbar)
+ updateNavigationBarColor(getProperBackgroundColor())
+
if (checkAppSideloading()) {
return
}
@@ -68,6 +73,24 @@ class DialpadActivity : SimpleActivity() {
dialpad_0_holder.visibility = View.INVISIBLE
}
+ arrayOf(
+ dialpad_0_holder,
+ dialpad_1_holder,
+ dialpad_2_holder,
+ dialpad_3_holder,
+ dialpad_4_holder,
+ dialpad_5_holder,
+ dialpad_6_holder,
+ dialpad_7_holder,
+ dialpad_8_holder,
+ dialpad_9_holder,
+ dialpad_plus_holder,
+ dialpad_asterisk_holder,
+ dialpad_hashtag_holder
+ ).forEach {
+ it.background = ResourcesCompat.getDrawable(resources, R.drawable.dialpad_button_background, theme)
+ it.background?.alpha = 50
+ }
setupOptionsMenu()
speedDialValues = config.getSpeedDialValues()
@@ -105,7 +128,7 @@ class DialpadActivity : SimpleActivity() {
setupCharClick(dialpad_8_holder, '8')
setupCharClick(dialpad_9_holder, '9')
setupCharClick(dialpad_0_holder, '0')
- setupCharClick(dialpad_plus_holder, '+', longClickable = false)
+ setupCharClick(dialpad_plus_holder, '+', longClickable = false)
setupCharClick(dialpad_asterisk_holder, '*', longClickable = false)
setupCharClick(dialpad_hashtag_holder, '#', longClickable = false)
@@ -148,7 +171,7 @@ class DialpadActivity : SimpleActivity() {
super.onResume()
updateTextColors(dialpad_holder)
dialpad_clear_char.applyColorFilter(getProperTextColor())
- updateNavigationBarColor(getBottomNavigationBackgroundColor())
+ updateNavigationBarColor(getProperBackgroundColor())
setupToolbar(dialpad_toolbar, NavigationIcon.Arrow)
}
diff --git a/app/src/main/res/drawable/dialpad_button_background.xml b/app/src/main/res/drawable/dialpad_button_background.xml
new file mode 100644
index 00000000..6ccafa8e
--- /dev/null
+++ b/app/src/main/res/drawable/dialpad_button_background.xml
@@ -0,0 +1,14 @@
+
+
+ -
+
+
-
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_conference.xml b/app/src/main/res/layout/activity_conference.xml
index f07b4385..d8e1f10c 100644
--- a/app/src/main/res/layout/activity_conference.xml
+++ b/app/src/main/res/layout/activity_conference.xml
@@ -6,29 +6,22 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
-
-
-
+ android:layout_height="?attr/actionBarSize"
+ android:background="@color/color_primary"
+ app:title="@string/conference"
+ app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+ android:layout_marginTop="?attr/actionBarSize">
-
-
-
-
-
+ android:layout_height="?attr/actionBarSize"
+ android:background="@color/color_primary"
+ app:menu="@menu/menu_dialpad"
+ app:title="@string/dialpad"
+ app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
+ android:layout_marginTop="?attr/actionBarSize"
+ android:focusableInTouchMode="true">
+
+ android:layout_below="@+id/dialpad_0"
+ android:layout_marginBottom="@dimen/medium_margin"
+ android:text="ABC" />
+
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 8ff62af5..71e819df 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -2,14 +2,23 @@
+
+