From 1c1431dde9f2c64032b84d66b23dd1ee78813629 Mon Sep 17 00:00:00 2001
From: Joshua Quick <jquick@axway.com>
Date: Sat, 19 Dec 2020 01:19:16 -0800
Subject: [PATCH] feat(android): use material themed toolbars

Fixes TIMOB-28086
---
 .../res/layout/titanium_ui_drawer_layout.xml  |  2 +-
 .../ui/res/layout/titanium_ui_toolbar.xml     |  2 +-
 .../modules/titanium/ui/widget/TiToolbar.java | 31 ++++++++-------
 .../titanium/ui/widget/TiUIDrawerLayout.java  | 38 +++++++++----------
 4 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml b/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml
index dac117c2186..9c54400ab59 100644
--- a/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml
+++ b/android/modules/ui/res/layout/titanium_ui_drawer_layout.xml
@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent">
 
-           <androidx.appcompat.widget.Toolbar
+           <com.google.android.material.appbar.MaterialToolbar
                xmlns:app="http://schemas.android.com/apk/res-auto"
                android:id="@+id/drawer_layout_toolbar"
                android:visibility="gone"
diff --git a/android/modules/ui/res/layout/titanium_ui_toolbar.xml b/android/modules/ui/res/layout/titanium_ui_toolbar.xml
index 8e9f30fff61..20509ee9ea7 100644
--- a/android/modules/ui/res/layout/titanium_ui_toolbar.xml
+++ b/android/modules/ui/res/layout/titanium_ui_toolbar.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.Toolbar
+<com.google.android.material.appbar.MaterialToolbar
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:visibility="gone"
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiToolbar.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiToolbar.java
index d35d7124888..e36e3eaf6fd 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiToolbar.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiToolbar.java
@@ -5,11 +5,10 @@
 import android.graphics.Color;
 import android.graphics.Rect;
 
-import androidx.appcompat.widget.Toolbar;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowInsets;
-
+import com.google.android.material.appbar.MaterialToolbar;
 import org.appcelerator.kroll.KrollDict;
 import org.appcelerator.kroll.KrollProxy;
 import org.appcelerator.titanium.TiApplication;
@@ -30,7 +29,7 @@ public class TiToolbar extends TiUIView
 	private final int BACKGROUND_SOLID_VALUE = 255;
 	//endregion
 	//region private Object fields
-	private Toolbar toolbar;
+	private MaterialToolbar toolbar;
 	private Object logo = null;
 	private Object navigationIcon = null;
 	private Object overflowMenuIcon = null;
