From dbd1ad2ff178ea16becff886d2120881a5313d63 Mon Sep 17 00:00:00 2001
From: neslihanturan <tur.neslihan@gmail.com>
Date: Sat, 24 Aug 2019 10:56:01 +0300
Subject: [PATCH] Add base codes for testing mapbox activity in a single
 fragment inside activity

---
 app/src/main/AndroidManifest.xml                         | 7 ++++++-
 .../fr/free/nrw/commons/di/ActivityBuilderModule.java    | 4 ++++
 .../fr/free/nrw/commons/nearby/NearbyTestFragment.java   | 6 ++++++
 .../free/nrw/commons/theme/NavigationBaseActivity.java   | 9 ++++++++-
 app/src/main/res/menu/drawer.xml                         | 4 ++++
 app/src/main/res/values/strings.xml                      | 4 +++-
 6 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestFragment.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 03041e703..3843471aa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -140,7 +140,12 @@
 
         <activity
             android:name=".nearby.NearbyTestActivity"
-            android:label="@string/title_activity_nearbytest" />
+            android:label="@string/title_activity_nearby_test_activity" />
+
+        <activity
+            android:name=".nearby.NearbyTestFragment"
+            android:label="@string/title_activity_nearby_test_fragment" />
+
 
         <service android:name=".upload.UploadService" />
         <service
diff --git a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
index 91ee9fb41..c8de627c9 100644
--- a/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
+++ b/app/src/main/java/fr/free/nrw/commons/di/ActivityBuilderModule.java
@@ -15,6 +15,7 @@ import fr.free.nrw.commons.explore.SearchActivity;
 
 import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.nearby.NearbyTestActivity;
+import fr.free.nrw.commons.nearby.NearbyTestFragment;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.review.ReviewActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
@@ -71,4 +72,7 @@ public abstract class ActivityBuilderModule {
 
     @ContributesAndroidInjector
     abstract NearbyTestActivity bindNearbyTestActivity();
+
+    @ContributesAndroidInjector
+    abstract NearbyTestFragment bindNearbyTestFragment();
 }
diff --git a/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestFragment.java b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestFragment.java
new file mode 100644
index 000000000..afc3869a9
--- /dev/null
+++ b/app/src/main/java/fr/free/nrw/commons/nearby/NearbyTestFragment.java
@@ -0,0 +1,6 @@
+package fr.free.nrw.commons.nearby;
+
+import fr.free.nrw.commons.theme.NavigationBaseActivity;
+
+public class NearbyTestFragment extends NavigationBaseActivity {
+}
diff --git a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
index 3755e6a1f..a99e24553 100644
--- a/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
+++ b/app/src/main/java/fr/free/nrw/commons/theme/NavigationBaseActivity.java
@@ -40,6 +40,7 @@ import fr.free.nrw.commons.explore.categories.ExploreActivity;
 import fr.free.nrw.commons.kvstore.JsonKvStore;
 import fr.free.nrw.commons.logging.CommonsLogSender;
 import fr.free.nrw.commons.nearby.NearbyTestActivity;
+import fr.free.nrw.commons.nearby.NearbyTestFragment;
 import fr.free.nrw.commons.notification.NotificationActivity;
 import fr.free.nrw.commons.review.ReviewActivity;
 import fr.free.nrw.commons.settings.SettingsActivity;
@@ -182,7 +183,13 @@ public abstract class NavigationBaseActivity extends BaseActivity
             case R.id.action_nearby_test_activity:
                 drawerLayout.closeDrawer(navigationView);
                 startActivityWithFlags(this, NearbyTestActivity.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
-                        Intent.FLAG_ACTIVITY_SINGLE_TOP);                return true;
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                return true;
+            case R.id.action_nearby_test_fragment:
+                drawerLayout.closeDrawer(navigationView);
+                startActivityWithFlags(this, NearbyTestFragment.class, Intent.FLAG_ACTIVITY_REORDER_TO_FRONT,
+                        Intent.FLAG_ACTIVITY_SINGLE_TOP);
+                return true;
             case R.id.action_feedback:
                 drawerLayout.closeDrawer(navigationView);
 
diff --git a/app/src/main/res/menu/drawer.xml b/app/src/main/res/menu/drawer.xml
index 2d33f6064..3ac225c0e 100644
--- a/app/src/main/res/menu/drawer.xml
+++ b/app/src/main/res/menu/drawer.xml
@@ -55,6 +55,10 @@
             android:icon="@drawable/ic_help_black_24dp"
             android:title="@string/navigation_item_nearby_test_activity" />
 
+        <item
+            android:id="@+id/action_nearby_test_fragment"
+            android:icon="@drawable/ic_help_black_24dp"
+            android:title="@string/navigation_item_nearby_test_fragment" />
 
     </group>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d58b949fc..fc303d066 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -89,7 +89,8 @@
   <string name="title_activity_featured_images">Featured Images</string>
   <string name="title_activity_category_details">Category</string>
   <string name="title_activity_review">Peer Review</string>
-  <string name="title_activity_nearbytest">Nearby Test</string>
+  <string name="title_activity_nearby_test_activity">Nearby Test Activity</string>
+  <string name="title_activity_nearby_test_fragment">Nearby Test Fragment</string>
   <string name="menu_about">About</string>
   <string name="about_license">The Wikimedia Commons app is an open-source app created and maintained by grantees and volunteers of the Wikimedia community. The Wikimedia Foundation is not involved in the creation, development, or maintenance of the app. </string>
   <string name="trademarked_name" translatable="false">Wikimedia Commons</string>
@@ -235,6 +236,7 @@
   <string name="navigation_item_featured_images">Featured</string>
   <string name="navigation_item_review">Review</string>
   <string name="navigation_item_nearby_test_activity">Nearby Test Activity</string>
+  <string name="navigation_item_nearby_test_fragment">Nearby Test Fragment</string>
   <string name="nearby_needs_permissions">Nearby places cannot be displayed without location permissions</string>
   <string name="no_description_found">no description found</string>
   <string name="nearby_info_menu_commons_article">Commons file page</string>