Merge pull request #36 from TeamOwori/feat/#10-홈-화면-구현

Feat/#10 홈 화면 구현

app/build.gradle.kts

@@ -66,9 +66,12 @@ dependencies {
 
     implementation(libs.kotlinx.coroutines.android)
     implementation(libs.kotlinx.serialization.json)
+
     implementation(libs.okhttp.logging)
     implementation(libs.retrofit)
     implementation(libs.retrofit.kotlin.serialization)
+    implementation(libs.retrofit.converter.gson)
+    implementation(libs.retrofit.converter.scalars)
 
     implementation(libs.coroutines.core)
     implementation(libs.fragment.ktx)
@@ -91,7 +94,7 @@ dependencies {
     implementation(libs.play.service.auth)
     implementation(libs.dagger.hilt)
     kapt(libs.dagger.hilt.compiler)
-
+    implementation(libs.coil)
     implementation(libs.kakao.login)
 }
 

app/src/main/AndroidManifest.xml

@@ -27,6 +27,31 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity android:name=".presenter.main.MainActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".presenter.emotion.EmotionActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".presenter.main.home.notice.NoticeActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".presenter.main.home.mypage.MyPageActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".presenter.main.home.settings.SettingsActivity"
+            android:exported="true"
+            android:screenOrientation="portrait" />
+
+        <activity android:name=".presenter.main.home.familyname.FamilyNameActivity"
+            android:exported="true"
+            android:screenOrientation="portrait"
+            android:windowSoftInputMode="adjustPan|adjustUnspecified"/>
+
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
@@ -36,7 +61,7 @@
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data android:host="oauth"
-                    android:scheme="kakao6c28960f69d4c7f00043b02d890dd6e0" />
+                    android:scheme="@string/kakao_key" />
             </intent-filter>
         </activity>
     </application>

app/src/main/java/com/owori/android/core/AppConfig.kt

@@ -0,0 +1,7 @@
+package com.owori.android.core
+
+
+object AppConfig {
+    const val TAG_DEBUG = "TAG_DEBUG"
+
+}

app/src/main/java/com/owori/android/core/BaseActivity.kt

@@ -15,6 +15,11 @@ abstract class BaseActivity<B : ViewDataBinding, V : BaseViewModel>(@LayoutRes p
     abstract fun initView()
     protected abstract fun initObserver()
     protected open fun navigate(navigation: Navigation) {}
+
+    protected open fun setStatusBarColor(color: Int) {
+        window.statusBarColor = color
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         binding = DataBindingUtil.setContentView(this, layoutId)

app/src/main/java/com/owori/android/core/BaseDialogFragment.kt

@@ -0,0 +1,61 @@
+package com.owori.android.core
+
+import android.graphics.Color
+import android.graphics.drawable.ColorDrawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.view.ViewGroup.LayoutParams.WRAP_CONTENT
+import androidx.fragment.app.DialogFragment
+import com.owori.android.databinding.DialogBaseBinding
+
+class BaseDialogFragment(
+    private val title: String,
+    private val contents: String,
+    private val positiveButtonText: String? = null,
+    private val cancelButtonText: String? = null,
+    private val onClickPositiveButton: () -> Unit = {}
+) : DialogFragment() {
+    private var _binding: DialogBaseBinding? = null
+    private val binding get() = _binding!!
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = DialogBaseBinding.inflate(inflater, container, false)
+        val view = binding.root
+        dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
+
+        with(binding) {
+            titleTextview.text = title
+            contentsTextview.text = contents
+
+            positiveButtonText?.let { positiveText.text = it }
+            cancelButtonText?.let { cancelText.text = it }
+
+            cancelButton.setOnClickListener {
+                dialog?.dismiss()
+            }
+
+            positiveButton.setOnClickListener {
+                onClickPositiveButton()
+                dialog?.dismiss()
+            }
+        }
+
+        return view
+    }
+
+    override fun onResume() {
+        super.onResume()
+        this@BaseDialogFragment.dialog?.window?.setLayout(WRAP_CONTENT, WRAP_CONTENT)
+    }
+
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+}

app/src/main/java/com/owori/android/core/BaseFragment.kt

@@ -22,6 +22,10 @@ abstract class BaseFragment<B : ViewDataBinding, V : BaseViewModel>(@LayoutRes p
 
     protected open fun navigate(navigation: Navigation) {}
 
+    protected open fun setStatusBarColor(color: Int) {
+        requireActivity().window.statusBarColor = color
+    }
+
     override fun onCreateView(
         inflater: LayoutInflater,
         container: ViewGroup?,

app/src/main/java/com/owori/android/core/BaseViewModel.kt

@@ -9,6 +9,13 @@ open class BaseViewModel : ViewModel() {
     protected val _navigation = SingleLiveEvent<Navigation>()
     val navigation: LiveData<Navigation> = _navigation
 
+    protected val _cancelButtonClicked: SingleLiveEvent<Unit> = SingleLiveEvent()
+    val cancelButtonClicked: LiveData<Unit> = _cancelButtonClicked
+
+    fun onClickCancelButton() {
+        _cancelButtonClicked.call()
+    }
+
     companion object {
         private const val TAG = "BaseViewModel"
     }

app/src/main/java/com/owori/android/core/Constants.kt

@@ -0,0 +1,5 @@
+package com.owori.android.core
+
+object Constants {
+    const val OWORI_DATE_FORMAT = "yyyy-MM-dd"
+}

app/src/main/java/com/owori/android/core/OworiApplication.kt

@@ -1,14 +1,44 @@
 package com.owori.android.core
 
+import android.annotation.SuppressLint
 import android.app.Application
-import com.kakao.sdk.common.KakaoSdk
+import android.content.Context
+import androidx.annotation.StringRes
+import androidx.lifecycle.DefaultLifecycleObserver
+import androidx.lifecycle.LifecycleOwner
 import com.owori.android.R
+import com.owori.android.module.NetworkConnectionChecker
+import com.kakao.sdk.common.KakaoSdk
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
-class OworiApplication: Application() {
+class OworiApplication : Application(), DefaultLifecycleObserver {
     override fun onCreate() {
-        super.onCreate()
+        super<Application>.onCreate()
+        context = applicationContext
+        networkConnectionChecker = NetworkConnectionChecker(context)
         KakaoSdk.init(this, getString(R.string.kakao_login_key))
     }
+
+    override fun onStop(owner: LifecycleOwner) {
+        networkConnectionChecker.unregister()
+        super.onStop(owner)
+    }
+
+    override fun onStart(owner: LifecycleOwner) {
+        networkConnectionChecker.register()
+        super.onStart(owner)
+    }
+
+    companion object {
+        @SuppressLint("StaticFieldLeak")
+        private lateinit var context: Context
+
+        fun getString(@StringRes stringResId: Int): String {
+            return context.getString(stringResId)
+        }
+
+        private lateinit var networkConnectionChecker: NetworkConnectionChecker
+        fun isOnline() = networkConnectionChecker.isOnline()
+    }
 }

app/src/main/java/com/owori/android/core/di/NetworkModule.kt

@@ -0,0 +1,56 @@
+package com.owori.android.core.di
+
+import com.owori.android.R
+import com.owori.android.core.OworiApplication
+import com.owori.android.data.api.auth.AuthApi
+import com.owori.android.module.HttpRequestInterceptor
+import dagger.Module
+import dagger.Provides
+import dagger.hilt.InstallIn
+import dagger.hilt.components.SingletonComponent
+import okhttp3.OkHttpClient
+import retrofit2.Retrofit
+import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.converter.scalars.ScalarsConverterFactory
+import javax.inject.Singleton
+
+/*
+* Created by JJJoonngg
+*/
+
+@Module
+@InstallIn(SingletonComponent::class)
+object NetworkModule {
+    const val NETWORK_EXCEPTION_OFFLINE_CASE = "network status is offline"
+    const val NETWORK_EXCEPTION_BODY_IS_NULL = "result body is null"
+
+    @Provides
+    @Singleton
+    fun provideOKHttpClient(): OkHttpClient {
+        return OkHttpClient.Builder()
+            .addInterceptor(HttpRequestInterceptor())
+            .retryOnConnectionFailure(false)
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideRetrofit(okHttpClient: OkHttpClient): Retrofit {
+        return Retrofit.Builder()
+            .client(okHttpClient)
+            .baseUrl(OworiApplication.getString(R.string.base_url))
+            .addConverterFactory(ScalarsConverterFactory.create())
+            .addConverterFactory(GsonConverterFactory.create())
+            .build()
+    }
+
+    @Provides
+    @Singleton
+    fun provideAuthApi(retrofit: Retrofit): AuthApi {
+        return retrofit.buildService()
+    }
+
+    private inline fun <reified T> Retrofit.buildService(): T {
+        return this.create(T::class.java)
+    }
+}

app/src/main/java/com/owori/android/data/api/auth/AuthApi.kt

@@ -0,0 +1,22 @@
+package com.owori.android.data.api.auth
+
+import com.owori.android.data.model.SignUpRequest
+import com.owori.android.data.model.SignUpResponse
+import com.owori.android.module.DataResult
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+/*
+* Created by JJJoonngg
+*/
+
+interface AuthApi {
+    @POST("/members/kakao")
+    fun kakaoLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>
+
+    @POST("/members/google")
+    fun googleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>
+
+    @POST("/members/apple")
+    fun appleLogin(@Body data: SignUpRequest) : DataResult<SignUpResponse>
+}

app/src/main/java/com/owori/android/data/model/AuthProvider.kt

@@ -0,0 +1,5 @@
+package com.owori.android.data.model
+
+enum class AuthProvider {
+    GOOGLE, KAKAO, APPLE
+}

app/src/main/java/com/owori/android/data/model/SignUpRequest.kt

@@ -0,0 +1,9 @@
+package com.owori.android.data.model
+
+import com.google.gson.annotations.SerializedName
+
+data class SignUpRequest(
+    val token: String,
+    @SerializedName("auth_provider")
+    val authProvider: AuthProvider
+)

app/src/main/java/com/owori/android/data/model/SignUpResponse.kt

@@ -0,0 +1,14 @@
+package com.owori.android.data.model
+
+import com.google.gson.annotations.SerializedName
+
+data class SignUpResponse(
+    @SerializedName("member_name")
+    val memberId: String,
+    @SerializedName("is_service_member")
+    val isMember: Boolean,
+    @SerializedName("jwt_token")
+    val token: SignUpResponseToken,
+) {
+
+}

app/src/main/java/com/owori/android/data/model/SignUpResponseToken.kt

@@ -0,0 +1,10 @@
+package com.owori.android.data.model
+
+import com.google.gson.annotations.SerializedName
+
+data class SignUpResponseToken (
+    @SerializedName("access_token")
+    val accessToken: String,
+    @SerializedName("refresh_token")
+    val refreshToken: String,
+)