From 2a1b9209e174a57500219c17d85ee9e035a0c8e9 Mon Sep 17 00:00:00 2001
From: Ulysse Widmer <ulysse.widmer@epfl.ch>
Date: Wed, 18 Mar 2020 01:09:39 +0900
Subject: [PATCH 1/4] upload picture implemented

still need to link it with create a post and DataBase
---
 app/src/main/AndroidManifest.xml              |  1 +
 .../java/com/h/pixeldroid/MainActivity.kt     |  3 +-
 .../h/pixeldroid/fragments/CameraFragment.kt  | 59 +++++++++++++++++++
 app/src/main/res/layout/fragment_camera.xml   | 28 +++++++++
 app/src/main/res/values/strings.xml           |  1 +
 5 files changed, 91 insertions(+), 1 deletion(-)
 create mode 100644 app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
 create mode 100644 app/src/main/res/layout/fragment_camera.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb485d3c..00aa7bdb 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,6 +3,7 @@
     package="com.h.pixeldroid">
 
     <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
diff --git a/app/src/main/java/com/h/pixeldroid/MainActivity.kt b/app/src/main/java/com/h/pixeldroid/MainActivity.kt
index 3da8642e..c3bd83a6 100644
--- a/app/src/main/java/com/h/pixeldroid/MainActivity.kt
+++ b/app/src/main/java/com/h/pixeldroid/MainActivity.kt
@@ -16,6 +16,7 @@ import androidx.viewpager2.widget.ViewPager2
 import com.google.android.material.navigation.NavigationView
 import com.google.android.material.tabs.TabLayout
 import com.google.android.material.tabs.TabLayoutMediator
+import com.h.pixeldroid.fragments.CameraFragment
 import com.h.pixeldroid.fragments.HomeFragment
 import com.h.pixeldroid.fragments.MyProfileFragment
 
@@ -45,7 +46,7 @@ class MainActivity : AppCompatActivity(), NavigationView.OnNavigationItemSelecte
             navigationView.setNavigationItemSelectedListener(this)
 
             val tabs =
-                arrayOf(HomeFragment(), Fragment(), Fragment(), Fragment(), MyProfileFragment())
+                arrayOf(HomeFragment(), Fragment(), CameraFragment(), Fragment(), MyProfileFragment())
 
             setupTabs(tabs)
         }
diff --git a/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt b/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
new file mode 100644
index 00000000..49f5fd44
--- /dev/null
+++ b/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
@@ -0,0 +1,59 @@
+package com.h.pixeldroid.fragments
+
+import android.app.Activity
+import android.content.Intent
+import android.graphics.Bitmap
+import android.net.Uri
+import android.os.Bundle
+import android.util.Log
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.Button
+import android.widget.ImageView
+import android.widget.Toast
+import com.h.pixeldroid.R
+
+const val PICK_IMAGE_REQUEST = 1
+const val TAG = "Camera Fragment"
+
+class CameraFragment : Fragment() {
+
+    private var uploadedPictureView: ImageView? = null
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        val view = inflater.inflate(R.layout.fragment_camera, container, false)
+        val uploadPictureButton: Button = view.findViewById(R.id.uploadPictureButton)
+        uploadedPictureView = view.findViewById(R.id.uploadedPictureView)
+        uploadPictureButton.setOnClickListener{
+            uploadPicture()
+        }
+
+        // Inflate the layout for this fragment
+        return view
+    }
+
+    private fun uploadPicture() {
+        Intent().apply {
+            type = "image/*"
+            action = Intent.ACTION_GET_CONTENT
+            startActivityForResult(
+                Intent.createChooser(this, "Select a Picture"), PICK_IMAGE_REQUEST
+            )
+        }
+    }
+
+    override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
+        if (requestCode == PICK_IMAGE_REQUEST && resultCode == Activity.RESULT_OK) {
+            if(data == null || data.data == null){
+                Log.w(TAG, "No picture uploaded")
+                return
+            }
+            uploadedPictureView?.setImageURI(data.data)
+        }
+    }
+}
diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml
new file mode 100644
index 00000000..43a0700a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_camera.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    tools:context=".fragments.CameraFragment"
+    android:orientation="vertical">
+
+    <Button
+        android:id="@+id/uploadPictureButton"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="center"
+        android:padding="15dp"
+        android:layout_margin="15dp"
+        android:text="@string/upload_a_picture"
+        android:background="@color/colorPrimary"
+        android:textColor="@color/cardview_light_background"/>
+
+    <ImageView
+        android:id="@+id/uploadedPictureView"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="15dp"
+        tools:srcCompat="@tools:sample/avatars" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 925dc8ef..0657b8c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -58,5 +58,6 @@
     <string name="hello_blank_fragment">Hello blank fragment</string>
     <string name="start_login">Start Login</string>
     <string name="no_username">No Username</string>
