Merge pull request #720 from wikimedia/revert-692-revert-644-se_fragment

Rework "Updated UI for Suggested Edits screen"
wikimedia · Oct 25, 2019 · bcc66e9 · bcc66e9
2 parents ade4978 + 218a8dc
commit bcc66e9
Show file tree

Hide file tree

Showing 39 changed files with 822 additions and 1,020 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -243,11 +243,6 @@
 
         <activity android:name=".onboarding.SuggestedEditsOnboardingActivity" />
 
-        <activity
-            android:name=".suggestededits.SuggestedEditsContributionsActivity"
-            android:label="@string/suggested_edits_my_contributions"
-            android:theme="@style/AppTheme.ActionBar" />
-
         <provider
             android:authorities="${applicationId}"
             android:name=".database.AppContentProvider"

diff --git a/app/src/main/java/org/wikipedia/dataclient/Service.java b/app/src/main/java/org/wikipedia/dataclient/Service.java
@@ -289,10 +289,10 @@ public interface Service {
                                        @Nullable @Field("captchaid") String captchaId,
                                        @Nullable @Field("captchaword") String captchaWord);
 
-    @GET(MW_API_PREFIX + "action=query&format=json&list=usercontribs&formatversion=latest&ucprop=title")
-    @NonNull Observable<MwQueryResponse> getUserContributedPages(@NonNull @Query("ucuser") String username);
+    @GET(MW_API_PREFIX + "action=query&list=usercontribs")
+    @NonNull Observable<MwQueryResponse> getUserContributions(@NonNull @Query("ucuser") String username);
 
-    @GET(MW_API_PREFIX + "action=query&format=json&prop=pageviews&formatversion=latest")
+    @GET(MW_API_PREFIX + "action=query&prop=pageviews")
     @NonNull Observable<MwQueryResponse> getPageViewsForTitles(@NonNull @Query("titles") String titles);
 
     @GET(MW_API_PREFIX + "action=query&meta=wikimediaeditortaskscounts|userinfo")

diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryPage.java
@@ -39,7 +39,7 @@ public class MwQueryPage extends BaseModel {
     @Nullable private String convertedFrom;
     @Nullable private String convertedTo;
     @Nullable private Map<String, String> varianttitles;
-    @SerializedName("pageviews") @Nullable private Map<String, String> pageViewsMap;
+    @SerializedName("pageviews") @Nullable private Map<String, Long> pageViewsMap;
 
     @NonNull public String title() {
         return StringUtils.defaultString(title);
@@ -139,8 +139,8 @@ public void appendTitleFragment(@Nullable String fragment) {
         return varianttitles != null ? StringUtils.defaultIfEmpty(varianttitles.get(langCode), title()) : title();
     }
 
-    @Nullable public Map<String, String> getPageViewsMap() {
-        return pageViewsMap;
+    @NonNull public Map<String, Long> getPageViewsMap() {
+        return pageViewsMap != null ? pageViewsMap : Collections.emptyMap();
     }
 
     public static class Revision {

diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java b/app/src/main/java/org/wikipedia/dataclient/mwapi/MwQueryResult.java
@@ -16,6 +16,7 @@
 import org.wikipedia.settings.SiteInfo;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -145,8 +146,8 @@ public class MwQueryResult extends BaseModel implements PostProcessingTypeAdapte
         return editorTaskCounts;
     }
 
-    @Nullable public List<UserContributions> userContributions() {
-        return userContributions;
+    @NonNull public List<UserContributions> userContributions() {
+        return userContributions != null ? userContributions : Collections.emptyList();
     }
 
     @Override

diff --git a/app/src/main/java/org/wikipedia/dataclient/mwapi/UserContributions.kt b/app/src/main/java/org/wikipedia/dataclient/mwapi/UserContributions.kt
@@ -1,11 +1,8 @@
 package org.wikipedia.dataclient.mwapi
 
-import com.google.gson.annotations.SerializedName
-
 class UserContributions {
-    @SerializedName("user")
-    var user: String? = null
-
-    @SerializedName("title")
-    var title: String? = null
+    val user: String = ""
+    val title: String = ""
+    val timestamp: String = ""
+    val comment: String = ""
 }
diff --git a/app/src/main/java/org/wikipedia/main/MainActivity.java b/app/src/main/java/org/wikipedia/main/MainActivity.java
@@ -35,6 +35,7 @@
 import org.wikipedia.settings.AboutActivity;
 import org.wikipedia.settings.Prefs;
 import org.wikipedia.settings.SettingsActivity;
+import org.wikipedia.suggestededits.SuggestedEditsTasksFragment;
 import org.wikipedia.util.AnimationUtil;
 import org.wikipedia.util.DimenUtil;
 import org.wikipedia.util.FeedbackUtil;
@@ -60,7 +61,6 @@ public class MainActivity extends SingleFragmentActivity<MainFragment>
     @BindView(R.id.hamburger_and_wordmark_layout) View hamburgerAndWordmarkLayout;
 
     private boolean controlNavTabInFragment;
-    private NavTab currentTab;
 
     public static Intent newIntent(@NonNull Context context) {
         return new Intent(context, MainActivity.class);
@@ -126,8 +126,9 @@ public boolean onCreateOptionsMenu(Menu menu) {
 
     @Override
     public boolean onPrepareOptionsMenu(Menu menu) {
+        getFragment().requestUpdateToolbarElevation();
         MenuItem tabsItem = menu.findItem(R.id.menu_tabs);
-        if (WikipediaApp.getInstance().getTabCount() < 1 || (currentTab != null && currentTab.equals(NavTab.SUGGESTED_EDITS))) {
+        if (WikipediaApp.getInstance().getTabCount() < 1 || (getFragment().getCurrentFragment() instanceof SuggestedEditsTasksFragment)) {
             tabsItem.setVisible(false);
         } else {
             tabsItem.setVisible(true);
@@ -160,7 +161,6 @@ protected int getLayout() {
 
     @Override
     public void onTabChanged(@NonNull NavTab tab) {
-        currentTab = tab;
         if (tab.equals(NavTab.EXPLORE)) {
             hamburgerAndWordmarkLayout.setVisibility(VISIBLE);
             toolbar.setTitle("");

diff --git a/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt b/app/src/main/java/org/wikipedia/navtab/NavTabLayout.kt
@@ -7,8 +7,10 @@ import android.view.Menu
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import org.wikipedia.R
+
 import org.wikipedia.auth.AccountUtil
 
 class NavTabLayout constructor(context: Context, attrs: AttributeSet) : BottomNavigationView(context, attrs) {
@@ -28,23 +30,21 @@ class NavTabLayout constructor(context: Context, attrs: AttributeSet) : BottomNa
         fixTextStyle()
     }
 
-    fun fixTextStyle() {
-        // Todo: update later https://github.com/material-components/material-components-android/issues/139
+    private fun fixTextStyle() {
         if (childCount > 0) {
             val menuView = getChildAt(0)
             if ((menuView as ViewGroup).childCount > 0) {
-                for (i in 0 until menuView.childCount) {
-                    val menuChildView = menuView.getChildAt(i)
-                    if (menuChildView != null) {
-                        val labelView = menuChildView.findViewById<TextView>(R.id.largeLabel)
-                        labelView.textAlignment = View.TEXT_ALIGNMENT_CENTER
+                for (i in 0..menuView.childCount) {
+                    val menuItemView = menuView.getChildAt(i)
+                    if (menuItemView != null) {
+                        val labelView = menuItemView.findViewById<TextView>(R.id.largeLabel)
                         labelView.setSingleLine(false)
                         labelView.maxLines = 2
                         labelView.ellipsize = TextUtils.TruncateAt.END
+                        labelView.textAlignment = View.TEXT_ALIGNMENT_CENTER
                     }
                 }
             }
         }
     }
-
 }
diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListFragment.java
@@ -155,7 +155,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         recyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
         recyclerView.setAdapter(adapter);
         ((SimpleItemAnimator) recyclerView.getItemAnimator()).setSupportsChangeAnimations(false);
-        recyclerView.addItemDecoration(new DrawableItemDecoration(requireContext(), R.attr.list_separator_drawable, false));
+        recyclerView.addItemDecoration(new DrawableItemDecoration(requireContext(), R.attr.list_separator_drawable, true, false));
 
         headerView = new ReadingListItemView(getContext());
         headerView.setCallback(headerCallback);

diff --git a/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java b/app/src/main/java/org/wikipedia/readinglist/ReadingListsFragment.java
@@ -132,7 +132,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
         searchEmptyView.setEmptyText(R.string.search_reading_lists_no_results);
         readingListView.setLayoutManager(new LinearLayoutManager(getContext()));
         readingListView.setAdapter(adapter);
-        readingListView.addItemDecoration(new DrawableItemDecoration(requireContext(), R.attr.list_separator_drawable, false));
+        readingListView.addItemDecoration(new DrawableItemDecoration(requireContext(), R.attr.list_separator_drawable, true, false));
 
         disposables.add(WikipediaApp.getInstance().getBus().subscribe(new EventBusConsumer()));
         swipeRefreshLayout.setColorSchemeResources(getThemedAttributeId(requireContext(), R.attr.colorAccent));

diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsCardsActivity.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsCardsActivity.kt
@@ -5,16 +5,13 @@ import android.content.Intent
 import android.os.Bundle
 import android.view.Menu
 import android.view.MenuItem
-import androidx.appcompat.app.AlertDialog
 import org.wikipedia.Constants.InvokeSource
 import org.wikipedia.Constants.InvokeSource.*
 import org.wikipedia.R
 import org.wikipedia.activity.SingleFragmentActivity
-import org.wikipedia.analytics.SuggestedEditsFunnel
 import org.wikipedia.suggestededits.SuggestedEditsCardsFragment.Companion.newInstance
 import org.wikipedia.util.FeedbackUtil
 import org.wikipedia.util.ResourceUtil
-import org.wikipedia.views.DialogTitleWithImage
 
 class SuggestedEditsCardsActivity : SingleFragmentActivity<SuggestedEditsCardsFragment>() {
 
@@ -40,10 +37,6 @@ class SuggestedEditsCardsActivity : SingleFragmentActivity<SuggestedEditsCardsFr
                 FeedbackUtil.showAndroidAppEditingFAQ(baseContext)
                 true
             }
-            R.id.menu_my_contributions -> {
-                startActivity(SuggestedEditsContributionsActivity.newIntent(this))
-                true
-            }
             else -> super.onOptionsItemSelected(item)
         }
     }

diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsContributionsActivity.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsContributionsActivity.kt
diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsContributionsFragment.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsContributionsFragment.kt
diff --git a/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsTask.kt b/app/src/main/java/org/wikipedia/suggestededits/SuggestedEditsTask.kt
@@ -1,9 +1,8 @@
 package org.wikipedia.suggestededits
 
-import android.graphics.drawable.Drawable
+import androidx.annotation.DrawableRes
 
 class SuggestedEditsTask {
-
     var title: String? = null
     var description: String? = null
     var disabled: Boolean = false
@@ -12,5 +11,5 @@ class SuggestedEditsTask {
     var unlockActionPositiveButtonString: String? = null
     var unlockActionNegativeButtonString: String? = null
     var unlockMessageText: String? = null
-    var imageDrawable: Drawable? = null
+    @DrawableRes var imageDrawable: Int = 0
 }