From 23fdefff77bc39e021827ffc0cfd3217da873bda Mon Sep 17 00:00:00 2001
From: Christian Schneppe <christian@pix-art.de>
Date: Sun, 29 Apr 2018 14:52:52 +0200
Subject: some more theme fixes

---
 .../de/pixart/messenger/ui/RecordingActivity.java  |  2 ++
 .../de/pixart/messenger/ui/UpdaterActivity.java    |  9 ++++++++
 src/main/res/layout/activity_updater.xml           | 26 +++++++++++++---------
 src/main/res/layout/toolbar.xml                    | 10 ++++-----
 4 files changed, 31 insertions(+), 16 deletions(-)

(limited to 'src/main')

diff --git a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
index 3aaa6b42b..b49566c27 100644
--- a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
@@ -70,6 +70,8 @@ public class RecordingActivity extends XmppActivity implements View.OnClickListe
     @Override
     protected void onStart() {
         super.onStart();
+        this.mTheme = findTheme();
+        setTheme(this.mTheme);
         Log.d(Config.LOGTAG, "output: " + getOutputFile());
         if (!startRecording()) {
             mStopButton.setEnabled(false);
diff --git a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
index 562b75313..96d53aa97 100644
--- a/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UpdaterActivity.java
@@ -50,6 +50,10 @@ public class UpdaterActivity extends XmppActivity {
 
         //set activity
         setContentView(R.layout.activity_updater);
+
+        this.mTheme = findTheme();
+        setTheme(this.mTheme);
+
         TextView textView = findViewById(R.id.updater);
         textView.setText(R.string.update_info);
 
@@ -76,6 +80,11 @@ public class UpdaterActivity extends XmppActivity {
     @Override
     protected void onStart() {
         super.onStart();
+        this.mTheme = findTheme();
+        setTheme(this.mTheme);
+        setTitle(getString(R.string.update_service));
+        setSupportActionBar(findViewById(R.id.toolbar));
+        configureActionBar(getSupportActionBar());
         if (getIntent() != null && getIntent().getStringExtra("update").equals("PixArtMessenger_UpdateService")) {
             try {
                 appURI = getIntent().getStringExtra("url");
diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml
index 4aa9deb8f..9fe33c0c9 100644
--- a/src/main/res/layout/activity_updater.xml
+++ b/src/main/res/layout/activity_updater.xml
@@ -3,27 +3,31 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="?attr/color_background_secondary"
     tools:context="${applicationId}.ui.UpdaterActivity">
 
+    <include xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/toolbar"
+        layout="@layout/toolbar" />
+
     <TextView
         android:id="@+id/updater"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:layout_marginTop="6dp"
+        android:layout_alignParentTop="false"
+        android:layout_below="@id/toolbar"
+        android:layout_centerHorizontal="true"
+        android:padding="@dimen/card_padding_regular"
         android:text="Current"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:textStyle="normal"
-        android:layout_marginLeft="4dp"
-        android:layout_marginRight="4dp" />
+        android:textAppearance="@style/TextAppearance.Conversations.Body1"
+        android:textStyle="normal" />
 
     <ProgressBar
+        android:id="@+id/UpdateProgressBar"
         style="?android:attr/progressBarStyleLarge"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:id="@+id/UpdateProgressBar"
-        android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true" />
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true" />
 
-</RelativeLayout>
+</RelativeLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/toolbar.xml b/src/main/res/layout/toolbar.xml
index ca0ab0cd3..e9782393f 100644
--- a/src/main/res/layout/toolbar.xml
+++ b/src/main/res/layout/toolbar.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
+<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?attr/colorPrimary"
-    android:minHeight="?attr/actionBarSize"
     android:elevation="@dimen/toolbar_elevation"
+    android:minHeight="?attr/actionBarSize"
     android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-    app:popupTheme="?popupOverlayStyle"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto" />
\ No newline at end of file
+    app:popupTheme="?popupOverlayStyle" />
\ No newline at end of file
-- 
cgit v1.2.3