add support for toolbar in activities

Author: ajungg

docs/docs/ui-api.md

@@ -32,12 +32,23 @@ Exceptions are View's for entering payment credentials.
 The SDK does need to switch to different Screens at different times (For example, when starting a Checkout).
 
 If you do not register any ui actions, activities will be launched. If you want to integrate the SDK more deeply into 
-your App, you need to Handlers to Events.
+your App, you need to add Handlers to Events.
 
 Todo that, call **SnabbleUI.setUiAction**, which will then be called instead of opening an Activity.
 
 In some cases Activities will still be launched, which will then not invoke the ui action handler.
 
+## Styling
+
+The SDK uses Material 3 theme styling where possible. 
+
+Activities can also use a MaterialToolbar, to enable using a Toolbar set the Theme attribute 
+**snabbleToolbarStyle**.
+
+## Night mode
+
+The SDK supports Material 3 DayNight themes.
+
 ## List of UI Actions
 
 - SHOW_CHECKOUT,

java-sample/src/main/java/io/snabble/testapp/App.java

@@ -32,10 +32,6 @@ public interface InitCallback {
     public void onCreate() {
         super.onCreate();
         instance = this;
-
-        // if you are using a light mode theme, disable night mode resources
-        // this seems like a bug in android
-        AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
     }
 
     public void initBlocking() {

java-sample/src/main/res/values/styles.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <style name="SnabbleTheme" parent="@style/Theme.Material3.DayNight">
+    <style name="SnabbleTheme" parent="@style/Theme.Material3.DayNight.NoActionBar">
         <item name="colorPrimary">#0077BB</item>
         <item name="colorOnPrimary">#ffffff</item>
         <item name="colorPrimaryContainer">#0077BB</item>
@@ -16,5 +16,8 @@
         <item name="colorOnTertiary">#ffffff</item>
         <item name="colorTertiaryContainer">#0077BB</item>
         <item name="colorOnTertiaryContainer">#ffffff</item>
+
+        <!-- You can enable a Toolbar inside Activities, by setting a style -->
+        <item name="snabbleToolbarStyle">@style/SnabbleTheme</item>
     </style>
 </resources>

ui/src/main/java/io/snabble/sdk/ui/BaseFragmentActivity.kt

@@ -0,0 +1,29 @@
+package io.snabble.sdk.ui
+
+import android.os.Bundle
+import android.util.TypedValue
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import com.google.android.material.appbar.MaterialToolbar
+
+abstract class BaseFragmentActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+
+        val typedValue = TypedValue()
+        if (getTheme().resolveAttribute(R.attr.snabbleToolbarStyle, typedValue, true)) {
+            setContentView(R.layout.snabble_activity_simple_fragment_with_toolbar)
+            val toolbar = findViewById<MaterialToolbar>(R.id.toolbar)
+            setSupportActionBar(toolbar)
+        } else {
+            setContentView(R.layout.snabble_activity_simple_fragment)
+        }
+
+        supportFragmentManager
+            .beginTransaction()
+            .replace(R.id.content, onCreateFragment())
+            .commitAllowingStateLoss()
+    }
+
+    abstract fun onCreateFragment(): Fragment
+}

ui/src/main/java/io/snabble/sdk/ui/SimpleFragmentActivity.kt

@@ -81,7 +81,7 @@ object SnabbleUI {
     @JvmOverloads
     fun executeAction(context: Context, event: Event?, args: Bundle? = null) {
         val activity = UIUtils.getHostFragmentActivity(context)
-        if (event == GO_BACK && activity is SimpleFragmentActivity) {
+        if (event == GO_BACK && activity is BaseFragmentActivity) {
             activity.finish()
             return
         }

ui/src/main/java/io/snabble/sdk/ui/SnabbleUI.kt

@@ -1,8 +1,8 @@
 package io.snabble.sdk.ui.cart
 
 import androidx.fragment.app.Fragment
-import io.snabble.sdk.ui.SimpleFragmentActivity
+import io.snabble.sdk.ui.BaseFragmentActivity
 
-class ShoppingCartActivity : SimpleFragmentActivity() {
+class ShoppingCartActivity : BaseFragmentActivity() {
     override fun onCreateFragment(): Fragment = ShoppingCartFragment()
 }

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartActivity.kt

@@ -31,11 +31,6 @@ open class ShoppingCartFragment : Fragment() {
 
     override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
         inflater.inflate(R.menu.snabble_menu_shopping_cart, menu)
-        for (i in 0 until menu.size()) {
-            val menuItem = menu.getItem(i)
-            val color = UIUtils.getColorByAttribute(requireContext(), R.attr.colorOnActionBar)
-            MenuItemCompat.setIconTintList(menuItem, ColorStateList.valueOf(color))
-        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {

ui/src/main/java/io/snabble/sdk/ui/cart/ShoppingCartFragment.kt

@@ -1,8 +1,8 @@
 package io.snabble.sdk.ui.payment
 
 import androidx.fragment.app.Fragment
-import io.snabble.sdk.ui.SimpleFragmentActivity
+import io.snabble.sdk.ui.BaseFragmentActivity
 
-class AgeVerificationInputActivity : SimpleFragmentActivity() {
+class AgeVerificationInputActivity : BaseFragmentActivity() {
     override fun onCreateFragment(): Fragment = AgeVerificationInputFragment()
 }

ui/src/main/java/io/snabble/sdk/ui/payment/AgeVerificationInputActivity.kt

@@ -1,9 +1,9 @@
 package io.snabble.sdk.ui.payment
 
 import androidx.fragment.app.Fragment
-import io.snabble.sdk.ui.SimpleFragmentActivity
+import io.snabble.sdk.ui.BaseFragmentActivity
 
-class CreditCardInputActivity : SimpleFragmentActivity() {
+class CreditCardInputActivity : BaseFragmentActivity() {
     companion object {
         const val ARG_PROJECT_ID = CreditCardInputView.ARG_PROJECT_ID
         const val ARG_PAYMENT_TYPE = CreditCardInputView.ARG_PAYMENT_TYPE