caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2022-09-22 15:12:10 +02:00
parent 9bdebd7667 c031770ab1
commit 28c617aea2
7 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
core/src/main/java/info/nightscout/androidaps/utils/ToastUtils.kt
View file

@ -16,6 +16,7 @@ import info.nightscout.androidaps.core.R
import info.nightscout.androidaps.plugins.bus.RxBus
import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
import info.nightscout.androidaps.utils.resources.getThemeColor
object ToastUtils {
@ -76,7 +77,15 @@ object ToastUtils {
fun showToastInUiThread(ctx: Context?, string: String?) {
val mainThread = Handler(Looper.getMainLooper())
mainThread.post { Toast.makeText(ctx, string, Toast.LENGTH_SHORT).show() }
mainThread.post {
val toast: Toast =
Toast.makeText(
ctx,
HtmlHelper.fromHtml("<font color='" + ContextThemeWrapper(ctx, R.style.AppTheme).getThemeColor(R.attr.toastBaseTextColor) + "'>" + string + "</font>"),
Toast.LENGTH_SHORT
)
toast.show()
}
}
fun showToastInUiThread(

4
core/src/main/res/layout/toast.xml
View file

@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/toast_border_ok">
android:background="?attr/toastBackgroundColor">
<ImageView
android:id="@android:id/icon"
@ -26,7 +26,7 @@
android:layout_marginTop="4dp"
android:layout_marginEnd="18dp"
android:layout_marginBottom="4dp"
android:textColor="?attr/toastBaseTextColor"
android:textColor="?attr/defaultTextColor"
android:textSize="18sp"
tools:ignore="RtlHardcoded"
tools:text="Toast goes here..." />

2
core/src/main/res/values-night/colors.xml
View file

@ -109,7 +109,7 @@
<!-- Toasts-->
<color name="toastBorder">#666666</color>
<color name="toastBase">#ffffff</color>
<color name="toastBase">#000000</color>
<color name="toastOk">#77dd77</color>
<color name="toastError">#ff0400</color>
<color name="toastWarn">#FF8C00</color>

1
core/src/main/res/values-night/styles.xml
View file

@ -95,6 +95,7 @@
<item name="defaultBackground">@color/defaultBackground</item>
<!---Toast -->
<item name="toastBaseTextColor">@color/toastBase</item>
<item name="toastBackgroundColor">@color/buttonBackground</item>
<!---Dialog Helper -->
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item>

1
core/src/main/res/values/attrs.xml
View file

@ -65,6 +65,7 @@
<attr name="defaultBackground" format="reference|color" />
<!---Toast -->
<attr name="toastBaseTextColor" format="reference|color" />
<attr name="toastBackgroundColor" format="reference|color" />
<declare-styleable name="NumberPicker">
<attr name="customContentDescription" format="string" />
</declare-styleable>

2
core/src/main/res/values/colors.xml
View file

@ -111,7 +111,7 @@
<!-- Toasts-->
<color name="toastBorder">#666666</color>
<color name="toastBase">#ffffff</color>
<color name="toastBase">#000000</color>
<color name="toastOk">#77dd77</color>
<color name="toastError">#ff0400</color>
<color name="toastWarn">#FF8C00</color>

1
core/src/main/res/values/styles.xml
View file

@ -100,6 +100,7 @@
<item name="defaultBackground">@color/white</item>
<!---Toast -->
<item name="toastBaseTextColor">@color/toastBase</item>
<item name="toastBackgroundColor">@color/colorLightGray</item>
<!---Dialog Helper -->
<item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item>