Brion VIBBER has submitted this change and it was merged. Change subject: Display version string prominently in the app ......................................................................
Display version string prominently in the app Will be taken out for final release Change-Id: I05ac472bee1412d6ba4dcf22c3c2975a8da459b1 --- M wikipedia/res/layout/fragment_navdrawer.xml M wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java M wikipedia/src/main/java/org/wikipedia/WikipediaApp.java 3 files changed, 29 insertions(+), 6 deletions(-) Approvals: Brion VIBBER: Verified; Looks good to me, approved diff --git a/wikipedia/res/layout/fragment_navdrawer.xml b/wikipedia/res/layout/fragment_navdrawer.xml index 0b8228c..64f9d9e 100644 --- a/wikipedia/res/layout/fragment_navdrawer.xml +++ b/wikipedia/res/layout/fragment_navdrawer.xml @@ -3,11 +3,22 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"; android:layout_width="196dp" android:layout_height="match_parent" - android:orientation="vertical" > - <!-- Match marginTop with height of Search Fragment --> - <ListView android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="48dp" - android:id="@+id/nav_list" + android:orientation="vertical" android:background="#111"> + <!-- Match marginTop with height of Search Fragment --> + <ListView android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="1" + android:layout_marginTop="48dp" + android:id="@+id/nav_list"> </ListView> + <org.wikipedia.styledviews.StyledTextView + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:textSize="12sp" + android:textColor="#777" + android:padding="4dp" + android:id="@+id/nav_drawer_version" + android:gravity="right" + /> </LinearLayout> \ No newline at end of file diff --git a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java index 898dc2e..0672b35 100644 --- a/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java +++ b/wikipedia/src/main/java/org/wikipedia/NavDrawerFragment.java @@ -59,6 +59,8 @@ adapter = new NavListAdapter(); app = (WikipediaApp)getActivity().getApplicationContext(); + ((TextView)getView().findViewById(R.id.nav_drawer_version)).setText(WikipediaApp.APP_VERSION_STRING); + navList.setAdapter(adapter); navList.setOnItemClickListener(this); @@ -98,7 +100,7 @@ intent.setAction(Intent.ACTION_SENDTO); // Will be moved to a better email address at some point // FIXME: Have build info here, perhaps? We can't access it anywhere yet - intent.setData(Uri.parse("mailto:yuvipa...@wikimedia.org?subject=Android App Feedback")); + intent.setData(Uri.parse("mailto:yuvipa...@wikimedia.org?subject=Android App " + WikipediaApp.APP_VERSION_STRING + " Feedback")); startActivity(intent); break; default: diff --git a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java index b56ed7a..a6d4689 100644 --- a/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java +++ b/wikipedia/src/main/java/org/wikipedia/WikipediaApp.java @@ -2,6 +2,7 @@ import android.app.*; import android.content.*; +import android.content.pm.*; import android.graphics.*; import android.net.*; import android.os.*; @@ -49,6 +50,8 @@ // Reload in onCreate to override public static String PROTOCOL = "https"; + public static String APP_VERSION_STRING; + private ConnectionChangeReceiver connChangeReceiver; @Override @@ -86,6 +89,13 @@ this.registerReceiver(connChangeReceiver, connFilter); } + try { + APP_VERSION_STRING = getPackageManager().getPackageInfo(getPackageName(), 0).versionName; + } catch (PackageManager.NameNotFoundException e) { + // This will never happen! + throw new RuntimeException(e); + } + } public Bus getBus() { -- To view, visit https://gerrit.wikimedia.org/r/118359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I05ac472bee1412d6ba4dcf22c3c2975a8da459b1 Gerrit-PatchSet: 1 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
