From 89f8f3d1b7099da47330b869eb2f8038aa152e56 Mon Sep 17 00:00:00 2001
From: pacien
Date: Sat, 21 Apr 2018 19:56:44 +0200
Subject: Simplify action bar

---
 app/src/main/AndroidManifest.xml                    | 12 ++++--------
 .../org/pacien/tincapp/activities/BaseActivity.kt   |  1 -
 app/src/main/res/layout/base.xml                    | 21 +--------------------
 3 files changed, 5 insertions(+), 29 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8fc83b3..5e92405 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -18,8 +18,7 @@
 		<activity
 			android:name=".activities.StartActivity"
 			android:configChanges="orientation|screenSize"
-			android:label="@string/app_label"
-			android:theme="@style/AppTheme.NoActionBar">
+			android:label="@string/app_label">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN"/>
 				<category android:name="android.intent.category.LAUNCHER"/>
@@ -34,14 +33,12 @@
 		<activity
 			android:name=".activities.ConfigureActivity"
 			android:configChanges="orientation|screenSize"
-			android:parentActivityName=".activities.StartActivity"
-			android:theme="@style/AppTheme.NoActionBar">
+			android:parentActivityName=".activities.StartActivity">
 		</activity>
 
 		<activity
 			android:name=".activities.StatusActivity"
-			android:configChanges="orientation|screenSize"
-			android:theme="@style/AppTheme.NoActionBar">
+			android:configChanges="orientation|screenSize">
 			<intent-filter>
 				<action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/>
 				<category android:name="android.intent.category.DEFAULT"/>
@@ -50,8 +47,7 @@
 
 		<activity
 			android:name=".activities.ViewLogActivity"
-			android:configChanges="orientation|screenSize"
-			android:theme="@style/AppTheme.NoActionBar">
+			android:configChanges="orientation|screenSize">
 		</activity>
 
 		<service
diff --git a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
index e90ada2..cc79600 100644
--- a/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
+++ b/app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt
@@ -23,7 +23,6 @@ abstract class BaseActivity : AppCompatActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
     setContentView(R.layout.base)
-    setSupportActionBar(toolbar)
     handleRecentCrash()
   }
 
diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml
index bdd1ee4..9259a08 100644
--- a/app/src/main/res/layout/base.xml
+++ b/app/src/main/res/layout/base.xml
@@ -5,26 +5,7 @@
 																								 android:layout_width="match_parent"
 																								 android:layout_height="match_parent"
 																								 android:fitsSystemWindows="true"
-																								 tools:context="org.pacien.tincapp.activities.BaseActivity">
-
-	<android.support.design.widget.AppBarLayout
-		android:id="@+id/appbar"
-		android:layout_width="match_parent"
-		android:layout_height="wrap_content"
-		android:paddingTop="@dimen/appbar_padding_top"
-		android:theme="@style/AppTheme.AppBarOverlay">
-
-		<android.support.v7.widget.Toolbar
-			android:id="@+id/toolbar"
-			android:layout_width="match_parent"
-			android:layout_height="?attr/actionBarSize"
-			android:background="?attr/colorPrimary"
-			app:layout_scrollFlags="enterAlways"
-			app:popupTheme="@style/AppTheme.PopupOverlay">
-
-		</android.support.v7.widget.Toolbar>
-
-	</android.support.design.widget.AppBarLayout>
+																								 tools:context=".activities.BaseActivity">
 
 	<FrameLayout
 		android:layout_width="match_parent"
-- 
cgit v1.2.3