jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/375391 )
Change subject: Hygiene: Update theme chooser related names
......................................................................
Hygiene: Update theme chooser related names
Renamed DarkModeMarshaller to DarkModeSwitch because it primarily concerns
theming controls and only incidentally marshals JSON.
Moved it from org.wikipedia.bridge to org.wikipedia.theme because it only
needs the JS bridge as an implementation detail.
Updated the name of R.layout.dialog_theme_chooser.
Change-Id: If7f2f4b3dc1e520cd4c0c303e81ff35a342220b4
---
M app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
M app/src/main/java/org/wikipedia/page/PageFragment.java
R app/src/main/java/org/wikipedia/theme/DarkModeSwitch.java
M app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
R app/src/main/res/layout/dialog_theme_chooser.xml
5 files changed, 13 insertions(+), 12 deletions(-)
Approvals:
Dbrant: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
index 65f6ff1..9c57d00 100644
--- a/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
+++ b/app/src/main/java/org/wikipedia/edit/preview/EditPreviewFragment.java
@@ -22,7 +22,6 @@
import org.wikipedia.WikipediaApp;
import org.wikipedia.analytics.EditFunnel;
import org.wikipedia.bridge.CommunicationBridge;
-import org.wikipedia.bridge.DarkModeMarshaller;
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.edit.EditSectionActivity;
import org.wikipedia.edit.summaries.EditSummaryTag;
@@ -30,6 +29,7 @@
import org.wikipedia.page.LinkHandler;
import org.wikipedia.page.PageActivity;
import org.wikipedia.page.PageTitle;
+import org.wikipedia.theme.DarkModeSwitch;
import org.wikipedia.util.ConfigurationCompat;
import org.wikipedia.util.L10nUtil;
import org.wikipedia.util.log.L;
@@ -185,7 +185,7 @@
isWebViewSetup = true;
L10nUtil.setupDirectionality(parentActivity.getPageTitle().getWikiSite().languageCode(),
Locale.getDefault().getLanguage(), bridge);
if (WikipediaApp.getInstance().isCurrentThemeDark()) {
- new DarkModeMarshaller(bridge).turnOn();
+ new DarkModeSwitch(bridge).turnOn();
}
bridge.addListener("linkClicked", new LinkHandler(getActivity()) {
diff --git a/app/src/main/java/org/wikipedia/page/PageFragment.java
b/app/src/main/java/org/wikipedia/page/PageFragment.java
index 98dcaaa..e561cc7 100755
--- a/app/src/main/java/org/wikipedia/page/PageFragment.java
+++ b/app/src/main/java/org/wikipedia/page/PageFragment.java
@@ -46,7 +46,6 @@
import org.wikipedia.analytics.PageScrollFunnel;
import org.wikipedia.analytics.TabFunnel;
import org.wikipedia.bridge.CommunicationBridge;
-import org.wikipedia.bridge.DarkModeMarshaller;
import org.wikipedia.concurrency.CallbackTask;
import org.wikipedia.dataclient.WikiSite;
import org.wikipedia.dataclient.okhttp.OkHttpWebViewClient;
@@ -71,6 +70,7 @@
import org.wikipedia.readinglist.page.ReadingListPage;
import org.wikipedia.readinglist.page.database.ReadingListDaoProxy;
import org.wikipedia.settings.Prefs;
+import org.wikipedia.theme.DarkModeSwitch;
import org.wikipedia.tooltip.ToolTipUtil;
import org.wikipedia.util.ActiveTimer;
import org.wikipedia.util.DeviceUtil;
@@ -170,7 +170,7 @@
private ConfigurableTabLayout tabLayout;
private ToCHandler tocHandler;
private CommunicationBridge bridge;
- private DarkModeMarshaller darkModeMarshaller;
+ private DarkModeSwitch darkModeSwitch;
private LinkHandler linkHandler;
private EditHandler editHandler;
private ActionMode findInPageActionMode;
@@ -356,13 +356,13 @@
webView.setBackgroundColor(getThemedColor(getActivity(),
R.attr.page_background_color));
bridge = new CommunicationBridge(webView,
"file:///android_asset/index.html");
- darkModeMarshaller = new DarkModeMarshaller(bridge);
+ darkModeSwitch = new DarkModeSwitch(bridge);
setupMessageHandlers();
sendDecorOffsetMessage();
// make sure styles get injected before the DarkModeMarshaller and
other handlers
if (app.isCurrentThemeDark()) {
- darkModeMarshaller.turnOn();
+ darkModeSwitch.turnOn();
}
errorView.setRetryClickListener(new View.OnClickListener() {
@@ -991,8 +991,8 @@
return bridge;
}
- DarkModeMarshaller getDarkModeMarshaller() {
- return darkModeMarshaller;
+ DarkModeSwitch getDarkModeMarshaller() {
+ return darkModeSwitch;
}
private void setupToC(@NonNull PageViewModel model, boolean isFirstPage) {
diff --git a/app/src/main/java/org/wikipedia/bridge/DarkModeMarshaller.java
b/app/src/main/java/org/wikipedia/theme/DarkModeSwitch.java
similarity index 86%
rename from app/src/main/java/org/wikipedia/bridge/DarkModeMarshaller.java
rename to app/src/main/java/org/wikipedia/theme/DarkModeSwitch.java
index 4c240f5..f54f496 100644
--- a/app/src/main/java/org/wikipedia/bridge/DarkModeMarshaller.java
+++ b/app/src/main/java/org/wikipedia/theme/DarkModeSwitch.java
@@ -1,17 +1,18 @@
-package org.wikipedia.bridge;
+package org.wikipedia.theme;
import org.json.JSONException;
import org.json.JSONObject;
+import org.wikipedia.bridge.CommunicationBridge;
import org.wikipedia.settings.Prefs;
// todo: move turnOn() somewhere else and rmeove bridge dependency
-public class DarkModeMarshaller {
+public class DarkModeSwitch {
private final CommunicationBridge bridge;
/**
* @param bridge The bridge used to communicate with the WebView
*/
- public DarkModeMarshaller(CommunicationBridge bridge) {
+ public DarkModeSwitch(CommunicationBridge bridge) {
this.bridge = bridge;
}
diff --git a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
index 87522b1..d76e0fb 100644
--- a/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
+++ b/app/src/main/java/org/wikipedia/theme/ThemeChooserDialog.java
@@ -47,7 +47,7 @@
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
- View rootView = inflater.inflate(R.layout.dialog_themechooser,
container);
+ View rootView = inflater.inflate(R.layout.dialog_theme_chooser,
container);
unbinder = ButterKnife.bind(this, rootView);
buttonDecreaseTextSize.setOnClickListener(new
FontSizeButtonListener(FontSizeAction.DECREASE));
buttonDefaultTextSize.setOnClickListener(new
FontSizeButtonListener(FontSizeAction.RESET));
diff --git a/app/src/main/res/layout/dialog_themechooser.xml
b/app/src/main/res/layout/dialog_theme_chooser.xml
similarity index 100%
rename from app/src/main/res/layout/dialog_themechooser.xml
rename to app/src/main/res/layout/dialog_theme_chooser.xml
--
To view, visit https://gerrit.wikimedia.org/r/375391
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If7f2f4b3dc1e520cd4c0c303e81ff35a342220b4
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: Brion VIBBER <[email protected]>
Gerrit-Reviewer: Cooltey <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Sharvaniharan <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
