Use AndroidX Toolbar instead of framework ActionBar

diff --git a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
index 309b803..3a90a9f 100644 (file)
--- a/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
+++ b/app/src/main/java/com/farmerbb/taskbar/activity/MainActivity.java
@@ -181,10 +181,11 @@ public class MainActivity extends AppCompatActivity {
             setContentView(R.layout.tb_main);
         }
 
+        setSupportActionBar(findViewById(R.id.toolbar));
+
         ActionBar actionBar = getSupportActionBar();
         if(actionBar != null && !U.isLibrary(this)) {
-            actionBar.setCustomView(R.layout.tb_switch_layout);
-            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE | ActionBar.DISPLAY_SHOW_CUSTOM);
+            actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_TITLE);
         }
 
         theSwitch = findViewById(R.id.the_switch);

diff --git a/app/src/main/res/layout/tb_switch_layout.xml b/app/src/main/res/layout/tb_switch_layout.xml
index 43bdb62..5f467ba 100644 (file)
--- a/app/src/main/res/layout/tb_switch_layout.xml
+++ b/app/src/main/res/layout/tb_switch_layout.xml
@@ -35,6 +35,7 @@
         android:id="@+id/the_switch"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical"/>
+        android:layout_gravity="center_vertical"
+        android:paddingEnd="12dp"/>
 
 </LinearLayout>
\ No newline at end of file

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index fffe05f..fafc1fe 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -16,7 +16,7 @@
 
 <resources>
 
-    <style name="TaskbarBase" parent="Theme.AppCompat.Light.DarkActionBar">
+    <style name="TaskbarBase" parent="Theme.AppCompat.Light.NoActionBar">
         <item name="colorPrimary">@color/tb_colorPrimary</item>
         <item name="colorPrimaryDark">@color/tb_colorPrimaryDark</item>
         <item name="colorAccent">@color/tb_colorAccent</item>
@@ -26,7 +26,7 @@
         <item name="tb_settings_icon_color">@color/tb_settings_icon_color</item>
     </style>
 
-    <style name="TaskbarBase.Dark" parent="Theme.AppCompat">
+    <style name="TaskbarBase.Dark" parent="Theme.AppCompat.NoActionBar">
         <item name="colorPrimary">@color/tb_colorPrimary</item>
         <item name="colorPrimaryDark">@color/tb_colorPrimaryDark</item>
         <item name="colorAccent">@color/tb_colorAccent</item>

diff --git a/app/src/nonlib/res/layout/tb_main.xml b/app/src/nonlib/res/layout/tb_main.xml
index 4991c3b..0ec6eb5 100644 (file)
--- a/app/src/nonlib/res/layout/tb_main.xml
+++ b/app/src/nonlib/res/layout/tb_main.xml
@@ -15,6 +15,7 @@
 -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
               android:id="@+id/main_activity_layout"
               android:layout_width="fill_parent"
               android:layout_height="fill_parent"
@@ -23,6 +24,19 @@
               android:orientation="vertical"
               android:background="?attr/tb_main_activity_background" >
 
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        android:background="?attr/colorPrimary"
+        android:elevation="4dp"
+        android:theme="@style/ThemeOverlay.AppCompat.ActionBar"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
+
+        <include layout="@layout/tb_switch_layout" />
+
+    </androidx.appcompat.widget.Toolbar>
+
     <LinearLayout
         android:id="@+id/fragmentContainer"
         android:orientation="vertical"