Fixes commons-app#2843 New main screen UI in v3.0 (commons-app#3891)

* Add additional classes from 2019 hackathon implementation

* Make first tab work

* Make explore tab work

* Handle back button for contrib and nearby

* Fix framelayout and nav bar allignment

* Fix nav bar tint

* Fix nearby card layout

* Make contributions number visible

* Change menu icon according to fragment

* Make notification icon work and remove drawer

* Make favourites accessible from nav bar

* Turn bookmark and explore activities into fragments

* Use bottom sheet instead of more fragment

* Add actions

* Remove unused classes

* Fix indentation

* remove more fragment title

* Fix explore fragment indentation

* Make toolbar settings as we wanted

* Set card view styles

* Make colors for explore actiivty

* Remove drawer from achievements activity

* Add back button to achievements activity

* remove drawer from review activity

* Remove drawer from settings activity

* Remove drawer from about activity

* Fix dagger injection of fragment

* Implement skip login version

* Add theme missing colors

* Add style to moresheet

* refactor name

* call login with button

* Remove all old bookmarks activity dependency

* Make explore tab items clickable

* Do nothing if same tab is selected

* Fix notification icon color for dark theme

* Fix wrong drawable colors

* Handle back button after media details is visible from contrib and explore fragments

* make favourites open media details

* Fix profile icon

* Make user name visible instead

* Move user back to contrib fragment

* Remove NavigationBaseAvticity

* Fix typo in bookmark fragment

* Fix menu button colors

* Remove explore activity

* remove drawer and dependencies

* Make bookmark media details visible

* Cleanup code

* Code cleanup

* Remove unused layout

* Make contriblist UI look like in mockups

* Change limited connecton toggle

* Move list menu item to nearby fragment

* Fix search button crash

* Make media detail appear

* Back button added

* Fix back button npe

* Change bookmark list view

* Fix always the firs item displayed issue

* Allign contrib list bottom line to simple drawee bottom

* fix fragment string

* Fix back button for mobile uploads

* Make lists appear

* Make fav item selected

* Make favourites clickable

* Add back button to media details

* Add toolbar of notification activity

* Change contributions icon

* Fix card UI

* Fix back button in explore

* Make card views look similar to mockups

* Solve campaign bug visible issue

* Make borders a little softer

Author: neslihanturan

app/src/androidTest/java/fr/free/nrw/commons/ExploreActivityTest.kt

@@ -124,12 +124,6 @@
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.MainActivity" />
 
-        <activity
-            android:name=".explore.ExploreActivity"
-            android:label="@string/title_activity_explore"
-            android:parentActivityName=".contributions.MainActivity"
-            android:configChanges="orientation|screenSize|keyboard" />
-
         <activity
             android:name=".explore.SearchActivity"
             android:label="@string/title_activity_search"
@@ -143,10 +137,6 @@
             android:configChanges="orientation|screenSize|keyboard"
             android:label="@string/Profile" />
 
-        <activity
-            android:name=".bookmarks.BookmarksActivity"
-            android:label="@string/title_activity_bookmarks" />
-
         <activity
             android:name=".review.ReviewActivity"
             android:label="@string/title_activity_review" />

app/src/main/AndroidManifest.xml

@@ -5,8 +5,6 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.text.SpannableString;
-import android.text.style.UnderlineSpan;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -17,22 +15,21 @@
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import java.lang.ref.SoftReference;
+import androidx.appcompat.widget.Toolbar;
+import fr.free.nrw.commons.theme.BaseActivity;
 import java.util.Collections;
 import java.util.List;
-import org.wikipedia.util.StringUtil;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
-import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.ui.widget.HtmlTextView;
 import fr.free.nrw.commons.utils.ConfigUtils;
 
 /**
  * Represents about screen of this app
  */
