Dbrant has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/378059 )
Change subject: Theme reckoning: abolish ThemedActionBarActivity, and further
cleanup.
......................................................................
Theme reckoning: abolish ThemedActionBarActivity, and further cleanup.
Change-Id: I63d9d6da7109062129780b843e795068e9d0642e
---
M app/src/main/AndroidManifest.xml
M app/src/main/java/org/wikipedia/activity/ActivityUtil.java
M app/src/main/java/org/wikipedia/activity/BaseActivity.java
M app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
M
app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
D app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
M app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
M app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
M app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
M app/src/main/java/org/wikipedia/language/LangLinksActivity.java
M app/src/main/java/org/wikipedia/login/LoginActivity.java
M app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java
M app/src/main/java/org/wikipedia/page/PageActivity.java
M app/src/main/java/org/wikipedia/settings/AboutActivity.java
M app/src/main/java/org/wikipedia/settings/LicenseActivity.java
M app/src/main/res/layout/activity_create_account.xml
M app/src/main/res/layout/activity_login.xml
M app/src/main/res/values/styles_dark.xml
M app/src/main/res/values/styles_light.xml
19 files changed, 108 insertions(+), 161 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/59/378059/1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c46c8ae..252897e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -216,7 +216,8 @@
android:name=".offline.CompilationDetailActivity" />
<activity
- android:name=".offline.OfflineTutorialActivity" />
+ android:name=".offline.OfflineTutorialActivity"
+ android:theme="@style/AppTheme.TranslucentStatus"/>
<provider
android:authorities="${applicationId}"
diff --git a/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
b/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
index 906670f..83adb47 100644
--- a/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
+++ b/app/src/main/java/org/wikipedia/activity/ActivityUtil.java
@@ -3,6 +3,9 @@
import android.app.Activity;
import android.view.MenuItem;
import android.view.View;
+import android.view.ViewConfiguration;
+
+import java.lang.reflect.Field;
public final class ActivityUtil {
public static View getRootView(Activity activity) {
@@ -13,5 +16,25 @@
return activity.findViewById(item.getItemId());
}
+ /**
+ * Helper function to force the Activity to show the three-dot overflow
icon in its ActionBar.
+ * @param activity Activity whose overflow icon will be forced.
+ */
+ public static void forceOverflowMenuIcon(Activity activity) {
+ // API 19 is required for ReflectiveOperationException subclasses
+ //noinspection TryWithIdenticalCatches
+ try {
+ ViewConfiguration config = ViewConfiguration.get(activity);
+ // This field doesn't exist in 4.4, where the overflow icon is
always shown:
+ //
https://android.googlesource.com/platform/frameworks/base.git/+/ea04f3cfc6e245fb415fd352ed0048cd940a46fe%5E!/
+ Field menuKeyField =
ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
+ if (menuKeyField != null) {
+ menuKeyField.setAccessible(true);
+ menuKeyField.setBoolean(config, false);
+ }
+ } catch (IllegalAccessException ignore) {
+ } catch (NoSuchFieldException ignore) { }
+ }
+
private ActivityUtil() { }
}
diff --git a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
index d0bf688..f399936 100644
--- a/app/src/main/java/org/wikipedia/activity/BaseActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/BaseActivity.java
@@ -24,11 +24,14 @@
import org.wikipedia.Constants;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
+import org.wikipedia.crash.CrashReportActivity;
import org.wikipedia.events.NetworkConnectEvent;
+import org.wikipedia.events.ThemeChangeEvent;
import org.wikipedia.events.WikipediaZeroEnterEvent;
import org.wikipedia.offline.Compilation;
import org.wikipedia.offline.OfflineManager;
import org.wikipedia.readinglist.sync.ReadingListSynchronizer;
+import org.wikipedia.recurring.RecurringTasksExecutor;
import org.wikipedia.settings.Prefs;
import org.wikipedia.util.DeviceUtil;
import org.wikipedia.util.FeedbackUtil;
@@ -43,20 +46,22 @@
private EventBusMethods busMethods;
private NetworkStateReceiver networkStateReceiver = new
NetworkStateReceiver();
- @Override public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case android.R.id.home:
- onBackPressed();
- return true;
- default:
- return false;
- }
- }
-
@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
busMethods = new EventBusMethods();
WikipediaApp.getInstance().getBus().register(busMethods);
+
+ setTheme();
+ removeSplashBackground();
+
+ if (getSupportActionBar() != null) {
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ }
+ ActivityUtil.forceOverflowMenuIcon(this);
+
+ // Conditionally execute all recurring tasks
+ new RecurringTasksExecutor(WikipediaApp.getInstance()).run();
+
IntentFilter filter = new
IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION);
registerReceiver(networkStateReceiver, filter);
}
@@ -67,6 +72,26 @@
busMethods = null;
super.onDestroy();
destroyed = true;
+ }
+
+ @Override protected void onResume() {
+ super.onResume();
+
+ // The UI is likely shown, giving the user the opportunity to exit and
making a crash loop
+ // less probable.
+ if (!(this instanceof CrashReportActivity)) {
+ Prefs.crashedBeforeActivityCreated(false);
+ }
+ }
+
+ @Override public boolean onOptionsItemSelected(MenuItem item) {
+ switch (item.getItemId()) {
+ case android.R.id.home:
+ onBackPressed();
+ return true;
+ default:
+ return false;
+ }
}
@Override
@@ -100,6 +125,10 @@
return super.isDestroyed();
}
return destroyed;
+ }
+
+ protected void setTheme() {
+ setTheme(WikipediaApp.getInstance().getCurrentTheme().getResourceId());
}
protected void setSharedElementTransitions() {
@@ -192,6 +221,10 @@
}
}
+ private void removeSplashBackground() {
+ getWindow().setBackgroundDrawable(null);
+ }
+
private class EventBusMethods {
// todo: reevaluate lifecycle. the bus is active when this activity is
paused and we show ui
@Subscribe public void on(WikipediaZeroEnterEvent event) {
@@ -205,5 +238,9 @@
@Subscribe public void on(NetworkConnectEvent event) {
ReadingListSynchronizer.instance().syncSavedPages();
}
+
+ @Subscribe public void on(ThemeChangeEvent event) {
+ recreate();
+ }
}
}
diff --git
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
index 447c607..512766d 100644
--- a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
+++ b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivity.java
@@ -11,7 +11,7 @@
* Boilerplate for a {@link android.support.v4.app.FragmentActivity}
containing a single stack of
* Fragments.
*/
-public abstract class SingleFragmentActivity<T extends Fragment> extends
ThemedActionBarActivity {
+public abstract class SingleFragmentActivity<T extends Fragment> extends
BaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
index aebed10..a02906c 100644
---
a/app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
+++
b/app/src/main/java/org/wikipedia/activity/SingleFragmentActivityTransparent.java
@@ -6,6 +6,7 @@
import android.support.v4.app.Fragment;
import org.wikipedia.R;
+import org.wikipedia.theme.Theme;
/**
* Boilerplate for a {@link android.support.v4.app.FragmentActivity}
containing a single stack of
@@ -26,6 +27,12 @@
}
}
+ @Override
+ protected void setTheme() {
+ setTheme(Theme.DARK.getResourceId());
+ setTheme(R.style.AppTheme_FullScreen_TranslucentDark);
+ }
+
protected void addFragment(T fragment) {
getSupportFragmentManager().beginTransaction().add(getContainerId(),
fragment).commit();
}
diff --git
a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
b/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
deleted file mode 100644
index 0d0e3a5..0000000
--- a/app/src/main/java/org/wikipedia/activity/ThemedActionBarActivity.java
+++ /dev/null
@@ -1,113 +0,0 @@
-package org.wikipedia.activity;
-
-import android.app.Activity;
-import android.os.Build;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.view.KeyEvent;
-import android.view.ViewConfiguration;
-
-import com.squareup.otto.Subscribe;
-
-import org.wikipedia.WikipediaApp;
-import org.wikipedia.events.ThemeChangeEvent;
-import org.wikipedia.recurring.RecurringTasksExecutor;
-import org.wikipedia.settings.Prefs;
-
-import java.lang.reflect.Field;
-
-public abstract class ThemedActionBarActivity extends BaseActivity {
- private EventBusMethods busMethods;
-
- @Override
- public void onCreate(@Nullable Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
-
- busMethods = new EventBusMethods();
- WikipediaApp.getInstance().getBus().register(busMethods);
-
- setTheme();
- removeSplashBackground();
-
- if (getSupportActionBar() != null) {
- getSupportActionBar().setDisplayHomeAsUpEnabled(true);
- }
- forceOverflowMenuIcon(this);
-
- // todo: move up to BaseActivity or down
- // Conditionally execute all recurring tasks
- new RecurringTasksExecutor(WikipediaApp.getInstance()).run();
- }
-
- @Override
- protected void onResume() {
- super.onResume();
-
- // The UI is likely shown, giving the user the opportunity to exit and
making a crash loop
- // less probable.
- // todo: can we move this method up to BaseActivity? however,
CrashReportActivity should not
- // call this method
- Prefs.crashedBeforeActivityCreated(false);
- }
-
- @Override public void onDestroy() {
- WikipediaApp.getInstance().getBus().unregister(busMethods);
- busMethods = null;
- super.onDestroy();
- }
-
- protected void setTheme() {
- setTheme(WikipediaApp.getInstance().getCurrentTheme().getResourceId());
- }
-
- /**
- * Helper function to force the Activity to show the three-dot overflow
icon in its ActionBar.
- * @param activity Activity whose overflow icon will be forced.
- */
- private static void forceOverflowMenuIcon(Activity activity) {
- // API 19 is required for ReflectiveOperationException subclasses
- //noinspection TryWithIdenticalCatches
- try {
- ViewConfiguration config = ViewConfiguration.get(activity);
- // This field doesn't exist in 4.4, where the overflow icon is
always shown:
- //
https://android.googlesource.com/platform/frameworks/base.git/+/ea04f3cfc6e245fb415fd352ed0048cd940a46fe%5E!/
- Field menuKeyField =
ViewConfiguration.class.getDeclaredField("sHasPermanentMenuKey");
- if (menuKeyField != null) {
- menuKeyField.setAccessible(true);
- menuKeyField.setBoolean(config, false);
- }
- } catch (IllegalAccessException ignore) {
- } catch (NoSuchFieldException ignore) { }
- }
-
- // Hack for https://phabricator.wikimedia.org/T78117 (Dec 2014): onKeyDown
+ onKeyUp
- // todo: Consider removing once updating appcompat-v7.
-
- @Override
- public boolean onKeyDown(int keyCode, KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_MENU &&
"LGE".equalsIgnoreCase(Build.BRAND)) {
- return true;
- }
- return super.onKeyDown(keyCode, event);
- }
-
- @Override
- public boolean onKeyUp(int keyCode, @NonNull KeyEvent event) {
- if (keyCode == KeyEvent.KEYCODE_MENU &&
"LGE".equalsIgnoreCase(Build.BRAND)) {
- openOptionsMenu();
- return true;
- }
- return super.onKeyUp(keyCode, event);
- }
-
- private void removeSplashBackground() {
- getWindow().setBackgroundDrawable(null);
- }
-
- private class EventBusMethods {
- @Subscribe public void on(ThemeChangeEvent event) {
- recreate();
- }
- }
-}
diff --git
a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
index e283c12..479e16f 100644
--- a/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
+++ b/app/src/main/java/org/wikipedia/createaccount/CreateAccountActivity.java
@@ -15,7 +15,7 @@
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.analytics.CreateAccountFunnel;
import org.wikipedia.captcha.CaptchaHandler;
import org.wikipedia.captcha.CaptchaResult;
@@ -36,7 +36,7 @@
import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard;
-public class CreateAccountActivity extends ThemedActionBarActivity {
+public class CreateAccountActivity extends BaseActivity {
public static final int RESULT_ACCOUNT_CREATED = 1;
public static final int RESULT_ACCOUNT_NOT_CREATED = 2;
diff --git a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
index d328a0b..dade082 100644
--- a/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
+++ b/app/src/main/java/org/wikipedia/edit/EditSectionActivity.java
@@ -29,7 +29,7 @@
import org.wikipedia.Constants;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.analytics.EditFunnel;
import org.wikipedia.analytics.LoginFunnel;
import org.wikipedia.auth.AccountUtil;
@@ -62,7 +62,7 @@
import static org.wikipedia.util.L10nUtil.setConditionalTextDirection;
import static org.wikipedia.util.UriUtil.handleExternalLink;
-public class EditSectionActivity extends ThemedActionBarActivity {
+public class EditSectionActivity extends BaseActivity {
public static final String ACTION_EDIT_SECTION =
"org.wikipedia.edit_section";
public static final String EXTRA_TITLE =
"org.wikipedia.edit_section.title";
public static final String EXTRA_SECTION_ID =
"org.wikipedia.edit_section.sectionid";
diff --git a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
index 8f7f5bd..5fb5bd1 100644
--- a/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
+++ b/app/src/main/java/org/wikipedia/gallery/GalleryActivity.java
@@ -18,20 +18,20 @@
import android.support.v4.app.FragmentTransaction;
import android.support.v4.content.ContextCompat;
import android.support.v4.view.ViewPager;
+import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import android.util.SparseArray;
import android.view.Gravity;
import android.view.View;
import android.view.ViewGroup;
-import android.view.WindowManager;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.analytics.GalleryFunnel;
import org.wikipedia.concurrency.CallbackTask;
import org.wikipedia.dataclient.WikiSite;
@@ -65,7 +65,7 @@
import static org.wikipedia.util.UriUtil.handleExternalLink;
import static org.wikipedia.util.UriUtil.resolveProtocolRelativeUrl;
-public class GalleryActivity extends ThemedActionBarActivity implements
LinkPreviewDialog.Callback,
+public class GalleryActivity extends BaseActivity implements
LinkPreviewDialog.Callback,
GalleryItemFragment.Callback {
public static final int ACTIVITY_RESULT_PAGE_SELECTED = 1;
@@ -169,10 +169,7 @@
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- // force the theme to dark...
- setTheme(Theme.DARK.getResourceId());
- getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_gallery);
initToolbar();
@@ -301,6 +298,11 @@
} else {
ShareUtil.shareText(this, title);
}
+ }
+
+ @Override
+ protected void setTheme() {
+ setTheme(Theme.DARK.getResourceId());
}
private class GalleryPageChangeListener extends
ViewPager.SimpleOnPageChangeListener {
@@ -646,7 +648,7 @@
private GalleryCollection galleryCollection;
private SparseArray<GalleryItemFragment> fragmentArray;
- GalleryItemAdapter(ThemedActionBarActivity activity) {
+ GalleryItemAdapter(AppCompatActivity activity) {
super(activity.getSupportFragmentManager());
fragmentArray = new SparseArray<>();
}
diff --git a/app/src/main/java/org/wikipedia/language/LangLinksActivity.java
b/app/src/main/java/org/wikipedia/language/LangLinksActivity.java
index b09657a..2d82913 100644
--- a/app/src/main/java/org/wikipedia/language/LangLinksActivity.java
+++ b/app/src/main/java/org/wikipedia/language/LangLinksActivity.java
@@ -17,7 +17,7 @@
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.dataclient.mwapi.MwQueryResponse;
import org.wikipedia.history.HistoryEntry;
@@ -37,7 +37,7 @@
import static org.apache.commons.lang3.StringUtils.defaultString;
import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard;
-public class LangLinksActivity extends ThemedActionBarActivity {
+public class LangLinksActivity extends BaseActivity {
public static final int ACTIVITY_RESULT_LANGLINK_SELECT = 1;
public static final String ACTION_LANGLINKS_FOR_TITLE =
"org.wikipedia.langlinks_for_title";
diff --git a/app/src/main/java/org/wikipedia/login/LoginActivity.java
b/app/src/main/java/org/wikipedia/login/LoginActivity.java
index 1e1987b..5960daa 100644
--- a/app/src/main/java/org/wikipedia/login/LoginActivity.java
+++ b/app/src/main/java/org/wikipedia/login/LoginActivity.java
@@ -18,7 +18,7 @@
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.analytics.LoginFunnel;
import org.wikipedia.auth.AccountUtil;
import org.wikipedia.createaccount.CreateAccountActivity;
@@ -36,7 +36,7 @@
import static org.wikipedia.util.DeviceUtil.hideSoftKeyboard;
import static org.wikipedia.util.UriUtil.visitInExternalBrowser;
-public class LoginActivity extends ThemedActionBarActivity {
+public class LoginActivity extends BaseActivity {
public static final int RESULT_LOGIN_SUCCESS = 1;
public static final int RESULT_LOGIN_FAIL = 2;
diff --git
a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java
b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java
index c8c192c..8e22c48 100644
--- a/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java
+++ b/app/src/main/java/org/wikipedia/offline/OfflineTutorialActivity.java
@@ -2,10 +2,7 @@
import android.content.Context;
import android.content.Intent;
-import android.os.Build;
-import android.os.Bundle;
import android.support.annotation.NonNull;
-import android.view.WindowManager;
import org.wikipedia.activity.SingleFragmentActivity;
import org.wikipedia.onboarding.OnboardingFragment;
@@ -15,13 +12,6 @@
@NonNull
public static Intent newIntent(@NonNull Context context) {
return new Intent(context, OfflineTutorialActivity.class);
- }
-
- @Override public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
-
getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
}
@Override
diff --git a/app/src/main/java/org/wikipedia/page/PageActivity.java
b/app/src/main/java/org/wikipedia/page/PageActivity.java
index 5b8d2fb..02b1841 100644
--- a/app/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/app/src/main/java/org/wikipedia/page/PageActivity.java
@@ -30,7 +30,6 @@
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
-import android.view.WindowManager;
import android.widget.ProgressBar;
import android.widget.Toast;
@@ -43,7 +42,7 @@
import org.wikipedia.Constants;
import org.wikipedia.R;
import org.wikipedia.WikipediaApp;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.analytics.IntentFunnel;
import org.wikipedia.analytics.LinkPreviewFunnel;
import org.wikipedia.dataclient.WikiSite;
@@ -86,7 +85,7 @@
import static org.wikipedia.settings.Prefs.isLinkPreviewEnabled;
import static org.wikipedia.util.UriUtil.visitInExternalBrowser;
-public class PageActivity extends ThemedActionBarActivity implements
PageFragment.Callback,
+public class PageActivity extends BaseActivity implements
PageFragment.Callback,
LinkPreviewDialog.Callback, SearchFragment.Callback,
ThemeChooserDialog.Callback,
WiktionaryDialog.Callback {
@@ -129,10 +128,6 @@
app = (WikipediaApp) getApplicationContext();
MetricsManager.register(app, app);
app.checkCrashes(this);
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-
getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
- }
PreferenceManager.setDefaultValues(this, R.xml.preferences, false);
diff --git a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
index 231e6a5..355e932 100644
--- a/app/src/main/java/org/wikipedia/settings/AboutActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/AboutActivity.java
@@ -11,7 +11,7 @@
import org.wikipedia.BuildConfig;
import org.wikipedia.R;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.richtext.RichTextUtil;
import org.wikipedia.util.FeedbackUtil;
import org.wikipedia.util.StringUtil;
@@ -21,7 +21,7 @@
import static org.wikipedia.util.DeviceUtil.mailAppExists;
-public class AboutActivity extends ThemedActionBarActivity {
+public class AboutActivity extends BaseActivity {
private static final String KEY_SCROLL_X = "KEY_SCROLL_X";
private static final String KEY_SCROLL_Y = "KEY_SCROLL_Y";
diff --git a/app/src/main/java/org/wikipedia/settings/LicenseActivity.java
b/app/src/main/java/org/wikipedia/settings/LicenseActivity.java
index 488bb71..5fe1337 100644
--- a/app/src/main/java/org/wikipedia/settings/LicenseActivity.java
+++ b/app/src/main/java/org/wikipedia/settings/LicenseActivity.java
@@ -4,7 +4,7 @@
import android.widget.TextView;
import org.wikipedia.R;
-import org.wikipedia.activity.ThemedActionBarActivity;
+import org.wikipedia.activity.BaseActivity;
import org.wikipedia.util.StringUtil;
import java.io.IOException;
@@ -14,7 +14,7 @@
/**
* Displays license text of the libraries we use.
*/
-public class LicenseActivity extends ThemedActionBarActivity {
+public class LicenseActivity extends BaseActivity {
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
diff --git a/app/src/main/res/layout/activity_create_account.xml
b/app/src/main/res/layout/activity_create_account.xml
index f96dadf..280e385 100644
--- a/app/src/main/res/layout/activity_create_account.xml
+++ b/app/src/main/res/layout/activity_create_account.xml
@@ -49,6 +49,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:passwordToggleEnabled="true"
+ app:passwordToggleTint="?android:textColorHint"
android:hint="@string/login_password_hint">
<org.wikipedia.views.PlainPasteEditText
@@ -65,6 +66,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
app:passwordToggleEnabled="true"
+ app:passwordToggleTint="?android:textColorHint"
android:hint="@string/create_account_password_repeat_hint">
<org.wikipedia.views.PlainPasteEditText
diff --git a/app/src/main/res/layout/activity_login.xml
b/app/src/main/res/layout/activity_login.xml
index 54e3946..0abb4d9 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -71,6 +71,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:hint="@string/login_password_hint"
+ app:passwordToggleTint="?android:textColorHint"
app:passwordToggleEnabled="true">
<org.wikipedia.views.PlainPasteEditText
diff --git a/app/src/main/res/values/styles_dark.xml
b/app/src/main/res/values/styles_dark.xml
index d7f9f56..bfddba8 100644
--- a/app/src/main/res/values/styles_dark.xml
+++ b/app/src/main/res/values/styles_dark.xml
@@ -9,6 +9,7 @@
<item name="android:textColorPrimary">@color/base90</item>
<item name="android:textColorSecondary">@color/base80</item>
<item name="android:textColorTertiary">@color/base70</item>
+ <item name="android:textColorHint">@color/base50</item>
<item name="colorPrimary">@color/accent75</item>
<item name="colorAccent">@color/accent75</item>
<item name="textColorError">@color/red75</item>
diff --git a/app/src/main/res/values/styles_light.xml
b/app/src/main/res/values/styles_light.xml
index 97ee642..2d6aa93 100644
--- a/app/src/main/res/values/styles_light.xml
+++ b/app/src/main/res/values/styles_light.xml
@@ -9,6 +9,7 @@
<item name="android:textColorPrimary">@color/base10</item>
<item name="android:textColorSecondary">@color/base20</item>
<item name="android:textColorTertiary">@color/base30</item>
+ <item name="android:textColorHint">@color/base50</item>
<item name="colorPrimary">@color/accent50</item>
<item name="colorAccent">@color/accent50</item>
<item name="textColorError">@color/red50</item>
--
To view, visit https://gerrit.wikimedia.org/r/378059
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I63d9d6da7109062129780b843e795068e9d0642e
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
