caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Minor actions tab 3 dot menu bug

Browse source
This commit is contained in:
osodebailar 2022-03-22 09:31:22 +01:00
parent 0e559eff84
commit e70821f3d0
4 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/java/info/nightscout/androidaps/MainActivity.kt
View file

@ -7,6 +7,7 @@ import android.os.Bundle
import android.os.PersistableBundle import android.os.PersistableBundle
import android.text.SpannableString import android.text.SpannableString
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.text.style.ForegroundColorSpan
import android.text.util.Linkify import android.text.util.Linkify
import android.util.TypedValue import android.util.TypedValue
import android.view.Menu import android.view.Menu
@ -116,6 +117,7 @@ class MainActivity : NoSplashAppCompatActivity() {
override fun onPageSelected(position: Int) { override fun onPageSelected(position: Int) {
setPluginPreferenceMenuName() setPluginPreferenceMenuName()
checkPluginPreferences(binding.mainPager) checkPluginPreferences(binding.mainPager)
setDisabledMenuItemColorPluginPreferences()
} }
}) })
@ -256,6 +258,14 @@ class MainActivity : NoSplashAppCompatActivity() {
return super.dispatchTouchEvent(event) return super.dispatchTouchEvent(event)
} }
private fun setDisabledMenuItemColorPluginPreferences() {
if( pluginPreferencesMenuItem?.isEnabled == false){
val spanString = SpannableString(this.menu?.findItem(R.id.nav_plugin_preferences)?.title.toString())
spanString.setSpan(ForegroundColorSpan(rh.gac(R.attr.disabledTextColor)), 0, spanString.length, 0)
this.menu?.findItem(R.id.nav_plugin_preferences)?.title = spanString
}
}
private fun setPluginPreferenceMenuName() { private fun setPluginPreferenceMenuName() {
if (binding.mainPager.currentItem >= 0) { if (binding.mainPager.currentItem >= 0) {
val plugin = (binding.mainPager.adapter as TabPageAdapter).getPluginAt(binding.mainPager.currentItem) val plugin = (binding.mainPager.adapter as TabPageAdapter).getPluginAt(binding.mainPager.currentItem)
@ -284,6 +294,7 @@ class MainActivity : NoSplashAppCompatActivity() {
pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences) pluginPreferencesMenuItem = menu.findItem(R.id.nav_plugin_preferences)
setPluginPreferenceMenuName() setPluginPreferenceMenuName()
checkPluginPreferences(binding.mainPager) checkPluginPreferences(binding.mainPager)
setDisabledMenuItemColorPluginPreferences()
return true return true
} }

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

@ -109,6 +109,8 @@
<item name="materialAlertDialogTheme">@style/DialogTheme</item> <item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item> <item name="android:alertDialogTheme">@style/DialogTheme</item>
<item name="alertDialogTheme">@style/DialogTheme</item> <item name="alertDialogTheme">@style/DialogTheme</item>
<!---Disabled Text Color -->
<item name="disabledTextColor">@color/sandGray</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>

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

@ -84,5 +84,7 @@
<attr name="notificationAnnouncement" format="reference|color" /> <attr name="notificationAnnouncement" format="reference|color" />
<!---Splash Background --> <!---Splash Background -->
<attr name="splashBackgroundColor" format="reference|color" /> <attr name="splashBackgroundColor" format="reference|color" />
<!---Disabled Text Color -->
<attr name="disabledTextColor" format="reference|color" />
</resources> </resources>

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

@ -108,8 +108,8 @@
<item name="materialAlertDialogTheme">@style/DialogTheme</item> <item name="materialAlertDialogTheme">@style/DialogTheme</item>
<item name="android:alertDialogTheme">@style/DialogTheme</item> <item name="android:alertDialogTheme">@style/DialogTheme</item>
<item name="alertDialogTheme">@style/DialogTheme</item> <item name="alertDialogTheme">@style/DialogTheme</item>
<item name="windowActionBar">false</item> <!---Disabled Text Color -->
<item name="windowNoTitle">true</item> <item name="disabledTextColor">@color/sandGray</item>
</style> </style>
<style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/> <style name="Theme.MaterialComponents.DayNight.DarkActionBar" parent="Theme.MaterialComponents.DayNight.Bridge"/>