-public class AboutActivity extends NavigationBaseActivity {
+public class AboutActivity extends BaseActivity {
     @BindView(R.id.about_version) TextView versionText;
     @BindView(R.id.about_license) HtmlTextView aboutLicenseText;
     @BindView(R.id.about_faq) TextView faqText;
@@ -41,6 +38,7 @@ public class AboutActivity extends NavigationBaseActivity {
     @BindView(R.id.about_privacy_policy) TextView privacyPolicyText;
     @BindView(R.id.about_translate) TextView translateText;
     @BindView(R.id.about_credits) TextView creditsText;
+    @BindView(R.id.toolbar) Toolbar toolbar;
     /**
      * This method helps in the creation About screen
      *
@@ -53,7 +51,8 @@ public void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_about);
 
         ButterKnife.bind(this);
-
+        setSupportActionBar(toolbar);
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         String aboutText = getString(R.string.about_license);
         aboutLicenseText.setHtmlText(aboutText);
 
@@ -68,8 +67,12 @@ public void onCreate(Bundle savedInstanceState) {
         Utils.setUnderlinedText(privacyPolicyText, R.string.about_privacy_policy, getApplicationContext());
         Utils.setUnderlinedText(translateText, R.string.about_translate, getApplicationContext());
         Utils.setUnderlinedText(creditsText, R.string.about_credits, getApplicationContext());
+    }
 
-        initDrawer();
+    @Override
+    public boolean onSupportNavigateUp() {
+        onBackPressed();
+        return true;
     }
 
     @OnClick(R.id.facebook_launch_icon)

app/src/main/java/fr/free/nrw/commons/AboutActivity.java

@@ -29,6 +29,7 @@
 
 import com.google.android.material.textfield.TextInputLayout;
 
+import fr.free.nrw.commons.utils.ActivityUtils;
 import org.wikipedia.AppAdapter;
 import org.wikipedia.dataclient.ServiceFactory;
 import org.wikipedia.dataclient.WikiSite;
@@ -51,9 +52,7 @@
 import fr.free.nrw.commons.WelcomeActivity;
 import fr.free.nrw.commons.contributions.MainActivity;
 import fr.free.nrw.commons.di.ApplicationlessInjection;
-import fr.free.nrw.commons.explore.ExploreActivity;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
-import fr.free.nrw.commons.theme.NavigationBaseActivity;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import fr.free.nrw.commons.utils.SystemThemeUtils;
 import fr.free.nrw.commons.utils.ViewUtil;
@@ -318,7 +317,7 @@ private void showPasswordResetPrompt() {
      */
     private void performSkipLogin() {
         applicationKvStore.putBoolean("login_skipped", true);
-        ExploreActivity.startYourself(this);
+        MainActivity.startYourself(this);
         finish();
     }
 
@@ -412,7 +411,7 @@ public void showSuccessAndDismissDialog() {
     }
 
     public void startMainActivity() {
-        NavigationBaseActivity.startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP);
+        ActivityUtils.startActivityWithFlags(this, MainActivity.class, Intent.FLAG_ACTIVITY_SINGLE_TOP);
         finish();
     }
 

app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java

@@ -0,0 +1,80 @@
+package fr.free.nrw.commons.bookmarks;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.AdapterView;
+
+import android.widget.FrameLayout;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+
+import fr.free.nrw.commons.contributions.MainActivity;
+import fr.free.nrw.commons.di.CommonsDaggerSupportFragment;
+import fr.free.nrw.commons.theme.BaseActivity;
+import javax.inject.Inject;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import fr.free.nrw.commons.Media;
+import fr.free.nrw.commons.R;
+import fr.free.nrw.commons.category.CategoryImagesCallback;
+import fr.free.nrw.commons.contributions.ContributionController;
+import fr.free.nrw.commons.media.MediaDetailPagerFragment;
+
+public class BookmarkFragment extends CommonsDaggerSupportFragment {
+
+  private FragmentManager supportFragmentManager;
+  private BookmarksPagerAdapter adapter;
+  @BindView(R.id.viewPagerBookmarks)
+  ViewPager viewPager;
+  @BindView(R.id.tab_layout)
+  TabLayout tabLayout;
+  @BindView(R.id.fragmentContainer)
+  FrameLayout fragmentContainer;
+
+  @Inject
+  ContributionController controller;
+
+  @NonNull
+  public static BookmarkFragment newInstance() {
+    BookmarkFragment fragment = new BookmarkFragment();
+    fragment.setRetainInstance(true);
+    return fragment;
+  }
+
+  @Override
+  public void onCreate(@Nullable final Bundle savedInstanceState) {
+    super.onCreate(savedInstanceState);
+  }
+
+  @Nullable
+  @Override
+  public View onCreateView(@NonNull final LayoutInflater inflater,
+      @Nullable final ViewGroup container,
+      @Nullable final Bundle savedInstanceState) {
+    super.onCreateView(inflater, container, savedInstanceState);
+    View view = inflater.inflate(R.layout.fragment_bookmarks, container, false);
+    ButterKnife.bind(this, view);
+
+    // Activity can call methods in the fragment by acquiring a
+    // reference to the Fragment from FragmentManager, using findFragmentById()
+    supportFragmentManager = getChildFragmentManager();
+
+    adapter = new BookmarksPagerAdapter(supportFragmentManager, getContext());
+    viewPager.setAdapter(adapter);
+    tabLayout.setupWithViewPager(viewPager);
+    return view;
+  }
+
+  public void onBackPressed() {
+    ((BookmarkListRootFragment) (adapter.getItem(tabLayout.getSelectedTabPosition())))
+        .backPressed();
+    ((BaseActivity)getActivity()).getSupportActionBar().setDisplayHomeAsUpEnabled(false);
+  }
+}