use appcompat in more activities

6 files changed, 14 insertions, 14 deletions

diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index b05b31976..be3311ebf 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -230,7 +230,7 @@
         </activity>
         <activity
             android:name=".ui.ShowFullscreenMessageActivity"
-            android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
+            android:theme="@style/ConversationsTheme.NoActionBar.FullScreen"
             android:configChanges="orientation|screenSize">
         </activity>
         <activity
@@ -238,9 +238,9 @@
             android:label="@string/trust_omemo_fingerprints"
             android:windowSoftInputMode="stateAlwaysHidden" />
         <activity
-            android:name="de.duenndns.ssl.MemorizingActivity"
-            android:theme="@style/ConversationsTheme"
-            tools:replace="android:theme" />
+            android:name="de.duenndns.ssl.MemorizingActivity" />
+            <!--android:theme="@style/ConversationsTheme"-->
+            <!--tools:replace="android:theme" />-->
         <activity
             android:name=".ui.AboutActivity"
             android:label="@string/title_activity_about"
diff --git a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
index cfa743c69..21462ebfa 100644
--- a/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/RecordingActivity.java
@@ -8,6 +8,7 @@ import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.SystemClock;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -24,7 +25,7 @@ import de.pixart.messenger.Config;
 import de.pixart.messenger.R;
 import de.pixart.messenger.persistance.FileBackend;
 
-public class RecordingActivity extends Activity implements View.OnClickListener {
+public class RecordingActivity extends AppCompatActivity implements View.OnClickListener {
 
     private TextView mTimerTextView;
     private Button mCancelButton;
diff --git a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
index 619ab2101..83928d0cd 100644
--- a/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ShowFullscreenMessageActivity.java
@@ -1,6 +1,5 @@
 package de.pixart.messenger.ui;
 
-import android.app.Activity;
 import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.SharedPreferences;
@@ -11,6 +10,7 @@ import android.media.MediaMetadataRetriever;
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.WindowManager;
@@ -39,7 +39,7 @@ import de.pixart.messenger.utils.ExifHelper;
 
 import static de.pixart.messenger.persistance.FileBackend.close;
 
-public class ShowFullscreenMessageActivity extends Activity {
+public class ShowFullscreenMessageActivity extends AppCompatActivity {
 
     Integer oldOrientation;
     PhotoView mImage;
diff --git a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
index 262be5bb0..09d4d26ac 100644
--- a/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/UriHandlerActivity.java
@@ -1,8 +1,8 @@
 package de.pixart.messenger.ui;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
+import android.support.v7.app.AppCompatActivity;
 
 import java.util.Arrays;
 import java.util.List;
@@ -13,7 +13,7 @@ import de.pixart.messenger.utils.zxing.IntentIntegrator;
 import de.pixart.messenger.utils.zxing.IntentResult;
 import de.pixart.messenger.xmpp.jid.Jid;
 
-public class UriHandlerActivity extends Activity {
+public class UriHandlerActivity extends AppCompatActivity {
     public static final String ACTION_SCAN_QR_CODE = "scan_qr_code";
 
     @Override
diff --git a/src/main/res/layout/activity_fullscreen_message.xml b/src/main/res/layout/activity_fullscreen_message.xml
index b97117c8b..bc6eeb850 100644
--- a/src/main/res/layout/activity_fullscreen_message.xml
+++ b/src/main/res/layout/activity_fullscreen_message.xml
@@ -5,11 +5,6 @@
     android:orientation="vertical"
     android:background="@android:color/black">
 
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/tool_bar">
-    </include>
-
     <com.github.chrisbanes.photoview.PhotoView
         android:id="@id/message_image_view"
         android:layout_width="match_parent"
diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml
index a20b5c6c6..ce8506c89 100644
--- a/src/main/res/values/themes.xml
+++ b/src/main/res/values/themes.xml
@@ -86,4 +86,8 @@
         <item name="TextSizeHeadline">18sp</item>
     </style>
 
+    <style name="ConversationsTheme.NoActionBar.FullScreen" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:windowFullscreen">true</item>
+    </style>
+
 </resources>
\ No newline at end of file