Merge branch 'develop'

Author: milk717

.idea/misc.xml

@@ -109,6 +109,7 @@ dependencies {
     implementation 'com.squareup.okhttp3:logging-interceptor:4.9.0'
 
     // espresso
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
     androidTestImplementation 'androidx.test:runner:1.4.0'
     androidTestImplementation 'androidx.test:rules:1.4.0'
 

app/build.gradle

@@ -0,0 +1,48 @@
+package org.inu.events
+
+import android.view.View
+import android.view.ViewGroup
+import androidx.test.espresso.Espresso
+import androidx.test.espresso.Espresso.onView
+import androidx.test.espresso.action.ViewActions
+import androidx.test.espresso.action.ViewActions.click
+import androidx.test.espresso.action.ViewActions.typeText
+import androidx.test.espresso.matcher.ViewMatchers
+import androidx.test.espresso.matcher.ViewMatchers.withId
+import androidx.test.ext.junit.runners.AndroidJUnit4
+import androidx.test.filters.LargeTest
+import androidx.test.rule.ActivityTestRule
+import org.junit.Rule
+import org.junit.Test
+import org.junit.runner.RunWith
+
+/**
+ * 에뮬레이터 언어 설정 한국어로 설정해 주세요!
+ */
+
+@RunWith(AndroidJUnit4::class)
+@LargeTest
+class PostEventTest {
+    @get:Rule
+    val activityRule = ActivityTestRule(MainActivity::class.java)
+
+    @Test
+    fun test() {
+//        login()
+        onView(withId(R.id.floating_action_button)).perform(click())
+        onView(withId(R.id.checkBox_image)).perform(click())
+        onView(withId(R.id.button_complete)).perform(click())
+        onView(withId(R.id.editText_title)).perform(typeText("wpahrdldi~~~!!"))
+        onView(withId(R.id.editText_host)).perform(typeText("doqtpsxj"))
+        onView(withId(R.id.editText_target)).perform(typeText("sjaksdhaus eho!!"))
+        onView(withId(R.id.checkBox)).perform(click())
+        onView(withId(R.id.checkBox_location)).perform(click())
+        onView(withId(R.id.spinner_classification)).perform(click())
+//        onView(ViewMatchers.withSpinnerText("동아리/소모임")).perform(click())
+    }
+
+    fun login() {
+        onView(withId(R.id.imageView)).perform(click())
+
+    }
+}

app/src/androidTest/java/org/inu/events/PostEventTest.kt

@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
 
     <application
         android:name=".MyApplication"
@@ -91,7 +90,6 @@
                 <action android:name="com.google.firebase.MESSAGING_EVENT" />
             </intent-filter>
         </service>
-        <service android:name=".service.AlarmService" />
     </application>
 
 </manifest>

app/src/main/AndroidManifest.xml

@@ -6,13 +6,12 @@ import androidx.activity.viewModels
 import com.bumptech.glide.Glide
 import okhttp3.MediaType.Companion.toMediaType
 import okhttp3.MultipartBody
-import okhttp3.RequestBody.Companion.asRequestBody
 import org.inu.events.base.BaseActivity
-import org.inu.events.common.util.URIPathHelper
+import org.inu.events.common.extension.asRequestBody
+import org.inu.events.common.extension.toast
 import org.inu.events.databinding.ActivityUpdateProfileBinding
 import org.inu.events.lib.actionsheet.UniActionSheet
 import org.inu.events.viewmodel.UpdateProfileViewModel
-import java.io.File
 
 
 class UpdateProfileActivity : BaseActivity<ActivityUpdateProfileBinding>() {
@@ -24,13 +23,21 @@ class UpdateProfileActivity : BaseActivity<ActivityUpdateProfileBinding>() {
             if (result.resultCode == RESULT_OK) {
                 try {
                     val uri = result.data?.data
+                    if (uri == null) {
+                        toast("이미지를 가져오지 못 하였습니다 ㅠㅡㅠ")
+                        return@registerForActivityResult
+                    }
+
                     Glide.with(this).load(uri).into(binding.photoUpdate)
 
-                    val filePath = URIPathHelper().getPath(this, uri!!)
-                    val file = File(filePath!!)
+                    val stream = contentResolver.openInputStream(uri)
+                    if (stream == null) {
+                        toast("입력 스트림을 열지 못 하였습니다 ㅠㅡㅠ")
+                        return@registerForActivityResult
+                    }
 
-                    val requestFile = file.asRequestBody("multipart/form-data".toMediaType())
-                    val image = MultipartBody.Part.createFormData("file", file.name, requestFile)
+                    val requestFile = stream.asRequestBody("multipart/form-data".toMediaType())
+                    val image = MultipartBody.Part.createFormData("file", "file", requestFile)
                     viewModel.uploadImage(image)
                 } catch (e: Exception) {
                     e.printStackTrace()

app/src/main/java/org/inu/events/UpdateProfileActivity.kt

@@ -0,0 +1,20 @@
+package org.inu.events.common.extension
+
+import okhttp3.MediaType
+import okhttp3.RequestBody
+import okio.BufferedSink
+import java.io.InputStream
+
+fun InputStream.asRequestBody(contentType: MediaType? = null): RequestBody {
+    val byteArray = this.readBytes()
+
+    return object : RequestBody() {
+        override fun contentType() = contentType
+
+        override fun contentLength() = byteArray.size.toLong()
+
+        override fun writeTo(sink: BufferedSink) {
+            sink.write(byteArray)
+        }
+    }
+}