feat(main): 레거시 직접 진입을 V2 메인으로 전환한다
This commit is contained in:
@@ -177,8 +177,8 @@
|
||||
<activity android:name=".settings.notification.NotificationSettingsActivity" />
|
||||
<activity android:name=".settings.notification.NotificationReceiveSettingsActivity" />
|
||||
<activity android:name=".settings.ContentSettingsActivity" />
|
||||
<activity android:name=".live.reservation_status.LiveReservationStatusActivity" />
|
||||
<activity android:name=".live.reservation_status.LiveReservationCancelActivity" />
|
||||
<activity android:name=".live.reservation.status.LiveReservationStatusActivity" />
|
||||
<activity android:name=".live.reservation.status.LiveReservationCancelActivity" />
|
||||
<activity android:name=".audio_content.AudioContentActivity" />
|
||||
<activity android:name=".audio_content.detail.AudioContentDetailActivity" />
|
||||
<activity android:name=".audio_content.modify.AudioContentModifyActivity" />
|
||||
|
||||
@@ -96,7 +96,7 @@ import kr.co.vividnext.sodalive.live.LiveRepository
|
||||
import kr.co.vividnext.sodalive.live.LiveViewModel
|
||||
import kr.co.vividnext.sodalive.live.recommend.LiveRecommendApi
|
||||
import kr.co.vividnext.sodalive.live.recommend.LiveRecommendRepository
|
||||
import kr.co.vividnext.sodalive.live.reservation_status.LiveReservationStatusViewModel
|
||||
import kr.co.vividnext.sodalive.live.reservation.status.LiveReservationStatusViewModel
|
||||
import kr.co.vividnext.sodalive.live.room.LiveRoomViewModel
|
||||
import kr.co.vividnext.sodalive.live.room.create.LiveRoomCreateViewModel
|
||||
import kr.co.vividnext.sodalive.live.room.detail.LiveRoomDetailViewModel
|
||||
|
||||
@@ -5,8 +5,8 @@ import io.reactivex.rxjava3.core.Single
|
||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationResponse
|
||||
import kr.co.vividnext.sodalive.live.reservation_status.CancelLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.reservation_status.GetLiveReservationResponse
|
||||
import kr.co.vividnext.sodalive.live.reservation.status.CancelLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.reservation.status.GetLiveReservationResponse
|
||||
import kr.co.vividnext.sodalive.live.room.CancelLiveRequest
|
||||
import kr.co.vividnext.sodalive.live.room.EnterOrQuitLiveRoomRequest
|
||||
import kr.co.vividnext.sodalive.live.room.LiveRoomStatus
|
||||
|
||||
@@ -4,7 +4,7 @@ import io.reactivex.rxjava3.core.Flowable
|
||||
import io.reactivex.rxjava3.core.Single
|
||||
import kr.co.vividnext.sodalive.common.ApiResponse
|
||||
import kr.co.vividnext.sodalive.live.reservation.MakeLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.reservation_status.CancelLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.reservation.status.CancelLiveReservationRequest
|
||||
import kr.co.vividnext.sodalive.live.room.CancelLiveRequest
|
||||
import kr.co.vividnext.sodalive.live.room.EnterOrQuitLiveRoomRequest
|
||||
import kr.co.vividnext.sodalive.live.room.LiveRoomStatus
|
||||
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import androidx.annotation.Keep
|
||||
import com.google.gson.annotations.SerializedName
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import android.os.Parcelable
|
||||
import androidx.annotation.Keep
|
||||
+3
-3
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.Intent
|
||||
@@ -18,10 +18,10 @@ import kr.co.vividnext.sodalive.common.SodaLiveApplicationHolder
|
||||
import kr.co.vividnext.sodalive.databinding.ActivityLiveReservationCancelBinding
|
||||
import kr.co.vividnext.sodalive.extensions.convertDateFormat
|
||||
import kr.co.vividnext.sodalive.extensions.dpToPx
|
||||
import kr.co.vividnext.sodalive.main.MainActivity
|
||||
import kr.co.vividnext.sodalive.mypage.can.status.CanStatusActivity
|
||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||
import kr.co.vividnext.sodalive.settings.language.LocaleHelper
|
||||
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
|
||||
import org.koin.android.ext.android.inject
|
||||
import java.util.Locale
|
||||
import java.util.TimeZone
|
||||
@@ -117,7 +117,7 @@ class LiveReservationCancelActivity : BaseActivity<ActivityLiveReservationCancel
|
||||
|
||||
binding.tvOtherSudaReservation.setOnClickListener {
|
||||
finishAffinity()
|
||||
startActivity(Intent(applicationContext, MainActivity::class.java))
|
||||
startActivity(Intent(applicationContext, MainV2Activity::class.java))
|
||||
}
|
||||
|
||||
binding.tvCheckCanStatus.setOnClickListener {
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.app.Activity
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import android.view.LayoutInflater
|
||||
import android.view.View
|
||||
+1
-1
@@ -1,4 +1,4 @@
|
||||
package kr.co.vividnext.sodalive.live.reservation_status
|
||||
package kr.co.vividnext.sodalive.live.reservation.status
|
||||
|
||||
import androidx.lifecycle.LiveData
|
||||
import androidx.lifecycle.MutableLiveData
|
||||
@@ -120,13 +120,13 @@ import kr.co.vividnext.sodalive.live.roulette.RoulettePreviewDialog
|
||||
import kr.co.vividnext.sodalive.live.roulette.RouletteSpinDialog
|
||||
import kr.co.vividnext.sodalive.live.roulette.config.RouletteConfigActivity
|
||||
import kr.co.vividnext.sodalive.main.DeepLinkActivity
|
||||
import kr.co.vividnext.sodalive.main.MainActivity
|
||||
import kr.co.vividnext.sodalive.report.ProfileReportDialog
|
||||
import kr.co.vividnext.sodalive.report.ReportType
|
||||
import kr.co.vividnext.sodalive.report.UserReportDialog
|
||||
import kr.co.vividnext.sodalive.settings.ContentSettingsActivity
|
||||
import kr.co.vividnext.sodalive.settings.language.LanguageManager
|
||||
import kr.co.vividnext.sodalive.settings.notification.MemberRole
|
||||
import kr.co.vividnext.sodalive.v2.main.MainV2Activity
|
||||
import org.json.JSONObject
|
||||
import org.koin.android.ext.android.inject
|
||||
import java.util.concurrent.TimeUnit
|
||||
@@ -379,7 +379,7 @@ class LiveRoomActivity : BaseActivity<ActivityLiveRoomBinding>(ActivityLiveRoomB
|
||||
val bundle = intent?.getBundleExtra(Constants.EXTRA_DATA) ?: return
|
||||
|
||||
showDeepLinkNavigationDialog {
|
||||
val nextIntent = Intent(applicationContext, MainActivity::class.java).apply {
|
||||
val nextIntent = Intent(applicationContext, MainV2Activity::class.java).apply {
|
||||
addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP)
|
||||
putExtra(Constants.EXTRA_DATA, bundle)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user