+    <string name="upload_a_picture">Upload a picture</string>
 
 </resources>

From e17a279994651b90a4a298b2b5d65c72833ce89a Mon Sep 17 00:00:00 2001
From: Ulysse Widmer <ulysse.widmer@epfl.ch>
Date: Fri, 20 Mar 2020 15:27:52 +0900
Subject: [PATCH 2/4] add tests

---
 .../java/com/h/pixeldroid/SwipeTest.kt        | 30 +++++++++++++++----
 .../h/pixeldroid/fragments/CameraFragment.kt  |  7 ++---
 app/src/main/res/layout/activity_main.xml     |  1 +
 app/src/main/res/layout/fragment_camera.xml   |  5 ++--
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt b/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
index a220ec6b..a5104e78 100644
--- a/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
+++ b/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
@@ -1,17 +1,17 @@
 package com.h.pixeldroid
 
 import android.content.Context
-import android.content.Intent
 import androidx.test.core.app.ActivityScenario
 import androidx.test.espresso.Espresso.onView
 import androidx.test.espresso.action.ViewActions.swipeLeft
+import androidx.test.espresso.action.ViewActions.swipeRight
 import androidx.test.espresso.assertion.ViewAssertions.matches
 import androidx.test.espresso.matcher.ViewMatchers.isDisplayed
 import androidx.test.espresso.matcher.ViewMatchers.withId
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import androidx.test.platform.app.InstrumentationRegistry.getInstrumentation
-import androidx.test.rule.ActivityTestRule
+import com.google.android.material.tabs.TabLayout
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test
@@ -31,10 +31,28 @@ class SwipeTest {
         ActivityScenario.launch(MainActivity::class.java)
     }
 
