Replaced AppCompat theme with MaterialComponents theme
This commit is contained in:
@@ -75,7 +75,7 @@ class CallsActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
if (SystemClock.elapsedRealtime() - lastClick > 1000) {
|
if (SystemClock.elapsedRealtime() - lastClick > 1000) {
|
||||||
lastClick = SystemClock.elapsedRealtime()
|
lastClick = SystemClock.elapsedRealtime()
|
||||||
with (AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)) {
|
with (AlertDialog.Builder(this@CallsActivity)) {
|
||||||
setMessage(String.format(getString(R.string.calls_call_message_question),
|
setMessage(String.format(getString(R.string.calls_call_message_question),
|
||||||
peerName))
|
peerName))
|
||||||
setNeutralButton(getString(R.string.cancel), dialogClickListener)
|
setNeutralButton(getString(R.string.cancel), dialogClickListener)
|
||||||
@@ -119,7 +119,7 @@ class CallsActivity : AppCompatActivity() {
|
|||||||
getString(R.string.calls_calls)
|
getString(R.string.calls_calls)
|
||||||
else
|
else
|
||||||
getString(R.string.calls_call)
|
getString(R.string.calls_call)
|
||||||
val builder = AlertDialog.Builder(this@CallsActivity, R.style.Theme_AppCompat)
|
val builder = AlertDialog.Builder(this@CallsActivity)
|
||||||
if (peerName.startsWith("sip:"))
|
if (peerName.startsWith("sip:"))
|
||||||
with (builder) {
|
with (builder) {
|
||||||
setMessage(String.format(getString(R.string.calls_add_delete_question),
|
setMessage(String.format(getString(R.string.calls_add_delete_question),
|
||||||
|
|||||||
@@ -111,7 +111,7 @@ class ChatActivity : AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val builder = AlertDialog.Builder(this@ChatActivity, R.style.Theme_AppCompat)
|
val builder = AlertDialog.Builder(this@ChatActivity)
|
||||||
if (Contact.contactName(peerUri) == peerUri)
|
if (Contact.contactName(peerUri) == peerUri)
|
||||||
with (builder) {
|
with (builder) {
|
||||||
setMessage(String.format(getString(R.string.long_message_question),
|
setMessage(String.format(getString(R.string.long_message_question),
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import android.widget.*
|
|||||||
import androidx.activity.result.contract.ActivityResultContracts
|
import androidx.activity.result.contract.ActivityResultContracts
|
||||||
import androidx.appcompat.app.AlertDialog
|
import androidx.appcompat.app.AlertDialog
|
||||||
import androidx.appcompat.app.AppCompatActivity
|
import androidx.appcompat.app.AppCompatActivity
|
||||||
|
import com.google.android.material.dialog.MaterialAlertDialogBuilder
|
||||||
import com.tutpro.baresip.databinding.ActivityChatsBinding
|
import com.tutpro.baresip.databinding.ActivityChatsBinding
|
||||||
import java.util.*
|
import java.util.*
|
||||||
|
|
||||||
@@ -94,7 +95,7 @@ class ChatsActivity: AppCompatActivity() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val builder = AlertDialog.Builder(this@ChatsActivity, R.style.Theme_AppCompat)
|
val builder = MaterialAlertDialogBuilder(this@ChatsActivity, R.style.AlertDialog)
|
||||||
val peer = Contact.contactName(uaMessages[pos].peerUri)
|
val peer = Contact.contactName(uaMessages[pos].peerUri)
|
||||||
if (peer.startsWith("sip:"))
|
if (peer.startsWith("sip:"))
|
||||||
with (builder) {
|
with (builder) {
|
||||||
|
|||||||
@@ -1,10 +1,11 @@
|
|||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.DayNight">
|
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight">
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
<item name="actionBarTheme">@style/ActionBar</item>
|
<item name="actionBarTheme">@style/ActionBar</item>
|
||||||
|
<item name="actionOverflowMenuStyle">@style/Spinner</item>
|
||||||
<item name="android:dropDownListViewStyle">@style/Spinner</item>
|
<item name="android:dropDownListViewStyle">@style/Spinner</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
@@ -13,7 +14,7 @@
|
|||||||
<item name="windowNoTitle">true</item>
|
<item name="windowNoTitle">true</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ActionBar" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
|
<style name="ActionBar" parent="ThemeOverlay.MaterialComponents.Dark.ActionBar">
|
||||||
<item name="android:colorBackground">@color/colorSecondaryDark</item>
|
<item name="android:colorBackground">@color/colorSecondaryDark</item>
|
||||||
<item name="android:textColor">@color/colorLight</item>
|
<item name="android:textColor">@color/colorLight</item>
|
||||||
<item name="android:textColorPrimary">@color/colorLight</item>
|
<item name="android:textColorPrimary">@color/colorLight</item>
|
||||||
@@ -21,13 +22,16 @@
|
|||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="Spinner" parent="Widget.AppCompat.ListView.DropDown">
|
<style name="Spinner" parent="Widget.AppCompat.ListView.DropDown">
|
||||||
|
<item name="android:popupBackground">@color/colorSecondaryDark</item>
|
||||||
|
<item name="android:textColor">@color/colorLight</item>
|
||||||
<item name="android:dividerHeight">1dp</item>
|
<item name="android:dividerHeight">1dp</item>
|
||||||
<item name="android:divider">@color/colorSpinnerDivider</item>
|
<item name="android:divider">@color/colorSpinnerDivider</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert">
|
<style name="AlertDialog" parent="Theme.MaterialComponents.DayNight.Dialog.Alert">
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
<item name="android:textColorPrimary">@color/colorAlertText</item>
|
<item name="android:textColorPrimary">@color/colorAlertText</item>
|
||||||
|
<item name="android:windowBackground">#201D1D</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
|
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.DayNight.ActionBar" />
|
||||||
|
|||||||
Reference in New Issue
Block a user