commons-app · vanshikaarora · May 21, 2019 · May 28, 2019 · May 28, 2019 · May 28, 2019
diff --git a/app/build.gradle b/app/build.gradle
@@ -43,6 +43,7 @@ dependencies {
     implementation 'com.dinuscxj:circleprogressbar:1.1.1'
     implementation 'com.karumi:dexter:5.0.0'
     implementation "com.jakewharton:butterknife:$BUTTERKNIFE_VERSION"
+
     kapt "com.jakewharton:butterknife-compiler:$BUTTERKNIFE_VERSION"
 
     // Logging
@@ -189,6 +190,7 @@ android {
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns.json\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.wikimedia.org/wikipedia/commons\""
@@ -204,6 +206,7 @@ android {
             buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.contributions.contentprovider\""
             buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.modifications.contentprovider\""
             buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.categories.contentprovider\""
+            buildConfigField "String", "DEPICTION_AUTHORITY", "\"fr.free.nrw.commons.depicts.contentprovider\""
             buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.explore.recentsearches.contentprovider\""
             buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.contentprovider\""
             buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.bookmarks.locations.contentprovider\""
@@ -221,6 +224,7 @@ android {
             buildConfigField "String", "WIKIMEDIA_API_POTD", "\"https://commons.wikimedia.org/w/api.php?action=featuredfeed&feed=potd&feedformat=rss&language=en\""
             buildConfigField "String", "WIKIMEDIA_API_HOST", "\"https://commons.wikimedia.beta.wmflabs.org/w/api.php\""
             buildConfigField "String", "WIKIDATA_API_HOST", "\"https://www.wikidata.org/w/api.php\""
+            buildConfigField "String", "WIKIDATA_URL", "\"https://www.wikidata.org\""
             buildConfigField "String", "WIKIMEDIA_FORGE_API_HOST", "\"https://tools.wmflabs.org/\""
             buildConfigField "String", "WIKIMEDIA_CAMPAIGNS_URL", "\"https://raw.githubusercontent.com/commons-app/campaigns/master/campaigns_beta_active.json\""
             buildConfigField "String", "IMAGE_URL_BASE", "\"https://upload.beta.wmflabs.org/wikipedia/commons\""
@@ -236,6 +240,7 @@ android {
             buildConfigField "String", "CONTRIBUTION_AUTHORITY", "\"fr.free.nrw.commons.beta.contributions.contentprovider\""
             buildConfigField "String", "MODIFICATION_AUTHORITY", "\"fr.free.nrw.commons.beta.modifications.contentprovider\""
             buildConfigField "String", "CATEGORY_AUTHORITY", "\"fr.free.nrw.commons.beta.categories.contentprovider\""
+            buildConfigField "String", "DEPICTION_AUTHORITY", "\"fr.free.nrw.commons.beta.depicts.contentprovider\""
             buildConfigField "String", "RECENT_SEARCH_AUTHORITY", "\"fr.free.nrw.commons.beta.explore.recentsearches.contentprovider\""
             buildConfigField "String", "BOOKMARK_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.contentprovider\""
             buildConfigField "String", "BOOKMARK_LOCATIONS_AUTHORITY", "\"fr.free.nrw.commons.beta.bookmarks.locations.contentprovider\""

diff --git a/app/src/androidTest/java/fr/free/nrw/commons/DepictionSearchTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/DepictionSearchTest.kt
@@ -0,0 +1,46 @@
+package fr.free.nrw.commons
+
+import androidx.test.runner.AndroidJUnit4
+import org.junit.Rule
+import org.junit.runner.RunWith
+import android.net.Uri
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.rule.ActivityTestRule
+import fr.free.nrw.commons.upload.UploadActivity
+import org.hamcrest.Matchers
+import org.hamcrest.core.AllOf
+import org.junit.Test
+
+@RunWith(AndroidJUnit4::class)
+class DepictionSearchTest {
+    @get:Rule
+    var activityRule = ActivityTestRule(UploadActivity::class.java)
+
+    @Test
+    fun TestForCaptionsAndDepictions() {
+        val imageUri = Uri.parse("file://mnt/sdcard/image.jpg")
+
+        // Build a result to return from the Camera app
+
+
+        // Stub out the File picker. When an intent is sent to the File picker, this tells
+        // Espresso to respond with the ActivityResult we just created
+
+        Espresso.onView(ViewMatchers.withId(R.id.caption_item_edit_text))
+                .perform(ViewActions.typeText("caption in english"))
+        Espresso.onView(ViewMatchers.withId(R.id.description_item_edit_text))
+                .perform(ViewActions.typeText("description in english"))
+        Espresso.onView(ViewMatchers.withId(R.id.spinner_description_languages))
+                .perform(ViewActions.click())
+        Espresso.onView(ViewMatchers.withId(R.id.spinner_description_languages)).perform(ViewActions.click());
+        Espresso.onData(AllOf.allOf(Matchers.anything("spinner text"))).atPosition(1).perform(ViewActions.click());
+        Espresso.onView(ViewMatchers.withId(R.id.caption_item_edit_text))
+                .perform(ViewActions.typeText("caption in some other language"))
+        Espresso.onView(ViewMatchers.withId(R.id.description_item_edit_text))
+                .perform(ViewActions.typeText("description in some other language"))
+        Espresso.onView(ViewMatchers.withId(R.id.btn_next))
+                .perform(ViewActions.click())
+    }
+}
diff --git a/app/src/androidTest/java/fr/free/nrw/commons/UploadActivityTest.kt b/app/src/androidTest/java/fr/free/nrw/commons/UploadActivityTest.kt
@@ -1,8 +1,17 @@
 package fr.free.nrw.commons
 
+import android.net.Uri
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.intent.Intents
+import androidx.test.espresso.intent.matcher.IntentMatchers
+import androidx.test.espresso.matcher.ViewMatchers
 import androidx.test.rule.ActivityTestRule
 import androidx.test.runner.AndroidJUnit4
 import fr.free.nrw.commons.upload.UploadActivity
+import fr.free.nrw.commons.upload.depicts.DepictsFragment
+import org.hamcrest.Matchers
+import org.hamcrest.core.AllOf
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,8 +21,31 @@ class UploadActivityTest {
     @get:Rule
     var activityRule = ActivityTestRule(UploadActivity::class.java)
 
-    @Test
+ @Test
     fun orientationChange() {
         UITestHelper.changeOrientation(activityRule)
     }
-}
+
+    @Test
+    fun TestForCaptionsAndDepictions() {
+        val imageUri = Uri.parse("file://mnt/sdcard/image.jpg")
+
+        Espresso.onView(ViewMatchers.withId(R.id.caption_item_edit_text))
+                .perform(ViewActions.typeText("caption in english"))
+        Espresso.onView(ViewMatchers.withId(R.id.description_item_edit_text))
+                .perform(ViewActions.typeText("description in english"))
+        Espresso.onView(ViewMatchers.withId(R.id.spinner_description_languages))
+                .perform(ViewActions.click())
+        Espresso.onView(ViewMatchers.withId(R.id.spinner_description_languages)).perform(ViewActions.click());
+        Espresso.onData(AllOf.allOf(Matchers.anything("spinner text"))).atPosition(1).perform(ViewActions.click());
+        Espresso.onView(ViewMatchers.withId(R.id.caption_item_edit_text))
+                .perform(ViewActions.typeText("caption in some other language"))
+        Espresso.onView(ViewMatchers.withId(R.id.description_item_edit_text))
+                .perform(ViewActions.typeText("description in some other language"))
+        Espresso.onView(ViewMatchers.withId(R.id.btn_next))
+                .perform(ViewActions.click())
+        Intents.intended(IntentMatchers.hasComponent(DepictsFragment::class.java.name))
+        /*onView(withId(R.id.depicts_search))
+                .perform(ViewActions.typeText("bridge"))*/
+    }
+}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -112,6 +112,16 @@
             android:label="@string/title_activity_featured_images"
             android:parentActivityName=".contributions.MainActivity" />
 
+        <activity
+            android:name=".depictions.Media.DepictedImagesFragment"
+            android:label="@string/title_activity_featured_images"
+            android:parentActivityName=".contributions.MainActivity" />
+
+        <activity
+            android:name=".depictions.DepictionDetailsActivity"
+            android:label="@string/title_activity_featured_images"
+            android:parentActivityName=".contributions.MainActivity" />
+
         <activity
             android:name=".explore.categories.ExploreActivity"
             android:label="@string/title_activity_explore"
@@ -191,6 +201,13 @@
             android:label="@string/provider_categories"
             android:syncable="false" />
 
+        <provider
+            android:authorities="{applicationId}.depicts.contentprovider"
+            android:name=".upload.structure.depictions.DepictsContentProvider"
+            android:exported="false"
+            android:label="@string/provider_depictions"
+            android:syncable="false"/>
+
         <provider
             android:name=".explore.recentsearches.RecentSearchesContentProvider"
             android:authorities="${applicationId}.explore.recentsearches.contentprovider"

diff --git a/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java b/app/src/main/java/fr/free/nrw/commons/CommonsApplication.java
@@ -43,6 +43,7 @@
 import fr.free.nrw.commons.logging.FileLoggingTree;
 import fr.free.nrw.commons.logging.LogUtils;
 import fr.free.nrw.commons.upload.FileUtils;
+import fr.free.nrw.commons.upload.structure.depictions.DepictionDao;
 import fr.free.nrw.commons.utils.ConfigUtils;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.internal.functions.Functions;
@@ -266,6 +267,7 @@ private void updateAllDatabases() {
         SQLiteDatabase db = dbOpenHelper.getWritableDatabase();
 
         CategoryDao.Table.onDelete(db);
+        DepictionDao.Table.onDelete(db);
         ContributionDao.Table.onDelete(db);
         BookmarkPicturesDao.Table.onDelete(db);
         BookmarkLocationsDao.Table.onDelete(db);