[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Create embryo description editing activity.
jenkins-bot has submitted this change and it was merged.
Change subject: Create embryo description editing activity.
..
Create embryo description editing activity.
This makes article descriptions clickable (by adding a ClickableSpan to
the relevant text portion).
This also creates a blank activity that will be the container for the
description editing workflow. The activity is not entirely blank: it
accepts a PageTitle parameter, which feeds it with the requested page
title, which will contain its current description.
Bug: T146639
Bug: T146640
Change-Id: Iaa62a901d93376cf743bfd933db0b6ea47be658c
---
M app/src/main/AndroidManifest.xml
M
app/src/main/java/org/wikipedia/activity/SingleFragmentActivityWithToolbar.java
A app/src/main/java/org/wikipedia/descriptions/DescriptionEditActivity.java
A app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A app/src/main/res/layout/fragment_description_edit.xml
M app/src/main/res/layout/view_article_header.xml
8 files changed, 174 insertions(+), 4 deletions(-)
Approvals:
jenkins-bot: Verified
Niedzielski: Looks good to me, approved
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8c2830c..bf97417 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -156,6 +156,10 @@
android:theme="@style/PageTheme"
android:exported="false"/>
+
+
{
+private static final String EXTRA_TITLE = "title";
+
+public static Intent newIntent(@NonNull Context context, @NonNull
PageTitle title) {
+return new Intent(context, DescriptionEditActivity.class)
+.putExtra(EXTRA_TITLE, GsonMarshaller.marshal(title));
+}
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+setWordmarkVisible(false);
+if (getSupportActionBar() != null) {
+getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+}
+}
+
+@Override
+public DescriptionEditFragment createFragment() {
+return
DescriptionEditFragment.newInstance(GsonUnmarshaller.unmarshal(PageTitle.class,
getIntent().getStringExtra(EXTRA_TITLE)));
+}
+}
\ No newline at end of file
diff --git
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
new file mode 100644
index 000..711e7f0
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -0,0 +1,56 @@
+package org.wikipedia.descriptions;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.wikipedia.R;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.GsonUnmarshaller;
+import org.wikipedia.page.PageTitle;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+public class DescriptionEditFragment extends Fragment {
+private static final String EXTRA_TITLE = "title";
+
+@BindView(R.id.description_edit_page_title) TextView pageTitleText;
+private Unbinder unbinder;
+
+private PageTitle pageTitle;
+
+@NonNull
+public static DescriptionEditFragment newInstance(@NonNull PageTitle
title) {
+DescriptionEditFragment instance = new DescriptionEditFragment();
+Bundle args = new Bundle();
+args.putString(EXTRA_TITLE, GsonMarshaller.marshal(title));
+instance.setArguments(args);
+return instance;
+}
+
+@Nullable
+@Override
+public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+super.onCreateView(inflater, container, savedInstanceState);
+View view = inflater.inflate(R.layout.fragment_description_edit,
container, false);
+unbinder = ButterKnife.bind(this, view);
+
+pageTitle = GsonUnmarshaller.unmarshal(PageTitle.class,
getActivity().getIntent().getStringExtra(EXTRA_TITLE));
+
+pageTitleText.setText(pageTitle.getDisplayText());
+return view;
+}
+
+@Override public void onDestroyView() {
+unbinder.unbind();
+unbinder = null;
+super.onDestroyView();
+}
+}
diff --git
a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
b/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
index c5b9019..29b15b9 100644
--- a/app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
+++
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Create embryo description editing activity.
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/318114
Change subject: Create embryo description editing activity.
..
Create embryo description editing activity.
This makes article descriptions clickable (by adding a ClickableSpan to
the relevant text portion).
This also creates a blank activity that will be the container for the
description editing workflow. The activity is not entirely blank: it
accepts a PageTitle parameter, which feeds it with the requested page
title, which will contain its current description.
Bug: T146639
Bug: T146640
Change-Id: Iaa62a901d93376cf743bfd933db0b6ea47be658c
---
M app/src/main/AndroidManifest.xml
M
app/src/main/java/org/wikipedia/activity/SingleFragmentActivityWithToolbar.java
A app/src/main/java/org/wikipedia/descriptions/DescriptionEditActivity.java
A app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
M app/src/main/java/org/wikipedia/page/leadimages/ArticleHeaderView.java
M app/src/main/java/org/wikipedia/page/leadimages/LeadImagesHandler.java
A app/src/main/res/layout/fragment_description_edit.xml
M app/src/main/res/layout/view_article_header.xml
8 files changed, 179 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/14/318114/1
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 8c2830c..bf97417 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -156,6 +156,10 @@
android:theme="@style/PageTheme"
android:exported="false"/>
+
+
{
+protected static final String EXTRA_TITLE = "title";
+
+@Override
+public void onCreate(Bundle savedInstanceState) {
+super.onCreate(savedInstanceState);
+setWordmarkVisible(false);
+}
+
+public static Intent newIntent(@NonNull Context context, @NonNull
PageTitle title) {
+return new Intent(context, DescriptionEditActivity.class)
+.putExtra(EXTRA_TITLE, GsonMarshaller.marshal(title));
+}
+
+@Override
+public DescriptionEditFragment createFragment() {
+return
DescriptionEditFragment.newInstance(GsonUnmarshaller.unmarshal(PageTitle.class,
getIntent().getStringExtra(EXTRA_TITLE)));
+}
+}
\ No newline at end of file
diff --git
a/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
new file mode 100644
index 000..2df472e
--- /dev/null
+++ b/app/src/main/java/org/wikipedia/descriptions/DescriptionEditFragment.java
@@ -0,0 +1,64 @@
+package org.wikipedia.descriptions;
+
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AppCompatActivity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import org.wikipedia.R;
+import org.wikipedia.json.GsonMarshaller;
+import org.wikipedia.json.GsonUnmarshaller;
+import org.wikipedia.page.PageTitle;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+
+import static org.wikipedia.descriptions.DescriptionEditActivity.EXTRA_TITLE;
+
+public class DescriptionEditFragment extends Fragment {
+@BindView(R.id.description_edit_page_title) TextView pageTitleText;
+private Unbinder unbinder;
+
+private PageTitle pageTitle;
+
+@NonNull
+public static DescriptionEditFragment newInstance(@NonNull PageTitle
title) {
+DescriptionEditFragment instance = new DescriptionEditFragment();
+Bundle args = new Bundle();
+args.putString(EXTRA_TITLE, GsonMarshaller.marshal(title));
+instance.setArguments(args);
+return instance;
+}
+
+@Nullable
+@Override
+public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
+super.onCreateView(inflater, container, savedInstanceState);
+View view = inflater.inflate(R.layout.fragment_description_edit,
container, false);
+unbinder = ButterKnife.bind(this, view);
+
+
getAppCompatActivity().getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+getAppCompatActivity().getSupportActionBar().setTitle("");
+
+pageTitle = GsonUnmarshaller.unmarshal(PageTitle.class,
getActivity().getIntent().getStringExtra(EXTRA_TITLE));
+
+pageTitleText.setText(pageTitle.getDisplayText());
+return view;
+}
+
+@Override public void onDestroyView() {
+unbinder.unbind();
+unbinder = null;
+super.onDestroyView();
+}
+
+private AppCompatActivity getAppCompatActivity() {
+return (AppCompatActivity) getActivity();
+}
+}
diff --git
