[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adapt Offline Library screen for sideloading.

2017-11-01 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387812 )

Change subject: Adapt Offline Library screen for sideloading.
..


Adapt Offline Library screen for sideloading.

Bug: T179067
Change-Id: I20f1001fa24e834bc0319fb7194c7782bd6f3070
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
A app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
M app/src/main/res/values/styles.xml
6 files changed, 109 insertions(+), 31 deletions(-)

Approvals:
  jenkins-bot: Verified
  Cooltey: Looks good to me, approved



diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index cc739d5..09ac863 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -11,6 +11,7 @@
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SimpleItemAnimator;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -20,9 +21,14 @@
 
 import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
+import org.wikipedia.page.LinkMovementMethodExt;
+import org.wikipedia.richtext.RichTextUtil;
+import org.wikipedia.settings.SettingsActivity;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.ShareUtil;
+import org.wikipedia.util.StringUtil;
+import org.wikipedia.util.UriUtil;
 import org.wikipedia.views.DefaultViewHolder;
 import org.wikipedia.views.DrawableItemDecoration;
 import org.wikipedia.views.PageItemView;
@@ -49,6 +55,9 @@
 @BindView(R.id.disk_usage_view) DiskUsageView diskUsageView;
 @BindView(R.id.compilation_search_error) WikiErrorView errorView;
 @BindView(R.id.compilation_empty_container) View emptyContainer;
+@BindView(R.id.compilation_empty_description) TextView emptyDescription;
+@BindView(R.id.compilation_packs_hint) TextView packsHint;
+@BindView(R.id.compilation_data_usage_hint) TextView dataUsageHint;
 private Unbinder unbinder;
 
 private boolean updating;
@@ -87,6 +96,22 @@
 }
 });
 
+emptyDescription.setMovementMethod(LinkMovementMethod.getInstance());
+
emptyDescription.setText(StringUtil.fromHtml(getString(R.string.offline_library_empty_description_sideload)));
+RichTextUtil.removeUnderlinesFromLinks(emptyDescription);
+packsHint.setMovementMethod(LinkMovementMethod.getInstance());
+
packsHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_packs_hint)));
+RichTextUtil.removeUnderlinesFromLinks(packsHint);
+dataUsageHint.setMovementMethod(new LinkMovementMethodExt(new 
LinkMovementMethodExt.UrlHandler() {
+@Override
+public void onUrlClick(@NonNull String url, @Nullable String 
titleString) {
+if (url.equals(UriUtil.LOCAL_URL_SETTINGS)) {
+startActivity(SettingsActivity.newIntent(getContext()));
+}
+}
+}));
+
dataUsageHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_data_usage_hint)));
+RichTextUtil.removeUnderlinesFromLinks(dataUsageHint);
 return view;
 }
 
diff --git a/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml 
b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
new file mode 100644
index 000..ec59c7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
@@ -0,0 +1,12 @@
+http://schemas.android.com/apk/res/android";>
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml 
b/app/src/main/res/layout/fragment_local_compilations.xml
index 6cf9f0b..304f59a 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -33,45 +33,77 @@
 android:layout_height="wrap_content"
 android:layout_gravity="center"/>
 
-
+android:orientation="vertical">
 
-
+android:layout_margin="8dp"
+app:cardBackgroundColor="?attr/paper_color">
 
-
+android:orientation="vertical">
 
-
+
 
-
+
 
-
+
+
 
-
+
+
+
+
+

[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Adapt Offline Library screen for sideloading.

2017-11-01 Thread Dbrant (Code Review) 
Dbrant has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/387812 )

Change subject: Adapt Offline Library screen for sideloading.
..

Adapt Offline Library screen for sideloading.

Bug: T179067
Change-Id: I20f1001fa24e834bc0319fb7194c7782bd6f3070
---
M app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
A app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
M app/src/main/res/layout/fragment_local_compilations.xml
M app/src/main/res/values-qq/strings.xml
M app/src/main/res/values/strings.xml
5 files changed, 109 insertions(+), 31 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia 
refs/changes/12/387812/1

diff --git 
a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java 
b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
index cc739d5..09ac863 100644
--- a/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
+++ b/app/src/main/java/org/wikipedia/offline/LocalCompilationsFragment.java
@@ -11,6 +11,7 @@
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.SimpleItemAnimator;
+import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -20,9 +21,14 @@
 
 import org.wikipedia.R;
 import org.wikipedia.activity.FragmentUtil;
+import org.wikipedia.page.LinkMovementMethodExt;
+import org.wikipedia.richtext.RichTextUtil;
+import org.wikipedia.settings.SettingsActivity;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.ResourceUtil;
 import org.wikipedia.util.ShareUtil;
+import org.wikipedia.util.StringUtil;
+import org.wikipedia.util.UriUtil;
 import org.wikipedia.views.DefaultViewHolder;
 import org.wikipedia.views.DrawableItemDecoration;
 import org.wikipedia.views.PageItemView;
@@ -49,6 +55,9 @@
 @BindView(R.id.disk_usage_view) DiskUsageView diskUsageView;
 @BindView(R.id.compilation_search_error) WikiErrorView errorView;
 @BindView(R.id.compilation_empty_container) View emptyContainer;
+@BindView(R.id.compilation_empty_description) TextView emptyDescription;
+@BindView(R.id.compilation_packs_hint) TextView packsHint;
+@BindView(R.id.compilation_data_usage_hint) TextView dataUsageHint;
 private Unbinder unbinder;
 
 private boolean updating;
@@ -87,6 +96,22 @@
 }
 });
 
+emptyDescription.setMovementMethod(LinkMovementMethod.getInstance());
+
emptyDescription.setText(StringUtil.fromHtml(getString(R.string.offline_library_empty_description_sideload)));
+RichTextUtil.removeUnderlinesFromLinks(emptyDescription);
+packsHint.setMovementMethod(LinkMovementMethod.getInstance());
+
packsHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_packs_hint)));
+RichTextUtil.removeUnderlinesFromLinks(packsHint);
+dataUsageHint.setMovementMethod(new LinkMovementMethodExt(new 
LinkMovementMethodExt.UrlHandler() {
+@Override
+public void onUrlClick(@NonNull String url, @Nullable String 
titleString) {
+if (url.equals(UriUtil.LOCAL_URL_SETTINGS)) {
+startActivity(SettingsActivity.newIntent(getContext()));
+}
+}
+}));
+
dataUsageHint.setText(StringUtil.fromHtml(getString(R.string.offline_library_data_usage_hint)));
+RichTextUtil.removeUnderlinesFromLinks(dataUsageHint);
 return view;
 }
 
diff --git a/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml 
b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
new file mode 100644
index 000..ec59c7b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_empty_sideloading_offlinelibrary.xml
@@ -0,0 +1,12 @@
+http://schemas.android.com/apk/res/android";>
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_local_compilations.xml 
b/app/src/main/res/layout/fragment_local_compilations.xml
index 6cf9f0b..972424a 100644
--- a/app/src/main/res/layout/fragment_local_compilations.xml
+++ b/app/src/main/res/layout/fragment_local_compilations.xml
@@ -33,45 +33,77 @@
 android:layout_height="wrap_content"
 android:layout_gravity="center"/>
 
-
+android:orientation="vertical">
 
-
+android:layout_margin="8dp"
+app:cardBackgroundColor="?attr/paper_color">
 
-
+android:orientation="vertical">
 
-
+
 
-
+
 
-
+
+
 
-
+
+
+
+
+
+
+