Brion VIBBER has submitted this change and it was merged.
Change subject: Turn Wikipedia Zero toasts to croutons.
......................................................................
Turn Wikipedia Zero toasts to croutons.
Change-Id: I459b8dd9bcbd3f0fbf1bbb498845061aa7422031
---
M wikipedia/res/layout/activity_main.xml
M wikipedia/res/values/color.xml
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
3 files changed, 32 insertions(+), 9 deletions(-)
Approvals:
Brion VIBBER: Verified; Looks good to me, approved
diff --git a/wikipedia/res/layout/activity_main.xml
b/wikipedia/res/layout/activity_main.xml
index 4f0dfa2..75b97f4 100644
--- a/wikipedia/res/layout/activity_main.xml
+++ b/wikipedia/res/layout/activity_main.xml
@@ -11,13 +11,16 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
</FrameLayout>
- <fragment
- android:id="@+id/search_fragment"
- android:name="org.wikipedia.search.SearchArticlesFragment"
- android:layout_height="wrap_content"
- android:layout_width="match_parent"
- android:layout_gravity="top"
- />
+ <LinearLayout android:layout_width="match_parent"
android:layout_height="match_parent" android:id="@+id/zero_crouton_container">
+ <fragment
+ android:id="@+id/search_fragment"
+ android:name="org.wikipedia.search.SearchArticlesFragment"
+ android:layout_height="wrap_content"
+ android:layout_width="match_parent"
+ android:layout_gravity="top"
+ />
+ </LinearLayout>
+
</FrameLayout>
<!-- The navigation drawer -->
<!-- Don't set marginTop here, it somehow also affects marginBottom. wtf?!
-->
diff --git a/wikipedia/res/values/color.xml b/wikipedia/res/values/color.xml
index 643add7..120c829 100644
--- a/wikipedia/res/values/color.xml
+++ b/wikipedia/res/values/color.xml
@@ -2,4 +2,8 @@
<resources>
<color name="border">#60888888</color>
+ <!-- Copied for 2.3 -->
+ <color name="holo_green_light">#ff99cc00</color>
+ <color name="holo_red_dark">#ffcc0000</color>
+
</resources>
\ No newline at end of file
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index 18ac221..21adad8 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -17,6 +17,7 @@
import org.wikipedia.recurring.*;
import org.wikipedia.search.*;
import org.wikipedia.settings.*;
+import de.keyboardsurfer.android.widget.crouton.*;
public class PageActivity extends ActionBarActivity {
public static final String ACTION_PAGE_FOR_TITLE =
"org.wikipedia.page_for_title";
@@ -153,17 +154,32 @@
if (pausedStateOfZero && !latestWikipediaZeroDisposition) {
String verbiage = getString(R.string.zero_charged_verbiage);
- Toast.makeText(app, verbiage, Toast.LENGTH_LONG).show();
+ makeWikipediaZeroCrouton(R.color.holo_red_dark,
android.R.color.white, verbiage);
showDialogAboutZero(ZERO_OFF_NOTICE_PRESENTED, verbiage);
} else if ((!pausedStateOfZero ||
!pausedXcsOfZero.equals(WikipediaApp.getXcs())) &&
latestWikipediaZeroDisposition) {
String verbiage = WikipediaApp.getCarrierMessage();
- Toast.makeText(app, verbiage, Toast.LENGTH_LONG).show();
+ makeWikipediaZeroCrouton(R.color.holo_green_light,
android.R.color.black, verbiage);
showDialogAboutZero(ZERO_ON_NOTICE_PRESENTED, verbiage);
}
pausedStateOfZero = latestWikipediaZeroDisposition;
pausedXcsOfZero = WikipediaApp.getXcs();
}
+ private void makeWikipediaZeroCrouton(int bgcolor, int fgcolor, String
verbiage) {
+ Style style = new Style.Builder()
+ .setBackgroundColor(bgcolor)
+ .setGravity(Gravity.CENTER)
+ // .setTextAppearance-driven font size is not being honored,
so we'll do it manually
+ // Text size in library is in sp
+ .setTextSize(20)
+ .setTextColor(fgcolor)
+ // Height size in library is in px
+ .setHeight((int) Math.floor(192.0 *
WikipediaApp.SCREEN_DENSITY))
+ .build();
+
+ Crouton.makeText(this, verbiage, style,
R.id.zero_crouton_container).show();
+ }
+
private void showDialogAboutZero(String prefsKey, String verbiage) {
SharedPreferences prefs =
PreferenceManager.getDefaultSharedPreferences(app);
if (!prefs.getBoolean(prefsKey, false)) {
--
To view, visit https://gerrit.wikimedia.org/r/123788
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I459b8dd9bcbd3f0fbf1bbb498845061aa7422031
Gerrit-PatchSet: 7
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt <ab...@wikimedia.org>
Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@gmail.com>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
