manage packages

app/src/main/java/com/android/trisolarispms/MainActivity.kt

@@ -11,6 +11,7 @@ import com.android.trisolarispms.ui.auth.AuthScreen
 import com.android.trisolarispms.ui.auth.AuthViewModel
 import com.android.trisolarispms.ui.auth.NameScreen
 import com.android.trisolarispms.ui.auth.UnauthorizedScreen
+import com.android.trisolarispms.ui.navigation.MainRouteContent
 import com.android.trisolarispms.ui.theme.TrisolarisPMSTheme
 
 class MainActivity : ComponentActivity() {

app/src/main/java/com/android/trisolarispms/core/auth/AuthzPolicy.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.auth
+package com.android.trisolarispms.core.auth
 
 class AuthzPolicy(
     private val isSuperAdmin: Boolean,

app/src/main/java/com/android/trisolarispms/core/auth/Role.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.auth
+package com.android.trisolarispms.core.auth
 
 import java.util.Locale
 

app/src/main/java/com/android/trisolarispms/data/api/ApiService.kt

@@ -1,20 +0,0 @@
-package com.android.trisolarispms.data.api
-
-interface ApiService :
-    AuthApi,
-    PropertyApi,
-    RoomTypeApi,
-    RoomApi,
-    RoomImageApi,
-    ImageTagApi,
-    BookingApi,
-    RoomStayApi,
-    CardApi,
-    GuestApi,
-    GuestDocumentApi,
-    TransportApi,
-    InboundEmailApi,
-    AmenityApi,
-    RatePlanApi,
-    RazorpaySettingsApi,
-    UserAdminApi

app/src/main/java/com/android/trisolarispms/data/api/core/ApiClient.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.core
 
 import com.google.firebase.auth.FirebaseAuth
 import okhttp3.Authenticator

app/src/main/java/com/android/trisolarispms/data/api/core/ApiConstants.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.core
 
 object ApiConstants {
     const val BASE_URL = "https://api.hoteltrisolaris.in/"

app/src/main/java/com/android/trisolarispms/data/api/core/ApiService.kt

@@ -0,0 +1,38 @@
+package com.android.trisolarispms.data.api.core
+
+import com.android.trisolarispms.data.api.service.AmenityApi
+import com.android.trisolarispms.data.api.service.AuthApi
+import com.android.trisolarispms.data.api.service.BookingApi
+import com.android.trisolarispms.data.api.service.CardApi
+import com.android.trisolarispms.data.api.service.GuestApi
+import com.android.trisolarispms.data.api.service.GuestDocumentApi
+import com.android.trisolarispms.data.api.service.ImageTagApi
+import com.android.trisolarispms.data.api.service.InboundEmailApi
+import com.android.trisolarispms.data.api.service.PropertyApi
+import com.android.trisolarispms.data.api.service.RatePlanApi
+import com.android.trisolarispms.data.api.service.RazorpaySettingsApi
+import com.android.trisolarispms.data.api.service.RoomApi
+import com.android.trisolarispms.data.api.service.RoomImageApi
+import com.android.trisolarispms.data.api.service.RoomStayApi
+import com.android.trisolarispms.data.api.service.RoomTypeApi
+import com.android.trisolarispms.data.api.service.TransportApi
+import com.android.trisolarispms.data.api.service.UserAdminApi
+
+interface ApiService :
+    AuthApi,
+    PropertyApi,
+    RoomTypeApi,
+    RoomApi,
+    RoomImageApi,
+    ImageTagApi,
+    BookingApi,
+    RoomStayApi,
+    CardApi,
+    GuestApi,
+    GuestDocumentApi,
+    TransportApi,
+    InboundEmailApi,
+    AmenityApi,
+    RatePlanApi,
+    RazorpaySettingsApi,
+    UserAdminApi

app/src/main/java/com/android/trisolarispms/data/api/core/AuthTokenProvider.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.core
 
 interface AuthTokenProvider {
     suspend fun token(forceRefresh: Boolean = false): String?

app/src/main/java/com/android/trisolarispms/data/api/core/FirebaseAuthTokenProvider.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.core
 
 import com.google.firebase.auth.FirebaseAuth
 import kotlinx.coroutines.tasks.await

app/src/main/java/com/android/trisolarispms/data/api/service/AmenityApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.AmenityCreateRequest
 import com.android.trisolarispms.data.api.model.AmenityDto

app/src/main/java/com/android/trisolarispms/data/api/service/AuthApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.AuthVerifyResponse
 import com.android.trisolarispms.data.api.model.AuthMeUpdateRequest

app/src/main/java/com/android/trisolarispms/data/api/service/BookingApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.ActionResponse
 import com.android.trisolarispms.data.api.model.BookingCancelRequest

app/src/main/java/com/android/trisolarispms/data/api/service/CardApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.CardPrepareRequest
 import com.android.trisolarispms.data.api.model.CardPrepareResponse

app/src/main/java/com/android/trisolarispms/data/api/service/GuestApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.GuestDto
 import com.android.trisolarispms.data.api.model.GuestCreateRequest

app/src/main/java/com/android/trisolarispms/data/api/service/GuestDocumentApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.GuestDocumentDto
 import okhttp3.MultipartBody

app/src/main/java/com/android/trisolarispms/data/api/service/ImageTagApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.RoomImageTagDto
 import retrofit2.Response

app/src/main/java/com/android/trisolarispms/data/api/service/InboundEmailApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.ActionResponse
 import okhttp3.MultipartBody

app/src/main/java/com/android/trisolarispms/data/api/service/PropertyApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.ActionResponse
 import com.android.trisolarispms.data.api.model.PropertyCreateRequest

app/src/main/java/com/android/trisolarispms/data/api/service/RatePlanApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.RatePlanCalendarEntry
 import com.android.trisolarispms.data.api.model.RatePlanCalendarUpsertRequest

app/src/main/java/com/android/trisolarispms/data/api/service/RazorpaySettingsApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.RazorpaySettingsRequest
 import com.android.trisolarispms.data.api.model.RazorpaySettingsResponse

app/src/main/java/com/android/trisolarispms/data/api/service/RoomApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.RoomAvailabilityRangeResponse
 import com.android.trisolarispms.data.api.model.RoomAvailabilityResponse

app/src/main/java/com/android/trisolarispms/data/api/service/RoomImageApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.ImageDto
 import okhttp3.MultipartBody

app/src/main/java/com/android/trisolarispms/data/api/service/RoomStayApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.RoomChangeRequest
 import com.android.trisolarispms.data.api.model.RoomChangeResponse

app/src/main/java/com/android/trisolarispms/data/api/service/RoomTypeApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.ActionResponse
 import com.android.trisolarispms.data.api.model.RoomTypeCreateRequest

app/src/main/java/com/android/trisolarispms/data/api/service/TransportApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.TransportModeDto
 import retrofit2.Response

app/src/main/java/com/android/trisolarispms/data/api/service/UserAdminApi.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.data.api
+package com.android.trisolarispms.data.api.service
 
 import com.android.trisolarispms.data.api.model.AppUserSummaryResponse
 import com.android.trisolarispms.data.api.model.PropertyAccessCodeCreateRequest

app/src/main/java/com/android/trisolarispms/ui/auth/AuthUiState.kt

@@ -1,6 +1,6 @@
 package com.android.trisolarispms.ui.auth
 
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
 
 data class AuthUiState(
     val countryCode: String = "+91",

app/src/main/java/com/android/trisolarispms/ui/auth/AuthViewModel.kt

@@ -3,9 +3,9 @@ package com.android.trisolarispms.ui.auth
 import androidx.activity.ComponentActivity
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
-import com.android.trisolarispms.auth.toRoles
+import com.android.trisolarispms.core.auth.toRoles
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.google.firebase.FirebaseException
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.PhoneAuthCredential

app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.booking
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.BookingCreateRequest
 import com.android.trisolarispms.data.api.model.BookingCreateResponse
 import com.android.trisolarispms.data.api.model.GuestDto

app/src/main/java/com/android/trisolarispms/ui/booking/BookingExpectedDatesScreen.kt

@@ -37,7 +37,7 @@ import androidx.compose.ui.Alignment
 import androidx.compose.ui.graphics.Color
 import kotlinx.coroutines.launch
 import androidx.compose.runtime.rememberCoroutineScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.BookingExpectedDatesRequest
 import com.kizitonwose.calendar.compose.HorizontalCalendar
 import com.kizitonwose.calendar.compose.rememberCalendarState

app/src/main/java/com/android/trisolarispms/ui/card/CardInfoScreen.kt

@@ -38,7 +38,7 @@ import com.airbnb.lottie.compose.LottieCompositionSpec
 import com.airbnb.lottie.compose.LottieConstants
 import com.airbnb.lottie.compose.animateLottieCompositionAsState
 import com.airbnb.lottie.compose.rememberLottieComposition
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import java.util.Calendar
 import java.util.Date
 import kotlinx.coroutines.launch

app/src/main/java/com/android/trisolarispms/ui/card/IssueTemporaryCardViewModel.kt

@@ -5,7 +5,7 @@ import android.nfc.tech.MifareClassic
 import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.CardPrepareRequest
 import com.android.trisolarispms.data.api.model.IssueCardRequest
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/android/trisolarispms/ui/guest/GuestInfoViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.guest
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.GuestDto
 import com.android.trisolarispms.data.api.model.GuestUpdateRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/guest/GuestSignatureViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.guest
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsTab.kt

@@ -48,8 +48,8 @@ import coil.ImageLoader
 import coil.compose.SubcomposeAsyncImage
 import coil.decode.SvgDecoder
 import coil.request.ImageRequest
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
-import com.android.trisolarispms.data.api.FirebaseAuthTokenProvider
+import com.android.trisolarispms.data.api.core.FirebaseAuthTokenProvider
 import com.android.trisolarispms.data.api.model.GuestDocumentDto
 import com.google.firebase.auth.FirebaseAuth
 import okhttp3.Interceptor

app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsViewModel.kt

@@ -5,8 +5,8 @@ import android.content.Context
 import android.net.Uri
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 import com.android.trisolarispms.data.api.model.GuestDocumentDto
 import com.google.gson.Gson
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/home/HomeJoinPropertyViewModel.kt

@@ -2,9 +2,9 @@ package com.android.trisolarispms.ui.home
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
-import com.android.trisolarispms.auth.toRoles
+import com.android.trisolarispms.core.auth.toRoles
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.PropertyAccessCodeJoinRequest
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/android/trisolarispms/ui/home/HomeScreen.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
 import com.android.trisolarispms.ui.property.PropertyListViewModel
 import androidx.compose.foundation.text.KeyboardOptions
 

app/src/main/java/com/android/trisolarispms/ui/navigation/AppRoute.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms.ui
+package com.android.trisolarispms.ui.navigation
 
 sealed interface AppRoute {
     data object Home : AppRoute

app/src/main/java/com/android/trisolarispms/ui/navigation/MainBackNavigation.kt

@@ -1,7 +1,7 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
-import com.android.trisolarispms.auth.AuthzPolicy
+import com.android.trisolarispms.core.auth.AuthzPolicy
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 
 internal fun handleBackNavigation(
     refs: MainUiRefs,

app/src/main/java/com/android/trisolarispms/ui/navigation/MainRouteContent.kt

@@ -1,17 +1,17 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.activity.compose.BackHandler
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
-import com.android.trisolarispms.auth.AuthzPolicy
+import com.android.trisolarispms.core.auth.AuthzPolicy
 import com.android.trisolarispms.data.api.model.AmenityDto
 import com.android.trisolarispms.data.api.model.GuestDto
 import com.android.trisolarispms.data.api.model.RoomDto
 import com.android.trisolarispms.data.api.model.RoomImageTagDto
 import com.android.trisolarispms.data.api.model.RoomTypeDto
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.auth.AuthUiState
 import com.android.trisolarispms.ui.auth.AuthViewModel
 import com.android.trisolarispms.ui.roomstay.ManageRoomStaySelection

app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesBooking.kt

@@ -1,8 +1,8 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.compose.runtime.Composable
-import com.android.trisolarispms.auth.AuthzPolicy
+import com.android.trisolarispms.core.auth.AuthzPolicy
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.booking.BookingExpectedDatesScreen
 import com.android.trisolarispms.ui.payment.BookingPaymentsScreen
 import com.android.trisolarispms.ui.roomstay.BookingDetailsTabsScreen

app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesHomeGuest.kt

@@ -1,8 +1,8 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.compose.runtime.Composable
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.auth.AuthUiState
 import com.android.trisolarispms.ui.auth.AuthViewModel
 import com.android.trisolarispms.ui.booking.BookingCreateScreen

app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesManagement.kt

@@ -1,12 +1,12 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.compose.runtime.Composable
-import com.android.trisolarispms.auth.AuthzPolicy
+import com.android.trisolarispms.core.auth.AuthzPolicy
-import com.android.trisolarispms.auth.toRoleNameList
+import com.android.trisolarispms.core.auth.toRoleNameList
 import com.android.trisolarispms.data.api.model.AmenityDto
 import com.android.trisolarispms.data.api.model.RoomImageTagDto
 import com.android.trisolarispms.data.api.model.RoomTypeDto
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.card.CardInfoScreen
 import com.android.trisolarispms.ui.card.IssueTemporaryCardScreen
 import com.android.trisolarispms.ui.room.RoomFormScreen

app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesStayFlow.kt

@@ -1,8 +1,8 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.compose.runtime.Composable
-import com.android.trisolarispms.auth.AuthzPolicy
+import com.android.trisolarispms.core.auth.AuthzPolicy
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.auth.AuthUiState
 import com.android.trisolarispms.ui.auth.AuthViewModel
 import com.android.trisolarispms.ui.razorpay.RazorpayQrScreen

app/src/main/java/com/android/trisolarispms/ui/navigation/MainUiRefs.kt

@@ -1,4 +1,4 @@
-package com.android.trisolarispms
+package com.android.trisolarispms.ui.navigation
 
 import androidx.compose.runtime.MutableState
 import com.android.trisolarispms.data.api.model.AmenityDto
@@ -6,7 +6,7 @@ import com.android.trisolarispms.data.api.model.GuestDto
 import com.android.trisolarispms.data.api.model.RoomDto
 import com.android.trisolarispms.data.api.model.RoomImageTagDto
 import com.android.trisolarispms.data.api.model.RoomTypeDto
-import com.android.trisolarispms.ui.AppRoute
+import com.android.trisolarispms.ui.navigation.AppRoute
 import com.android.trisolarispms.ui.roomstay.ManageRoomStaySelection
 
 internal data class MainUiRefs(

app/src/main/java/com/android/trisolarispms/ui/payment/BookingPaymentsViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.payment
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RazorpayRefundRequest
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/android/trisolarispms/ui/property/AddPropertyViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.property
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.PropertyCreateRequest
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/android/trisolarispms/ui/property/PropertyListViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.property
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpayQrViewModel.kt

@@ -2,8 +2,8 @@ package com.android.trisolarispms.ui.razorpay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 import com.android.trisolarispms.data.api.model.RazorpayCloseRequest
 import com.android.trisolarispms.data.api.model.RazorpayQrEventDto
 import com.android.trisolarispms.data.api.model.RazorpayRequestListItemDto

app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpaySettingsViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.razorpay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RazorpaySettingsRequest
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/android/trisolarispms/ui/room/RoomFormViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.room
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RoomCreateRequest
 import com.android.trisolarispms.data.api.model.RoomUpdateRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/room/RoomListViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.room
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagFormViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomimage
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RoomImageTagDto
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow

app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomimage
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomimage/RoomImageViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomimage
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.ImageDto
 import com.android.trisolarispms.data.api.model.RoomImageReorderRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomstay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsTabsScreen.kt

@@ -53,8 +53,8 @@ import coil.ImageLoader
 import coil.compose.AsyncImage
 import coil.decode.SvgDecoder
 import coil.request.ImageRequest
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
-import com.android.trisolarispms.data.api.FirebaseAuthTokenProvider
+import com.android.trisolarispms.data.api.core.FirebaseAuthTokenProvider
 import com.android.trisolarispms.data.api.model.BookingDetailsResponse
 import com.android.trisolarispms.ui.guestdocs.GuestDocumentsTab
 import com.google.firebase.auth.FirebaseAuth

app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsViewModel.kt

@@ -2,8 +2,8 @@ package com.android.trisolarispms.ui.roomstay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 import com.android.trisolarispms.data.api.model.BookingDetailsResponse
 import com.google.gson.Gson
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingRoomStaysViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomstay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStayRatesViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomstay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.BookingBulkCheckInRequest
 import com.android.trisolarispms.data.api.model.BookingBulkCheckInStayRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStaySelectViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomstay
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenitiesScreen.kt

@@ -33,7 +33,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.android.trisolarispms.data.api.model.AmenityDto
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 import coil.compose.AsyncImage
 
 @Composable

app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormScreen.kt

@@ -43,7 +43,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.window.PopupProperties
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomtype
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.AmenityCreateRequest
 import com.android.trisolarispms.data.api.model.AmenityUpdateRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityListViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomtype
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/roomtype/RatePlanViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomtype
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RatePlanCalendarEntry
 import com.android.trisolarispms.data.api.model.RatePlanCalendarUpsertRequest
 import com.android.trisolarispms.data.api.model.RatePlanRequest

app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormScreen.kt

@@ -44,7 +44,7 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import coil.compose.AsyncImage
-import com.android.trisolarispms.data.api.ApiConstants
+import com.android.trisolarispms.data.api.core.ApiConstants
 
 @Composable
 @OptIn(ExperimentalMaterial3Api::class)

app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomtype
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.RoomTypeCreateRequest
 import com.android.trisolarispms.data.api.model.RoomTypeUpdateRequest
 import kotlinx.coroutines.flow.MutableStateFlow

app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeListViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.roomtype
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/android/trisolarispms/ui/users/PropertyUsersViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.users
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import com.android.trisolarispms.data.api.model.PropertyAccessCodeCreateRequest
 import com.android.trisolarispms.data.api.model.PropertyAccessCodeResponse
 import com.android.trisolarispms.data.api.model.PropertyUserResponse

app/src/main/java/com/android/trisolarispms/ui/users/UserCards.kt

@@ -14,8 +14,8 @@ import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.unit.dp
-import com.android.trisolarispms.auth.Role
+import com.android.trisolarispms.core.auth.Role
-import com.android.trisolarispms.auth.toRoles
+import com.android.trisolarispms.core.auth.toRoles
 
 @Composable
 fun PropertyUserCard(

app/src/main/java/com/android/trisolarispms/ui/users/UserDirectoryViewModel.kt

@@ -2,7 +2,7 @@ package com.android.trisolarispms.ui.users
 
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.android.trisolarispms.data.api.ApiClient
+import com.android.trisolarispms.data.api.core.ApiClient
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.update