Skip to content

Commit

Permalink
Merge pull request #33 from hometerview/6/mypage_fragment
Browse files Browse the repository at this point in the history
[마이페이지 화면 - 01, 02] �마이페이지 화면, 닉네임 변경 화면 및 팝업
  • Loading branch information
likppi10 authored Aug 29, 2022
2 parents 08971a6 + 124e438 commit 4952707
Show file tree
Hide file tree
Showing 45 changed files with 2,361 additions and 48 deletions.
64 changes: 42 additions & 22 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.ftw.hometerview">
package="com.ftw.hometerview"
>

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
Expand All @@ -19,51 +20,67 @@
android:supportsRtl="true"
android:theme="@style/Theme.Hometerview"
android:usesCleartextTraffic="true"
tools:targetApi="31">
tools:targetApi="31"
>
<activity
android:name=".ui.withdrawal.WithdrawalActivity"
android:exported="false"
/>
<activity
android:name=".ui.manageaccount.ManageAccountActivity"
android:exported="false"
/>
<activity
android:name=".ui.myreviews.MyReviewsActivity"
android:exported="false"
/>
<activity
android:name=".ui.updatenickname.UpdateNicknameActivity"
android:exported="false"
/>
<activity
android:name=".ui.buildinglist.BuildingListActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.searchaddressbuilding.SearchAddressBuildingActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.loading.LoadingActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.searchcompanynonresult.SearchCompanyNonResultActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.searchcompanyresult.SearchCompanyResultActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.searchcompany.SearchCompanyActivity"
android:exported="false" />

android:exported="false"
/>
<activity
android:name=".ui.splash.SplashActivity"
android:exported="true"
tools:ignore="Instantiatable" />

tools:ignore="Instantiatable"
/>
<activity
android:name=".ui.main.MainActivity"
android:exported="true" >
android:exported="true"
>
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<activity
android:name=".ui.login.LoginActivity"
android:exported="true"
/>

<activity
android:name=".ui.buildingreview.BuildingReviewActivity"
android:exported="true"
Expand All @@ -78,7 +95,8 @@
<!-- kakao 로그인 창 -->
<activity
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
android:exported="true">
android:exported="true"
>
<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand All @@ -87,13 +105,15 @@

<data
android:host="oauth"
android:scheme="@string/kakao_scheme" />
android:scheme="@string/kakao_scheme"
/>
</intent-filter>
</activity>

<meta-data
android:name="com.kakao.sdk.AppKey"
android:value="@string/kakao_api_key" />
android:value="@string/kakao_api_key"
/>
</application>

</manifest>
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,24 @@ import com.ftw.domain.usecase.buildingreview.GetBuildingReviewsUseCase
import com.ftw.domain.usecase.login.LoginUseCase
import com.ftw.domain.usecase.review.GetLocationReviewsUseCase
import com.ftw.domain.usecase.searchaddressbuilding.GetSearchAddressBuildingUseCase
import com.ftw.domain.usecase.myreviews.GetMyReviewsUseCase
import com.ftw.hometerview.dispatcher.Dispatcher
import com.ftw.hometerview.ui.buildingreview.BuildingReviewViewModel
import com.ftw.hometerview.ui.main.MainViewModel
import com.ftw.hometerview.ui.main.home.review.LocationReviewListViewModel
import com.ftw.hometerview.ui.manageaccount.ManageAccountViewModel
import com.ftw.hometerview.ui.searchaddressbuilding.SearchAddressBuildingViewModel
import com.ftw.hometerview.ui.searchcompanyresult.SearchCompanyResultViewModel
import com.ftw.hometerview.ui.splash.SplashViewModel
import com.ftw.hometerview.ui.updatenickname.UpdateNicknameViewModel
import com.ftw.hometerview.ui.myreviews.MyReviewsViewModel
import com.ftw.hometerview.ui.withdrawal.WithdrawalViewModel
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.android.components.ActivityComponent
import dagger.hilt.android.scopes.ActivityScoped
import dagger.hilt.android.scopes.FragmentScoped
import javax.inject.Named

