Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ android {
applicationId = "com.eatssu.android"
minSdk = 28
targetSdk = 37
versionCode = 71
versionName = "3.2.16"
versionCode = 72
versionName = "3.2.17"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
Expand Down
22 changes: 13 additions & 9 deletions app/src/main/java/com/eatssu/android/presentation/MainActivity.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.eatssu.android.presentation

import android.Manifest
import android.annotation.SuppressLint
import android.content.pm.PackageManager
import android.Manifest
import android.os.Build
import android.os.Bundle
import android.os.SystemClock
Expand All @@ -13,32 +13,33 @@ import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
import androidx.core.os.bundleOf
import androidx.lifecycle.lifecycleScope
import androidx.navigation.NavController
import androidx.navigation.fragment.NavHostFragment
import androidx.navigation.NavController
import androidx.work.WorkManager
import com.eatssu.android.R
import com.eatssu.android.databinding.ActivityMainBinding
import com.eatssu.android.domain.model.PartnershipRestaurant
import com.eatssu.android.presentation.base.BaseActivity
import com.eatssu.android.presentation.event.AnyoneButMeEventPopupController
import com.eatssu.android.presentation.event.AnyoneButMeEventTooltipController
import com.eatssu.android.presentation.favorite.FavoriteDetailFragment
import com.eatssu.android.presentation.favorite.FavoriteFragment
import com.eatssu.android.presentation.login.LoginActivity
import com.eatssu.android.presentation.mypage.MyPageViewModel
import com.eatssu.android.presentation.mypage.userinfo.UserInfoActivity
import com.eatssu.android.presentation.util.showInfoToast
import com.eatssu.android.presentation.util.showToast
import com.eatssu.android.presentation.util.startActivity
import com.eatssu.android.R
import com.eatssu.common.enums.ScreenId
import com.eatssu.common.UiEvent
import com.eatssu.common.UiState
import com.eatssu.common.enums.ScreenId
import com.google.android.material.bottomnavigation.BottomNavigationView
import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch
import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
import java.time.LocalDateTime
import javax.inject.Inject
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch


@AndroidEntryPoint
Expand Down Expand Up @@ -131,9 +132,12 @@ class MainActivity : BaseActivity<ActivityMainBinding>(
}
}

fun openFavoriteTab() {
fun openFavoriteTab(showPartnership: Boolean = false) {
if (navController.currentDestination?.id != R.id.favoriteFragment) {
navController.navigate(R.id.favoriteFragment)
navController.navigate(
R.id.favoriteFragment,
bundleOf(FavoriteFragment.ARG_SHOW_PARTNERSHIP to showPartnership),
)
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ import javax.inject.Inject
@AndroidEntryPoint
class FavoriteFragment : Fragment() {

companion object {
const val ARG_SHOW_PARTNERSHIP = "show_partnership"
}

@Inject
lateinit var analyticsTracker: AnalyticsTracker

Expand All @@ -32,7 +36,7 @@ class FavoriteFragment : Fragment() {
EatssuTheme {
FavoriteRoute(
viewModel = viewModel,
onBackToMap = { mainActivity().openMapTab() },
showPartnership = arguments?.getBoolean(ARG_SHOW_PARTNERSHIP) == true,
onPartnershipClick = mainActivity()::openFavoriteDetail,
)
}
Expand Down
Loading
Loading