aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/AndroidManifest.xml12
-rw-r--r--app/src/main/java/org/pacien/tincapp/activities/BaseActivity.kt1
-rw-r--r--app/src/main/res/layout/base.xml21
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 @@
18 <activity 18 <activity
19 android:name=".activities.StartActivity" 19 android:name=".activities.StartActivity"
20 android:configChanges="orientation|screenSize" 20 android:configChanges="orientation|screenSize"
21 android:label="@string/app_label" 21 android:label="@string/app_label">
22 android:theme="@style/AppTheme.NoActionBar">
23 <intent-filter> 22 <intent-filter>
24 <action android:name="android.intent.action.MAIN"/> 23 <action android:name="android.intent.action.MAIN"/>
25 <category android:name="android.intent.category.LAUNCHER"/> 24 <category android:name="android.intent.category.LAUNCHER"/>
@@ -34,14 +33,12 @@
34 <activity 33 <activity
35 android:name=".activities.ConfigureActivity" 34 android:name=".activities.ConfigureActivity"
36 android:configChanges="orientation|screenSize" 35 android:configChanges="orientation|screenSize"
37 android:parentActivityName=".activities.StartActivity" 36 android:parentActivityName=".activities.StartActivity">
38 android:theme="@style/AppTheme.NoActionBar">
39 </activity> 37 </activity>
40 38
41 <activity 39 <activity
42 android:name=".activities.StatusActivity" 40 android:name=".activities.StatusActivity"
43 android:configChanges="orientation|screenSize" 41 android:configChanges="orientation|screenSize">
44 android:theme="@style/AppTheme.NoActionBar">
45 <intent-filter> 42 <intent-filter>
46 <action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/> 43 <action android:name="org.pacien.tincapp.intent.action.DISCONNECT"/>
47 <category android:name="android.intent.category.DEFAULT"/> 44 <category android:name="android.intent.category.DEFAULT"/>
@@ -50,8 +47,7 @@
50 47
51 <activity 48 <activity
52 android:name=".activities.ViewLogActivity" 49 android:name=".activities.ViewLogActivity"
53 android:configChanges="orientation|screenSize" 50 android:configChanges="orientation|screenSize">
54 android:theme="@style/AppTheme.NoActionBar">
55 </activity> 51 </activity>
56 52
57 <service 53 <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() {
23 override fun onCreate(savedInstanceState: Bundle?) { 23 override fun onCreate(savedInstanceState: Bundle?) {
24 super.onCreate(savedInstanceState) 24 super.onCreate(savedInstanceState)
25 setContentView(R.layout.base) 25 setContentView(R.layout.base)
26 setSupportActionBar(toolbar)
27 handleRecentCrash() 26 handleRecentCrash()
28 } 27 }
29 28
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 @@
5 android:layout_width="match_parent" 5 android:layout_width="match_parent"
6 android:layout_height="match_parent" 6 android:layout_height="match_parent"
7 android:fitsSystemWindows="true" 7 android:fitsSystemWindows="true"
8 tools:context="org.pacien.tincapp.activities.BaseActivity"> 8 tools:context=".activities.BaseActivity">
9
10 <android.support.design.widget.AppBarLayout
11 android:id="@+id/appbar"
12 android:layout_width="match_parent"
13 android:layout_height="wrap_content"
14 android:paddingTop="@dimen/appbar_padding_top"
15 android:theme="@style/AppTheme.AppBarOverlay">
16
17 <android.support.v7.widget.Toolbar
18 android:id="@+id/toolbar"
19 android:layout_width="match_parent"
20 android:layout_height="?attr/actionBarSize"
21 android:background="?attr/colorPrimary"
22 app:layout_scrollFlags="enterAlways"
23 app:popupTheme="@style/AppTheme.PopupOverlay">
24
25 </android.support.v7.widget.Toolbar>
26
27 </android.support.design.widget.AppBarLayout>
28 9
29 <FrameLayout 10 <FrameLayout
30 android:layout_width="match_parent" 11 android:layout_width="match_parent"