From 8cc51c4dd9b8f97fc0a5b3b461e74cec56d0b92b Mon Sep 17 00:00:00 2001
From: veyndan <veyndan89@gmail.com>
Date: Mon, 20 Mar 2017 18:33:12 +0000
Subject: [PATCH] Extend from AppCompatActivity instead of Activity

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../fr/free/nrw/commons/AboutActivity.java    |  7 +++-
 .../fr/free/nrw/commons/WelcomeActivity.java  |  6 ++-
 .../free/nrw/commons/auth/SignupActivity.java |  6 ++-
 .../free/nrw/commons/theme/BaseActivity.java  | 37 -------------------
 app/src/main/res/values/styles.xml            |  4 --
 6 files changed, 15 insertions(+), 49 deletions(-)
 delete mode 100644 app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 9fea24db7..8446c0ac3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -32,11 +32,11 @@
 
         <activity
             android:name=".auth.LoginActivity"
-            android:theme="@style/NoTitle" >
+            >
         </activity>
         <activity
             android:name=".WelcomeActivity"
-            android:theme="@style/NoTitle" >
+            >
         </activity>
         <activity
             android:name=".upload.ShareActivity"
diff --git a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
index 81d0b3efb..182cc0962 100644
--- a/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/AboutActivity.java
@@ -5,12 +5,12 @@ import android.text.Html;
 import android.text.method.LinkMovementMethod;
 import android.widget.TextView;
 
-import fr.free.nrw.commons.theme.BaseActivity;
+import fr.free.nrw.commons.theme.BaseAppCompatActivity;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-public class AboutActivity extends BaseActivity {
+public class AboutActivity extends BaseAppCompatActivity {
     @BindView(R.id.about_version) TextView versionText;
     @BindView(R.id.about_license) TextView licenseText;
     @BindView(R.id.about_improve) TextView improveText;
@@ -21,6 +21,9 @@ public class AboutActivity extends BaseActivity {
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
+
+        getSupportActionBar().hide();
+
         ButterKnife.bind(this);
 
         uploadsToText.setText(CommonsApplication.EVENTLOG_WIKI);
diff --git a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
index 6e754cff1..7272af715 100644
--- a/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/WelcomeActivity.java
@@ -9,9 +9,9 @@ import android.widget.Button;
 
 import com.viewpagerindicator.CirclePageIndicator;
 
-import fr.free.nrw.commons.theme.BaseActivity;
+import fr.free.nrw.commons.theme.BaseAppCompatActivity;
 
-public class WelcomeActivity extends BaseActivity {
+public class WelcomeActivity extends BaseAppCompatActivity {
     static final int PAGE_WIKIPEDIA = 0,
             PAGE_DO_UPLOAD = 1,
             PAGE_DONT_UPLOAD = 2,
@@ -33,6 +33,8 @@ public class WelcomeActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_welcome);
 
+        getSupportActionBar().hide();
+
         pager = (ViewPager)findViewById(R.id.welcomePager);
         pager.setAdapter(new PagerAdapter() {
             @Override
diff --git a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
index a8ec8937d..2f56c9bc6 100644
--- a/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/auth/SignupActivity.java
@@ -8,9 +8,9 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.Toast;
 
-import fr.free.nrw.commons.theme.BaseActivity;
+import fr.free.nrw.commons.theme.BaseAppCompatActivity;
 
-public class SignupActivity extends BaseActivity {
+public class SignupActivity extends BaseAppCompatActivity {
 
     private WebView webView;
 
@@ -19,6 +19,8 @@ public class SignupActivity extends BaseActivity {
         super.onCreate(savedInstanceState);
         Log.d("SignupActivity", "Signup Activity started");
 
+        getSupportActionBar().hide();
+
         webView = new WebView(this);
         setContentView(webView);
 
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
deleted file mode 100644
index e0e61cbc1..000000000
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ /dev/null
@@ -1,37 +0,0 @@
-package fr.free.nrw.commons.theme;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
-import android.preference.PreferenceManager;
-
-import fr.free.nrw.commons.R;
-
-
-public class BaseActivity extends Activity {
-    boolean currentTheme;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true)) {
-            currentTheme = true;
-            setTheme(R.style.DarkAppTheme);
-        }else {
-            currentTheme = false;
-            setTheme(R.style.LightAppTheme); // default
-        }
-        super.onCreate(savedInstanceState);
-    }
-
-    @Override
-    protected void onResume() {
-        // Restart activity if theme is changed
-        boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",true);
-        if(currentTheme!=newTheme){ // is activity theme changed
-            Intent intent = getIntent();
-            finish();
-            startActivity(intent);
-        }
-        super.onResume();
-    }
-}
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index a0ef212df..a253fef6a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -43,10 +43,6 @@
         <item name="colorControlNormal">#ffffff</item>
     </style>
 
-    <style name="NoTitle" parent="DarkAppTheme">
-        <item name="android:windowNoTitle">true</item>
-    </style>
-
     <style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
 
 </resources>
\ No newline at end of file