-    @Test
-    fun swipingRightOnHomepageShowsSettings() {
-        onView(withId(R.id.view_pager)).perform(swipeLeft()).perform(swipeLeft()).perform(swipeLeft()).perform(swipeLeft())
-        onView(withId(R.id.nbFollowersTextView)).check(matches(isDisplayed()))
+    fun swipingLeftOnSearchShowsCameraFragment() {
+        val tab: TabLayout = onView(withId(R.id.tabs))
 
+        onView(withId(R.id.main_activity_main_linear_layout))
+            .perform(swipeLeft())
+        onView(withId(R.id.camera_fragment_main_linear_layout)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun swipingRightOnFavoriteShowsCameraFragment() {
+        onView(withId(R.id.main_activity_main_linear_layout))
+            .perform(swipeRight())
+        onView(withId(R.id.camera_fragment_main_linear_layout)).check(matches(isDisplayed()))
+    }
+
+    @Test
+    fun swipingLeftOnShowsProfileFragment() {
+        onView(withId(R.id.view_pager))
+            .perform(swipeLeft())
+            .perform(swipeLeft())
+            .perform(swipeLeft())
+            .perform(swipeLeft())
+        onView(withId(R.id.nbFollowersTextView)).check(matches(isDisplayed()))
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt b/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
index 49f5fd44..e5359da7 100644
--- a/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
+++ b/app/src/main/java/com/h/pixeldroid/fragments/CameraFragment.kt
@@ -2,8 +2,6 @@ package com.h.pixeldroid.fragments
 
 import android.app.Activity
 import android.content.Intent
-import android.graphics.Bitmap
-import android.net.Uri
 import android.os.Bundle
 import android.util.Log
 import androidx.fragment.app.Fragment
@@ -12,7 +10,6 @@ import android.view.View
 import android.view.ViewGroup
 import android.widget.Button
 import android.widget.ImageView
-import android.widget.Toast
 import com.h.pixeldroid.R
 
 const val PICK_IMAGE_REQUEST = 1
@@ -27,8 +24,8 @@ class CameraFragment : Fragment() {
         savedInstanceState: Bundle?
     ): View? {
         val view = inflater.inflate(R.layout.fragment_camera, container, false)
-        val uploadPictureButton: Button = view.findViewById(R.id.uploadPictureButton)
-        uploadedPictureView = view.findViewById(R.id.uploadedPictureView)
+        val uploadPictureButton: Button = view.findViewById(R.id.upload_picture_button)
+        uploadedPictureView = view.findViewById(R.id.uploaded_picture_view)
         uploadPictureButton.setOnClickListener{
             uploadPicture()
         }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c4f5ba1c..aa15e5b5 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,7 @@
 
 
     <LinearLayout
+        android:id="@+id/main_activity_main_linear_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical">
diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml
index 43a0700a..25d776d7 100644
--- a/app/src/main/res/layout/fragment_camera.xml
+++ b/app/src/main/res/layout/fragment_camera.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/camera_fragment_main_linear_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center_horizontal"
@@ -8,7 +9,7 @@
     android:orientation="vertical">
 
     <Button
-        android:id="@+id/uploadPictureButton"
+        android:id="@+id/upload_picture_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:gravity="center"
@@ -19,7 +20,7 @@
         android:textColor="@color/cardview_light_background"/>
 
     <ImageView
-        android:id="@+id/uploadedPictureView"
+        android:id="@+id/uploaded_picture_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="15dp"

From 3bff3f55816626e47c847e58d43c0fbf3c263d48 Mon Sep 17 00:00:00 2001
From: Ulysse Widmer <ulysse.widmer@epfl.ch>
Date: Fri, 20 Mar 2020 16:29:02 +0900
Subject: [PATCH 3/4] added string value

---
 app/src/main/res/values/strings.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c97bb840..b72a5589 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,5 +63,5 @@
     <string name="mention_notification">%1$s mentioned you</string>
     <string name="shared_notification">%1$s shared your post</string>
     <string name="liked_notification">%1$s liked your post</string>
-    
+
 </resources>

From c20e1cee4b7ee712125e3e6db5beba0bd2563cf7 Mon Sep 17 00:00:00 2001
From: Ulysse Widmer <ulysse.widmer@epfl.ch>
Date: Fri, 20 Mar 2020 19:34:34 +0900
Subject: [PATCH 4/4] fixed some tests

---
 .../java/com/h/pixeldroid/SwipeTest.kt        | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt b/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
index 55bec6cd..ac6450d6 100644
--- a/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
+++ b/app/src/androidTest/java/com/h/pixeldroid/SwipeTest.kt
@@ -31,23 +31,25 @@ class SwipeTest {
         ActivityScenario.launch(MainActivity::class.java)
     }
 
-//    fun swipingLeftOnSearchShowsCameraFragment() {
-//        val tab: TabLayout = onView(withId(R.id.tabs))
-//
-//        onView(withId(R.id.main_activity_main_linear_layout))
-//            .perform(swipeLeft())
-//        onView(withId(R.id.camera_fragment_main_linear_layout)).check(matches(isDisplayed()))
-//    }
+    fun swipingLeftOnSearchShowsCameraFragment() {
+        onView(withId(R.id.main_activity_main_linear_layout))
+            .perform(swipeLeft()) // go to search
+            .perform(swipeLeft())
+        onView(withId(R.id.camera_fragment_main_linear_layout)).check(matches(isDisplayed()))
+    }
 
     @Test
-    fun swipingRightOnFavoriteShowsCameraFragment() {
+    fun swipingRightOnNotificationsShowsCameraFragment() {
         onView(withId(R.id.main_activity_main_linear_layout))
+            .perform(swipeLeft())
+            .perform(swipeLeft())
+            .perform(swipeLeft()) // go to notifications
             .perform(swipeRight())
         onView(withId(R.id.camera_fragment_main_linear_layout)).check(matches(isDisplayed()))
     }
 
     @Test
-    fun swipingLeftOnShowsProfileFragment() {
+    fun swipingLeftShowsProfileFragment() {
         onView(withId(R.id.view_pager))
             .perform(swipeLeft())
             .perform(swipeLeft())