[Feat] 바텀 네비게이션 도입 및 기존 캘린더 및 마이페이지 화면 fragment 로 전환 #293
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| package com.eatssu.android.di | ||
|
|
||
| import com.eatssu.android.data.service.MealService | ||
| import com.eatssu.android.data.service.MenuService | ||
| import com.eatssu.android.data.service.ReportService | ||
| import com.eatssu.android.data.service.ReviewService | ||
| import com.eatssu.android.data.service.UserService | ||
| import dagger.Module | ||
| import dagger.Provides | ||
| import dagger.hilt.InstallIn | ||
| import dagger.hilt.components.SingletonComponent | ||
| import retrofit2.Retrofit | ||
| import javax.inject.Singleton | ||
|
|
||
| @Module | ||
| @InstallIn(SingletonComponent::class) | ||
| object ServiceModule { | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideUserService(retrofit: Retrofit): UserService { | ||
| return retrofit.create(UserService::class.java) | ||
| } | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideReportService(retrofit: Retrofit): ReportService { | ||
| return retrofit.create(ReportService::class.java) | ||
| } | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideReviewService(retrofit: Retrofit): ReviewService { | ||
| return retrofit.create(ReviewService::class.java) | ||
| } | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideMealService(retrofit: Retrofit): MealService { | ||
| return retrofit.create(MealService::class.java) | ||
| } | ||
|
|
||
| @Provides | ||
| @Singleton | ||
| fun provideMenuService(retrofit: Retrofit): MenuService { | ||
| return retrofit.create(MenuService::class.java) | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,188 @@ | ||
| package com.eatssu.android.presentation | ||
|
|
||
| import android.Manifest | ||
| import android.annotation.SuppressLint | ||
| import android.content.pm.PackageManager | ||
| import android.os.Build | ||
| import android.os.Bundle | ||
| import android.os.SystemClock | ||
| import android.view.MenuItem | ||
| import android.view.View | ||
| import androidx.activity.viewModels | ||
| import androidx.annotation.RequiresApi | ||
| import androidx.core.app.ActivityCompat | ||
| import androidx.core.content.ContextCompat | ||
| import androidx.lifecycle.lifecycleScope | ||
| import androidx.navigation.fragment.NavHostFragment | ||
| import com.eatssu.android.R | ||
| import com.eatssu.android.databinding.ActivityMainBinding | ||
| import com.eatssu.android.presentation.base.BaseActivity | ||
| import com.eatssu.android.presentation.login.LoginActivity | ||
| import com.eatssu.android.presentation.mypage.MyPageViewModel | ||
| import com.eatssu.android.presentation.mypage.usernamechange.UserNameChangeActivity | ||
| import com.eatssu.android.presentation.util.showToast | ||
| import com.eatssu.android.presentation.util.startActivity | ||
| import com.google.android.material.bottomnavigation.BottomNavigationView | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
| import kotlinx.coroutines.flow.collectLatest | ||
| import kotlinx.coroutines.launch | ||
| import timber.log.Timber | ||
| import java.text.SimpleDateFormat | ||
| import java.util.Locale | ||
|
|
||
| @AndroidEntryPoint | ||
| class MainActivity : BaseActivity<ActivityMainBinding>(ActivityMainBinding::inflate){ | ||
|
|
||
| private val mainViewModel: MainViewModel by viewModels() | ||
| private val myPageViewModel: MyPageViewModel by viewModels() | ||
|
|
||
| @RequiresApi(Build.VERSION_CODES.O) | ||
| @SuppressLint("SuspiciousIndentation") | ||
| override fun onCreate(savedInstanceState: Bundle?) { | ||
| super.onCreate(savedInstanceState) | ||
|
|
||
| setupNoToolbar() | ||
| setNavigation() | ||
|
|
||
| checkAlarmPermission() | ||
| checkNicknameIsNull() | ||
|
|
||
| collectLogoutState() | ||
| } | ||
|
|
||
| private fun setNavigation() { | ||
| val navHostFragment = supportFragmentManager | ||
| .findFragmentById(R.id.nav_host_fragment) as NavHostFragment | ||
| val navController = navHostFragment.navController | ||
|
|
||
| binding.bottomNaviBar.setOnSingleItemSelectedListener { item -> | ||
| when (item.itemId) { | ||
| R.id.cafeteria_menu -> { | ||
| navController.navigate(R.id.homeFragment) | ||
| true | ||
| } | ||
|
|
||
| // R.id.map_menu -> { | ||
| // navController.navigate(R.id.mapFragment) | ||
| // true | ||
| // } | ||
|
|
||
| R.id.mypage_menu -> { | ||
| navController.navigate(R.id.myPageFragment) | ||
| true | ||
| } | ||
|
|
||
| else -> { | ||
| false | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // set UI -- | ||
| private fun setupNoToolbar() { | ||
| // 툴바 사용하지 않도록 설정 | ||
| toolbar.let { | ||
| toolbar.visibility = View.GONE | ||
| toolbarTitle.visibility = View.GONE | ||
| setSupportActionBar(it) | ||
| supportActionBar?.setDisplayHomeAsUpEnabled(false) | ||
| supportActionBar?.setDisplayShowTitleEnabled(false) | ||
| } | ||
| } | ||
|
|
||
| // Permission -- | ||
| // 권한 요청 결과 처리 | ||
| override fun onRequestPermissionsResult( | ||
| requestCode: Int, | ||
| permissions: Array<out String>, | ||
| grantResults: IntArray | ||
| ) { | ||
| super.onRequestPermissionsResult(requestCode, permissions, grantResults) | ||
|
|
||
| val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm", Locale.getDefault()) | ||
|
|
||
| if (requestCode == 1000) { | ||
| if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) { | ||
| // 권한이 승인됨 | ||
| showToast("EAT-SSU 알림 수신을 동의하였습니다.") | ||
| myPageViewModel.setNotificationOn() //바로 알림 받도록 설정 | ||
| } else { | ||
| // 권한이 거부됨 | ||
| showToast("EAT-SSU 알림 수신을 거부하였습니다.\n$dateFormat") | ||
| myPageViewModel.setNotificationOff() //바로 알림 받도록 설정 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 알림 퍼미션 있는지 자가 진단 | ||
| private fun checkAlarmPermission() { | ||
| if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) { | ||
| if (ContextCompat.checkSelfPermission( | ||
| this, | ||
| Manifest.permission.POST_NOTIFICATIONS | ||
| ) != PackageManager.PERMISSION_GRANTED | ||
| ) { | ||
| // 권한이 없다면 요청 | ||
| ActivityCompat.requestPermissions( | ||
| this, | ||
| arrayOf(Manifest.permission.POST_NOTIFICATIONS), | ||
| 1000 | ||
| ) | ||
| } else { | ||
| // 권한이 이미 있어 | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // CollectState -- | ||
| private fun checkNicknameIsNull() { | ||
| Timber.d("관찰 시작") | ||
| mainViewModel.checkNameNull() | ||
|
|
||
| lifecycleScope.launch { | ||
| mainViewModel.uiState.collectLatest { | ||
| if (it.isNicknameNull) { | ||
| //닉네임이 null일 때는 닉네임 설정을 안하면 서비스를 못쓰게 막아야함 | ||
| intent.putExtra("force", true) | ||
| startActivity<UserNameChangeActivity>() | ||
| showToast(it.toastMessage) | ||
| } else { | ||
| showToast(it.toastMessage) //Todo 이게 누구님 반갑습니다. 인데 두번 뜸 | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 로그아웃 처리 | ||
| private fun collectLogoutState() { | ||
| lifecycleScope.launch { | ||
| mainViewModel.uiState.collectLatest { state -> | ||
| if (state.isLoggedOut) { | ||
| showToast(state.toastMessage) | ||
| startActivity<LoginActivity>() | ||
| finishAffinity() | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| // 아래 함수를 View 에서는 사용이 어려워 util 로 빼지 않음 | ||
| private fun BottomNavigationView.setOnSingleItemSelectedListener( | ||
| minInterval: Long = 2000L, | ||
| onSingleItemSelected: (item: MenuItem) -> Boolean | ||
| ) { | ||
| var lastClickTime = 0L | ||
|
|
||
| setOnItemSelectedListener { item -> | ||
| val currentClickTime = SystemClock.uptimeMillis() | ||
| if (currentClickTime - lastClickTime > minInterval) { | ||
| lastClickTime = currentClickTime | ||
| onSingleItemSelected(item) | ||
| } else { | ||
| false // 너무 빠른 클릭 무시 | ||
| } | ||
| } | ||
| } | ||
|
|
||
|
Comment on lines
+170
to
+187
Member
There was a problem hiding this comment. 오호 이거 baseActivity에 할 줄 알았는데, mainActivity에 하셨군요!👍 근데 이제 compose로 짜면 base activity도 의미 없을 것 같아요 그죠? |
||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
아아 xxxService만 따로 뺀거군요. 뭔가 하고 한참 봤네요