@Module
Expand Down Expand Up @@ -81,4 +87,42 @@ class ActivityViewModelModule {
getBuildingReviewsUseCase
)
}

@Provides
@ActivityScoped
fun provideUpdateNicknameViewModel(
dispatcher: Dispatcher
): UpdateNicknameViewModel {
return UpdateNicknameViewModel(
dispatcher
)
}

@Provides
@ActivityScoped
fun provideMyReviewsViewModel(
dispatcher: Dispatcher,
getMyReviewsUseCase: GetMyReviewsUseCase
): MyReviewsViewModel {
return MyReviewsViewModel(
dispatcher,
getMyReviewsUseCase
)
}

@Provides
@ActivityScoped
fun provideManageAccountViewModel(): ManageAccountViewModel {
return ManageAccountViewModel()
}

@Provides
@ActivityScoped
fun provideWithdrawalViewModel(
dispatcher: Dispatcher
): WithdrawalViewModel {
return WithdrawalViewModel(
dispatcher
)
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import com.ftw.hometerview.ui.main.favorite.favoritelist.FavoriteBuildingsViewMo
import com.ftw.hometerview.ui.main.favorite.favoritelist.FavoriteReviewsViewModel
import com.ftw.hometerview.ui.main.home.HomeViewModel
import com.ftw.hometerview.ui.main.home.review.LocationReviewListViewModel
import com.ftw.hometerview.ui.main.mypage.MyPageViewModel
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down Expand Up @@ -47,6 +48,18 @@ class MainFragmentViewModelModule {
)
}

@Provides
@FragmentScoped
fun provideUpdateNicknameViewModel(
dispatcher: Dispatcher,
getCachedUserUseCase: GetCachedUserUseCase
): MyPageViewModel {
return MyPageViewModel(
dispatcher,
getCachedUserUseCase
)
}


@Provides
@FragmentScoped
Expand All @@ -71,4 +84,5 @@ class MainFragmentViewModelModule {
getFavoriteReviewsUseCase
)
}

}
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package com.ftw.hometerview.di.usecase

import com.ftw.domain.usecase.myreviews.GetMyReviewsUseCase
import com.ftw.domain.usecase.myreviews.GetMyReviewsUseCaseImpl
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import javax.inject.Singleton

@Module
@InstallIn(SingletonComponent::class)
class MyReviewsUseCaseModule {
@Provides
@Singleton
fun provideGetMyReviewsUseCase(): GetMyReviewsUseCase {
return GetMyReviewsUseCaseImpl()
}
}
41 changes: 41 additions & 0 deletions app/src/main/java/com/ftw/hometerview/ui/dialog/LogoutDialog.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.ftw.hometerview.ui.dialog

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 androidx.fragment.app.DialogFragment
import com.ftw.hometerview.databinding.DialogLogoutBinding

class LogoutDialog() : DialogFragment() {
private var _binding: DialogLogoutBinding? = null
private val binding get() = _binding!!

interface Listener {
fun onClickLogoutFromLogoutDialog()
}

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
_binding = DialogLogoutBinding.inflate(inflater, container, false)
val view = binding.root
dialog?.window?.setBackgroundDrawable(ColorDrawable(Color.TRANSPARENT))
binding.logoutSelect.setOnClickListener {
(parentFragment as? Listener)?.onClickLogoutFromLogoutDialog()
}
binding.logoutCancle.setOnClickListener {
dismiss()
}
return view
}

override fun onDestroyView() {
super.onDestroyView()
_binding = null
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class HomeViewModel(
flow {
emit(getCachedUserUseCase())
}
.catch { emit(User(Company.NONE)) }
.catch { emit(User("", Company.NONE)) }
.collect {
_user.value = it
}
Expand Down
Loading

0 comments on commit 4952707

Please sign in to comment.