updating the widget config screens

This commit is contained in:
tibbi 2022-08-31 20:37:53 +02:00
parent c62df05f45
commit 809030f96d
4 changed files with 200 additions and 162 deletions

View File

@ -3,6 +3,7 @@ package com.simplemobiletools.clock.activities
import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.Color
import android.os.Bundle
import android.widget.SeekBar
@ -37,6 +38,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
}
config_analogue_save.setOnClickListener { saveConfig() }
config_analogue_save.setTextColor(getProperPrimaryColor().getContrastColor())
config_analogue_bg_color.setOnClickListener { pickBackgroundColor() }
val primaryColor = getProperPrimaryColor()
@ -53,8 +55,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
window.decorView.setBackgroundColor(0)
setupToolbar(config_toolbar)
if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
mFeatureLockedDialog?.dismissDialog()
}
@ -107,6 +108,7 @@ class WidgetAnalogueConfigureActivity : SimpleActivity() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_analogue_bg_color.setFillWithStroke(mBgColor, mBgColor)
config_analogue_background.applyColorFilter(mBgColor)
config_analogue_save.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor())
}
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {

View File

@ -3,6 +3,7 @@ package com.simplemobiletools.clock.activities
import android.app.Activity
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.content.res.ColorStateList
import android.graphics.Color
import android.os.Bundle
import android.widget.SeekBar
@ -55,8 +56,7 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
override fun onResume() {
super.onResume()
window.decorView.setBackgroundColor(0)
setupToolbar(config_toolbar)
if (mFeatureLockedDialog != null && isOrWasThankYouInstalled()) {
mFeatureLockedDialog?.dismissDialog()
}
@ -122,12 +122,14 @@ class WidgetDigitalConfigureActivity : SimpleActivity() {
config_digital_text_color.setFillWithStroke(mTextColor, mTextColor)
config_digital_time.setTextColor(mTextColor)
config_digital_date.setTextColor(mTextColor)
config_digital_save.setTextColor(getProperPrimaryColor().getContrastColor())
}
private fun updateBackgroundColor() {
mBgColor = mBgColorWithoutTransparency.adjustAlpha(mBgAlpha)
config_digital_bg_color.setFillWithStroke(mBgColor, mBgColor)
config_digital_background.applyColorFilter(mBgColor)
config_digital_save.backgroundTintList = ColorStateList.valueOf(getProperPrimaryColor())
}
private val bgSeekbarChangeListener = object : SeekBar.OnSeekBarChangeListener {

View File

@ -1,11 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/config_coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/config_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/config_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout
android:id="@+id/config_analogue_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin">
android:layout_margin="@dimen/activity_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<RelativeLayout
android:id="@+id/config_analogue_wrapper"
@ -62,18 +84,13 @@
<Button
android:id="@+id/config_analogue_save"
style="@style/MyWidgetConfigSaveStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_marginTop="@dimen/small_margin"
android:background="@drawable/widget_config_seekbar_background"
android:fontFamily="sans-serif-light"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/ok"
android:textColor="@color/dark_grey"
android:textFontWeight="400"
android:textSize="@dimen/big_text_size" />
android:text="@string/ok" />
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@ -1,11 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/config_coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/config_app_bar_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<com.google.android.material.appbar.MaterialToolbar
android:id="@+id/config_toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/color_primary"
app:title="@string/app_launcher_name"
app:titleTextAppearance="@style/AppTheme.ActionBar.TitleTextStyle" />
</com.google.android.material.appbar.AppBarLayout>
<RelativeLayout
android:id="@+id/config_digital_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_margin="@dimen/activity_margin">
android:layout_margin="@dimen/activity_margin"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<RelativeLayout
android:id="@+id/config_digital_wrapper"
@ -91,17 +113,12 @@
<Button
android:id="@+id/config_digital_save"
style="@style/MyWidgetConfigSaveStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:background="@drawable/widget_config_seekbar_background"
android:fontFamily="sans-serif-light"
android:paddingStart="@dimen/activity_margin"
android:paddingEnd="@dimen/activity_margin"
android:text="@string/ok"
android:textColor="@color/dark_grey"
android:textFontWeight="400"
android:textSize="@dimen/big_text_size" />
android:text="@string/ok" />
</RelativeLayout>
</androidx.coordinatorlayout.widget.CoordinatorLayout>