From e094101e58665f922b1e768656379fb7af56bced Mon Sep 17 00:00:00 2001
From: Neslihan <tur.neslihan@gmail.com>
Date: Sat, 18 Mar 2017 12:04:49 +0300
Subject: [PATCH] Apply reviews

---
 .../main/java/fr/free/nrw/commons/SettingsActivity.java   | 8 +++-----
 .../main/java/fr/free/nrw/commons/theme/BaseActivity.java | 8 +++-----
 .../fr/free/nrw/commons/theme/BaseAppCompatActivity.java  | 6 ++----
 app/src/main/res/values/strings.xml                       | 5 ++---
 4 files changed, 10 insertions(+), 17 deletions(-)

diff --git a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
index a7dedcf18..00c660aa0 100644
--- a/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/SettingsActivity.java
@@ -1,6 +1,5 @@
 package fr.free.nrw.commons;
 
-import android.content.Context;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.res.Configuration;
@@ -10,7 +9,6 @@ import android.preference.Preference;
 import android.preference.PreferenceActivity;
 import android.preference.PreferenceManager;
 import android.support.annotation.LayoutRes;
-import android.support.v4.content.IntentCompat;
 import android.support.v7.app.AppCompatDelegate;
 import android.view.MenuInflater;
 import android.view.View;
@@ -25,11 +23,11 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
     protected void onCreate(Bundle savedInstanceState) {
         getDelegate().installViewFactory();
         getDelegate().onCreate(savedInstanceState);
-        //Check prefs on every activity starts
+        // Check prefs on every activity starts
         if (PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false)) {
             setTheme(R.style.DarkAppTheme);
         }else {
-            setTheme(R.style.LightAppTheme); //default
+            setTheme(R.style.LightAppTheme); // default
         }
         super.onCreate(savedInstanceState);
         super.onCreate(savedInstanceState);
@@ -80,7 +78,7 @@ public class SettingsActivity extends PreferenceActivity implements SharedPrefer
     @Override
     public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
         if(key.equals("theme")){
-            //Finish current activity and tart new one with selected theme
+            // Finish current activity and start new one with selected theme
             Intent intent = getIntent();
             finish();
             startActivity(intent);
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
index d62b00e7a..c93332bfe 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseActivity.java
@@ -4,7 +4,6 @@ import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.util.Log;
 
 import fr.free.nrw.commons.R;
 
@@ -19,17 +18,16 @@ public class BaseActivity extends Activity {
             setTheme(R.style.DarkAppTheme);
         }else {
             currentTheme = false;
-            setTheme(R.style.LightAppTheme); //default
+            setTheme(R.style.LightAppTheme); // default
         }
         super.onCreate(savedInstanceState);
     }
 
     @Override
     protected void onResume() {
-        //Restart activity if theme is changed
-        Log.d("deneme","onResume Base");
+        // Restart activity if theme is changed
         boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
-        if(currentTheme!=newTheme){ //is activity theme changed
+        if(currentTheme!=newTheme){ // is activity theme changed
             Intent intent = getIntent();
             finish();
             startActivity(intent);
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
index a368bf47a..606d30347 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/BaseAppCompatActivity.java
@@ -4,7 +4,6 @@ import android.content.Intent;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
 
 import fr.free.nrw.commons.R;
 
@@ -18,15 +17,14 @@ public class BaseAppCompatActivity extends AppCompatActivity {
             setTheme(R.style.DarkAppTheme);
         }else {
             currentTheme = false;
-            setTheme(R.style.LightAppTheme); //default
+            setTheme(R.style.LightAppTheme); // default
         }
         super.onCreate(savedInstanceState);
     }
 
     @Override
     protected void onResume() {
-        //Restart activity if theme is changed
-        Log.d("deneme","onResume Base");
+        // Restart activity if theme is changed
         boolean newTheme = PreferenceManager.getDefaultSharedPreferences(this).getBoolean("theme",false);
         if(currentTheme!=newTheme){ //is activity theme changed
             Intent intent = getIntent();
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0d413333a..a6100a47d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -33,7 +33,6 @@
   <string name="menu_from_camera">Take photo</string>
   <string name="menu_nearby">Nearby</string>
   <string name="provider_contributions">My uploads</string>
-  <string name="menu_theme_toggle">Night mode</string>
   <string name="menu_share">Share</string>
   <string name="menu_open_in_browser">View in Browser</string>
   <string name="share_title_hint">Title</string>
@@ -92,8 +91,8 @@ Tap this message (or hit back) to skip this step.</string>
   <string name="use_previous">Use previous title/description</string>
   <string name="allow_gps">Automatically get current location</string>
   <string name="allow_gps_summary">Retrieve current location to offer category suggestions if image is not geotagged</string>
-  <string name="preference_theme">Select theme</string>
-  <string name="preference_theme_summary">Select if you prefer night mode</string>
+  <string name="preference_theme">Night mode</string>
+  <string name="preference_theme_summary">Use dark theme</string>
   <string name="license_name_cc_by_sa_four"> Attribution-ShareAlike 4.0</string>
   <string name="license_name_cc_by_four"> Attribution 4.0</string>
   <string name="license_name_cc_by_sa"> Attribution-ShareAlike 3.0</string>