@@ -45,7 +44,7 @@ public class TiToolbar extends TiUIView
 	public TiToolbar(TiViewProxy proxy)
 	{
 		super(proxy);
-		toolbar = new Toolbar(proxy.getActivity()) {
+		toolbar = new MaterialToolbar(proxy.getActivity()) {
 			@Override
 			protected void onConfigurationChanged(Configuration newConfig)
 			{
@@ -202,11 +201,17 @@ public void setTranslucent(boolean value)
 	private View convertLayoutParamsForView(TiUIView source)
 	{
 		View res = source.getNativeView();
+		int width = MaterialToolbar.LayoutParams.WRAP_CONTENT;
 		TiDimension widthDimension = source.getLayoutParams().optionWidth;
-		int width = widthDimension != null ? widthDimension.getAsPixels(toolbar) : Toolbar.LayoutParams.WRAP_CONTENT;
+		if (widthDimension != null) {
+			width = widthDimension.getAsPixels(toolbar);
+		}
+		int height = MaterialToolbar.LayoutParams.WRAP_CONTENT;
 		TiDimension heightDimension = source.getLayoutParams().optionHeight;
-		int height = heightDimension != null ? heightDimension.getAsPixels(toolbar) : Toolbar.LayoutParams.WRAP_CONTENT;
-		res.setLayoutParams(new Toolbar.LayoutParams(width, height));
+		if (heightDimension != null) {
+			height = heightDimension.getAsPixels(toolbar);
+		}
+		res.setLayoutParams(new MaterialToolbar.LayoutParams(width, height));
 		return res;
 	}
 
@@ -215,7 +220,7 @@ private View convertLayoutParamsForView(TiUIView source)
 	 */
 	public void showOverFlowMenu()
 	{
-		((Toolbar) getNativeView()).showOverflowMenu();
+		((MaterialToolbar) getNativeView()).showOverflowMenu();
 	}
 
 	/**
@@ -223,7 +228,7 @@ public void showOverFlowMenu()
 	 */
 	public void hideOverFlowMenu()
 	{
-		((Toolbar) getNativeView()).hideOverflowMenu();
+		((MaterialToolbar) getNativeView()).hideOverflowMenu();
 	}
 
 	/**
@@ -234,7 +239,7 @@ public void setLogo(Object object)
 	{
 		logo = object;
 		TiDrawableReference tiDrawableReference = TiDrawableReference.fromObject(proxy, object);
-		((Toolbar) getNativeView()).setLogo(tiDrawableReference.getDrawable());
+		((MaterialToolbar) getNativeView()).setLogo(tiDrawableReference.getDrawable());
 	}
 
 	/**
@@ -254,7 +259,7 @@ public void setNavigationIcon(Object object)
 	{
 		navigationIcon = object;
 		TiDrawableReference tiDrawableReference = TiDrawableReference.fromObject(proxy, object);
-		((Toolbar) getNativeView()).setNavigationIcon(tiDrawableReference.getDrawable());
+		((MaterialToolbar) getNativeView()).setNavigationIcon(tiDrawableReference.getDrawable());
 	}
 
 	/**
@@ -274,7 +279,7 @@ public void setOverflowMenuIcon(Object object)
 	{
 		overflowMenuIcon = object;
 		TiDrawableReference tiDrawableReference = TiDrawableReference.fromObject(proxy, object);
-		((Toolbar) getNativeView()).setOverflowIcon(tiDrawableReference.getDrawable());
+		((MaterialToolbar) getNativeView()).setOverflowIcon(tiDrawableReference.getDrawable());
 	}
 
 	/**
@@ -291,7 +296,7 @@ public Object getOverflowMenuIcon()
 	 */
 	public void dismissPopupMenus()
 	{
-		((Toolbar) getNativeView()).dismissPopupMenus();
+		((MaterialToolbar) getNativeView()).dismissPopupMenus();
 	}
 
 	/**
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDrawerLayout.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDrawerLayout.java
index d2c2debda19..b2ba77fbba0 100644
--- a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDrawerLayout.java
+++ b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIDrawerLayout.java
@@ -27,8 +27,8 @@
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.appcompat.app.ActionBarDrawerToggle;
 import androidx.appcompat.widget.Toolbar;
+import androidx.core.view.GravityCompat;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -166,7 +166,7 @@ private void drawerSlideEvent(View drawerView, float slideOffset)
 
 	public void toggleLeft()
 	{
-		if (layout.isDrawerOpen(Gravity.START)) {
+		if (layout.isDrawerOpen(GravityCompat.START)) {
 			closeLeft();
 		} else {
 			openLeft();
@@ -175,17 +175,17 @@ public void toggleLeft()
 
 	public void openLeft()
 	{
-		layout.openDrawer(Gravity.START);
+		layout.openDrawer(GravityCompat.START);
 	}
 
 	public void closeLeft()
 	{
-		layout.closeDrawer(Gravity.START);
+		layout.closeDrawer(GravityCompat.START);
 	}
 
 	public void toggleRight()
 	{
-		if (layout.isDrawerOpen(Gravity.END)) {
+		if (layout.isDrawerOpen(GravityCompat.END)) {
 			closeRight();
 		} else {
 			openRight();
@@ -194,32 +194,32 @@ public void toggleRight()
 
 	public void openRight()
 	{
-		layout.openDrawer(Gravity.END);
+		layout.openDrawer(GravityCompat.END);
 	}
 
 	public void closeRight()
 	{
-		layout.closeDrawer(Gravity.END);
+		layout.closeDrawer(GravityCompat.END);
 	}
 
 	public boolean isLeftOpen()
 	{
-		return layout.isDrawerOpen(Gravity.START);
+		return layout.isDrawerOpen(GravityCompat.START);
 	}
 
 	public boolean isRightOpen()
 	{
-		return layout.isDrawerOpen(Gravity.END);
+		return layout.isDrawerOpen(GravityCompat.END);
 	}
 
 	public boolean isLeftVisible()
 	{
-		return layout.isDrawerVisible(Gravity.START);
+		return layout.isDrawerVisible(GravityCompat.START);
 	}
 
 	public boolean isRightVisible()
 	{
-		return layout.isDrawerVisible(Gravity.END);
+		return layout.isDrawerVisible(GravityCompat.END);
 	}
 
 	private void initDrawerToggle()
@@ -280,7 +280,7 @@ private void initLeft()
 		leftFrame = new FrameLayout(proxy.getActivity());
 
 		LayoutParams frameLayout = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
-		frameLayout.gravity = Gravity.START;
+		frameLayout.gravity = GravityCompat.START;
 		leftFrame.setLayoutParams(frameLayout);
 
 		layout.addView(leftFrame);
@@ -298,7 +298,7 @@ private void initRight()
 		rightFrame = new FrameLayout(proxy.getActivity());
 
 		LayoutParams frameLayout = new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.MATCH_PARENT);
-		frameLayout.gravity = Gravity.END;
+		frameLayout.gravity = GravityCompat.END;
 		rightFrame.setLayoutParams(frameLayout);
 
 		layout.addView(rightFrame);
@@ -419,10 +419,10 @@ public void processProperties(KrollDict d)
 			layout.setDrawerLockMode(TiConvert.toInt(d.get(TiC.PROPERTY_DRAWER_LOCK_MODE)));
 		}
 		if (d.containsKey(TiC.PROPERTY_LEFT_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(d.get(TiC.PROPERTY_LEFT_DRAWER_LOCK_MODE)), Gravity.START);
+			layout.setDrawerLockMode(TiConvert.toInt(d.get(TiC.PROPERTY_LEFT_DRAWER_LOCK_MODE)), GravityCompat.START);
 		}
 		if (d.containsKey(TiC.PROPERTY_RIGHT_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(d.get(TiC.PROPERTY_RIGHT_DRAWER_LOCK_MODE)), Gravity.END);
+			layout.setDrawerLockMode(TiConvert.toInt(d.get(TiC.PROPERTY_RIGHT_DRAWER_LOCK_MODE)), GravityCompat.END);
 		}
 		// If theme has default ActionBar ignore `toolbarEnabled` and `toolbar` properties
 		if (!this.themeHasActionBar) {
@@ -520,7 +520,7 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 
 			LayoutParams leftFrameLayout = new LayoutParams(leftWidth, LayoutParams.MATCH_PARENT);
-			leftFrameLayout.gravity = Gravity.START;
+			leftFrameLayout.gravity = GravityCompat.START;
 			this.leftFrame.setLayoutParams(leftFrameLayout);
 
 		} else if (key.equals(TiC.PROPERTY_RIGHT_WIDTH)) {
@@ -538,15 +538,15 @@ public void propertyChanged(String key, Object oldValue, Object newValue, KrollP
 			}
 
 			LayoutParams rightFrameLayout = new LayoutParams(rightWidth, LayoutParams.MATCH_PARENT);
-			rightFrameLayout.gravity = Gravity.END;
+			rightFrameLayout.gravity = GravityCompat.END;
 			this.rightFrame.setLayoutParams(rightFrameLayout);
 
 		} else if (key.equals(TiC.PROPERTY_DRAWER_LOCK_MODE)) {
 			layout.setDrawerLockMode(TiConvert.toInt(newValue));
 		} else if (key.equals(TiC.PROPERTY_LEFT_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(newValue), Gravity.START);
+			layout.setDrawerLockMode(TiConvert.toInt(newValue), GravityCompat.START);
 		} else if (key.equals(TiC.PROPERTY_RIGHT_DRAWER_LOCK_MODE)) {
-			layout.setDrawerLockMode(TiConvert.toInt(newValue), Gravity.END);
+			layout.setDrawerLockMode(TiConvert.toInt(newValue), GravityCompat.END);
 		} else if (key.equals(TiC.PROPERTY_DRAWER_INDICATOR_ENABLED)) {
 			if (drawerToggle != null) {
 				drawerToggle.setDrawerIndicatorEnabled((Boolean) newValue);