diff --git a/app/src/main/java/com/android/trisolarispms/MainActivity.kt b/app/src/main/java/com/android/trisolarispms/MainActivity.kt index 0a0c1f8..54ed886 100644 --- a/app/src/main/java/com/android/trisolarispms/MainActivity.kt +++ b/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() { diff --git a/app/src/main/java/com/android/trisolarispms/auth/AuthzPolicy.kt b/app/src/main/java/com/android/trisolarispms/core/auth/AuthzPolicy.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/auth/AuthzPolicy.kt rename to app/src/main/java/com/android/trisolarispms/core/auth/AuthzPolicy.kt index 7a06d66..b7c8fe4 100644 --- a/app/src/main/java/com/android/trisolarispms/auth/AuthzPolicy.kt +++ b/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, diff --git a/app/src/main/java/com/android/trisolarispms/auth/Role.kt b/app/src/main/java/com/android/trisolarispms/core/auth/Role.kt similarity index 93% rename from app/src/main/java/com/android/trisolarispms/auth/Role.kt rename to app/src/main/java/com/android/trisolarispms/core/auth/Role.kt index 1eb953c..8651e25 100644 --- a/app/src/main/java/com/android/trisolarispms/auth/Role.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/ApiService.kt b/app/src/main/java/com/android/trisolarispms/data/api/ApiService.kt deleted file mode 100644 index 5f425be..0000000 --- a/app/src/main/java/com/android/trisolarispms/data/api/ApiService.kt +++ /dev/null @@ -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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/ApiClient.kt b/app/src/main/java/com/android/trisolarispms/data/api/core/ApiClient.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/data/api/ApiClient.kt rename to app/src/main/java/com/android/trisolarispms/data/api/core/ApiClient.kt index de17e2e..7d3f8b2 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/ApiClient.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/ApiConstants.kt b/app/src/main/java/com/android/trisolarispms/data/api/core/ApiConstants.kt similarity index 63% rename from app/src/main/java/com/android/trisolarispms/data/api/ApiConstants.kt rename to app/src/main/java/com/android/trisolarispms/data/api/core/ApiConstants.kt index a60b3ce..7b80fa0 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/ApiConstants.kt +++ b/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/" diff --git a/app/src/main/java/com/android/trisolarispms/data/api/core/ApiService.kt b/app/src/main/java/com/android/trisolarispms/data/api/core/ApiService.kt new file mode 100644 index 0000000..c684fb7 --- /dev/null +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/AuthTokenProvider.kt b/app/src/main/java/com/android/trisolarispms/data/api/core/AuthTokenProvider.kt similarity index 66% rename from app/src/main/java/com/android/trisolarispms/data/api/AuthTokenProvider.kt rename to app/src/main/java/com/android/trisolarispms/data/api/core/AuthTokenProvider.kt index d3f773a..4ae7376 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/AuthTokenProvider.kt +++ b/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? diff --git a/app/src/main/java/com/android/trisolarispms/data/api/FirebaseAuthTokenProvider.kt b/app/src/main/java/com/android/trisolarispms/data/api/core/FirebaseAuthTokenProvider.kt similarity index 88% rename from app/src/main/java/com/android/trisolarispms/data/api/FirebaseAuthTokenProvider.kt rename to app/src/main/java/com/android/trisolarispms/data/api/core/FirebaseAuthTokenProvider.kt index 9b75dd5..c0711ce 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/FirebaseAuthTokenProvider.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/AmenityApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/AmenityApi.kt similarity index 95% rename from app/src/main/java/com/android/trisolarispms/data/api/AmenityApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/AmenityApi.kt index 58f0d35..d970a5e 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/AmenityApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/AuthApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/AuthApi.kt similarity index 92% rename from app/src/main/java/com/android/trisolarispms/data/api/AuthApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/AuthApi.kt index c71826b..bd061f9 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/AuthApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/BookingApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/BookingApi.kt similarity index 99% rename from app/src/main/java/com/android/trisolarispms/data/api/BookingApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/BookingApi.kt index 3697831..50d23ba 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/BookingApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/CardApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/CardApi.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/data/api/CardApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/CardApi.kt index edc7891..6d0533f 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/CardApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/GuestApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/GuestApi.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/data/api/GuestApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/GuestApi.kt index 95a556a..0ff31c9 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/GuestApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/GuestDocumentApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/GuestDocumentApi.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/data/api/GuestDocumentApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/GuestDocumentApi.kt index 3b4157d..b08f2b6 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/GuestDocumentApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/ImageTagApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/ImageTagApi.kt similarity index 93% rename from app/src/main/java/com/android/trisolarispms/data/api/ImageTagApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/ImageTagApi.kt index 74dbc8f..140f700 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/ImageTagApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/InboundEmailApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/InboundEmailApi.kt similarity index 94% rename from app/src/main/java/com/android/trisolarispms/data/api/InboundEmailApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/InboundEmailApi.kt index bb08af3..548e2ff 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/InboundEmailApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/PropertyApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/PropertyApi.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/data/api/PropertyApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/PropertyApi.kt index b814066..2846439 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/PropertyApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RatePlanApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RatePlanApi.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/data/api/RatePlanApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RatePlanApi.kt index a330435..bc76f41 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RatePlanApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RazorpaySettingsApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RazorpaySettingsApi.kt similarity index 93% rename from app/src/main/java/com/android/trisolarispms/data/api/RazorpaySettingsApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RazorpaySettingsApi.kt index dd394d8..5ba9904 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RazorpaySettingsApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RoomApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RoomApi.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/data/api/RoomApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RoomApi.kt index 34afc26..ed550f8 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RoomApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RoomImageApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RoomImageApi.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/data/api/RoomImageApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RoomImageApi.kt index 9498442..89f2bb9 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RoomImageApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RoomStayApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RoomStayApi.kt similarity index 93% rename from app/src/main/java/com/android/trisolarispms/data/api/RoomStayApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RoomStayApi.kt index f6dd392..4083cbc 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RoomStayApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/RoomTypeApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/RoomTypeApi.kt similarity index 96% rename from app/src/main/java/com/android/trisolarispms/data/api/RoomTypeApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/RoomTypeApi.kt index 09c93bb..8552424 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/RoomTypeApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/TransportApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/TransportApi.kt similarity index 86% rename from app/src/main/java/com/android/trisolarispms/data/api/TransportApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/TransportApi.kt index efa0e93..6cf46b2 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/TransportApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/data/api/UserAdminApi.kt b/app/src/main/java/com/android/trisolarispms/data/api/service/UserAdminApi.kt similarity index 96% rename from app/src/main/java/com/android/trisolarispms/data/api/UserAdminApi.kt rename to app/src/main/java/com/android/trisolarispms/data/api/service/UserAdminApi.kt index f2b75a6..e7e4251 100644 --- a/app/src/main/java/com/android/trisolarispms/data/api/UserAdminApi.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/auth/AuthUiState.kt b/app/src/main/java/com/android/trisolarispms/ui/auth/AuthUiState.kt index edf0a36..0a22074 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/auth/AuthUiState.kt +++ b/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", diff --git a/app/src/main/java/com/android/trisolarispms/ui/auth/AuthViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/auth/AuthViewModel.kt index c060a5e..41f4d78 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/auth/AuthViewModel.kt +++ b/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.auth.toRoles -import com.android.trisolarispms.data.api.ApiClient +import com.android.trisolarispms.core.auth.Role +import com.android.trisolarispms.core.auth.toRoles +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateViewModel.kt index a883420..3ae3b83 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingCreateViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingExpectedDatesScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/booking/BookingExpectedDatesScreen.kt index 0fa4a63..2f1db3b 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/booking/BookingExpectedDatesScreen.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/card/CardInfoScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/card/CardInfoScreen.kt index 28eec4c..128235d 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/card/CardInfoScreen.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/card/IssueTemporaryCardViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/card/IssueTemporaryCardViewModel.kt index 650d215..276b307 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/card/IssueTemporaryCardViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/guest/GuestInfoViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/guest/GuestInfoViewModel.kt index 5862408..84e1015 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/guest/GuestInfoViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/guest/GuestSignatureViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/guest/GuestSignatureViewModel.kt index 9990c3a..9152b9a 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/guest/GuestSignatureViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsTab.kt b/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsTab.kt index fbdb26d..528edb1 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsTab.kt +++ b/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.FirebaseAuthTokenProvider +import com.android.trisolarispms.data.api.core.ApiConstants +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsViewModel.kt index 4e7e29d..645cf61 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/guestdocs/GuestDocumentsViewModel.kt +++ b/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.ApiConstants +import com.android.trisolarispms.data.api.core.ApiClient +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/home/HomeJoinPropertyViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/home/HomeJoinPropertyViewModel.kt index dac5579..eab11ea 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/home/HomeJoinPropertyViewModel.kt +++ b/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.auth.toRoles -import com.android.trisolarispms.data.api.ApiClient +import com.android.trisolarispms.core.auth.Role +import com.android.trisolarispms.core.auth.toRoles +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/home/HomeScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/home/HomeScreen.kt index d90920b..5939278 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/home/HomeScreen.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/AppRoute.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/AppRoute.kt similarity index 98% rename from app/src/main/java/com/android/trisolarispms/ui/AppRoute.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/AppRoute.kt index 88b083b..acd8178 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/AppRoute.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/MainBackNavigation.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainBackNavigation.kt similarity index 96% rename from app/src/main/java/com/android/trisolarispms/MainBackNavigation.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainBackNavigation.kt index 675e529..81f3ab4 100644 --- a/app/src/main/java/com/android/trisolarispms/MainBackNavigation.kt +++ b/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.ui.AppRoute +import com.android.trisolarispms.core.auth.AuthzPolicy +import com.android.trisolarispms.ui.navigation.AppRoute internal fun handleBackNavigation( refs: MainUiRefs, diff --git a/app/src/main/java/com/android/trisolarispms/MainRouteContent.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainRouteContent.kt similarity index 95% rename from app/src/main/java/com/android/trisolarispms/MainRouteContent.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainRouteContent.kt index c4f56db..f8d67cd 100644 --- a/app/src/main/java/com/android/trisolarispms/MainRouteContent.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/MainRoutesBooking.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesBooking.kt similarity index 95% rename from app/src/main/java/com/android/trisolarispms/MainRoutesBooking.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesBooking.kt index 02134fc..80a7a8b 100644 --- a/app/src/main/java/com/android/trisolarispms/MainRoutesBooking.kt +++ b/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.ui.AppRoute +import com.android.trisolarispms.core.auth.AuthzPolicy +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 diff --git a/app/src/main/java/com/android/trisolarispms/MainRoutesHomeGuest.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesHomeGuest.kt similarity index 96% rename from app/src/main/java/com/android/trisolarispms/MainRoutesHomeGuest.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesHomeGuest.kt index 57cc628..c822cb0 100644 --- a/app/src/main/java/com/android/trisolarispms/MainRoutesHomeGuest.kt +++ b/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.ui.AppRoute +import com.android.trisolarispms.core.auth.Role +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 diff --git a/app/src/main/java/com/android/trisolarispms/MainRoutesManagement.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesManagement.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/MainRoutesManagement.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesManagement.kt index be197df..32fca44 100644 --- a/app/src/main/java/com/android/trisolarispms/MainRoutesManagement.kt +++ b/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.auth.toRoleNameList +import com.android.trisolarispms.core.auth.AuthzPolicy +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 diff --git a/app/src/main/java/com/android/trisolarispms/MainRoutesStayFlow.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesStayFlow.kt similarity index 97% rename from app/src/main/java/com/android/trisolarispms/MainRoutesStayFlow.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainRoutesStayFlow.kt index 7901383..a64be35 100644 --- a/app/src/main/java/com/android/trisolarispms/MainRoutesStayFlow.kt +++ b/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.ui.AppRoute +import com.android.trisolarispms.core.auth.AuthzPolicy +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 diff --git a/app/src/main/java/com/android/trisolarispms/MainUiRefs.kt b/app/src/main/java/com/android/trisolarispms/ui/navigation/MainUiRefs.kt similarity index 92% rename from app/src/main/java/com/android/trisolarispms/MainUiRefs.kt rename to app/src/main/java/com/android/trisolarispms/ui/navigation/MainUiRefs.kt index 150057b..2fd7df2 100644 --- a/app/src/main/java/com/android/trisolarispms/MainUiRefs.kt +++ b/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( diff --git a/app/src/main/java/com/android/trisolarispms/ui/payment/BookingPaymentsViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/payment/BookingPaymentsViewModel.kt index 3fc5e83..a9dbbcd 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/payment/BookingPaymentsViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/property/AddPropertyViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/property/AddPropertyViewModel.kt index 4602d0c..ecbac39 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/property/AddPropertyViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/property/PropertyListViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/property/PropertyListViewModel.kt index 038a7bc..9ea528c 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/property/PropertyListViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpayQrViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpayQrViewModel.kt index 79d9737..014baec 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpayQrViewModel.kt +++ b/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.ApiConstants +import com.android.trisolarispms.data.api.core.ApiClient +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpaySettingsViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpaySettingsViewModel.kt index 2006ebd..982d048 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/razorpay/RazorpaySettingsViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/room/RoomFormViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/room/RoomFormViewModel.kt index c55edaf..978a263 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/room/RoomFormViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/room/RoomListViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/room/RoomListViewModel.kt index 1079624..b379f96 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/room/RoomListViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagFormViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagFormViewModel.kt index 5d43d14..d86a1ea 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagFormViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagViewModel.kt index f6913d3..b05a061 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomimage/ImageTagViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomimage/RoomImageViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomimage/RoomImageViewModel.kt index faa4f31..85b97dd 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomimage/RoomImageViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysViewModel.kt index d6959aa..d18f047 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ActiveRoomStaysViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsTabsScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsTabsScreen.kt index 63d4ec3..87d4387 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsTabsScreen.kt +++ b/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.FirebaseAuthTokenProvider +import com.android.trisolarispms.data.api.core.ApiConstants +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsViewModel.kt index 3e93a2b..b8ff7c0 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingDetailsViewModel.kt +++ b/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.ApiConstants +import com.android.trisolarispms.data.api.core.ApiClient +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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingRoomStaysViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingRoomStaysViewModel.kt index a15c5b8..56913da 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/BookingRoomStaysViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStayRatesViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStayRatesViewModel.kt index 6046bab..48795c1 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStayRatesViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStaySelectViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStaySelectViewModel.kt index 0eb8455..805183c 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomstay/ManageRoomStaySelectViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenitiesScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenitiesScreen.kt index 87b8cf8..372e87a 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenitiesScreen.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormScreen.kt index f098d0a..8bb30f2 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormScreen.kt +++ b/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) diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormViewModel.kt index 1916c7a..2f3cbc0 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityFormViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityListViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityListViewModel.kt index 63e43eb..bed0231 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/AmenityListViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RatePlanViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/RatePlanViewModel.kt index 01269c3..655d0eb 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RatePlanViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormScreen.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormScreen.kt index e88565f..287b3ed 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormScreen.kt +++ b/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) diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormViewModel.kt index 9aa3a31..6b771b2 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeFormViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeListViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeListViewModel.kt index f152ce7..8c339ac 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/roomtype/RoomTypeListViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/users/PropertyUsersViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/users/PropertyUsersViewModel.kt index 01fd135..04d3d4b 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/users/PropertyUsersViewModel.kt +++ b/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 diff --git a/app/src/main/java/com/android/trisolarispms/ui/users/UserCards.kt b/app/src/main/java/com/android/trisolarispms/ui/users/UserCards.kt index 1aaada6..3e641c7 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/users/UserCards.kt +++ b/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.auth.toRoles +import com.android.trisolarispms.core.auth.Role +import com.android.trisolarispms.core.auth.toRoles @Composable fun PropertyUserCard( diff --git a/app/src/main/java/com/android/trisolarispms/ui/users/UserDirectoryViewModel.kt b/app/src/main/java/com/android/trisolarispms/ui/users/UserDirectoryViewModel.kt index d0c5f02..8cef723 100644 --- a/app/src/main/java/com/android/trisolarispms/ui/users/UserDirectoryViewModel.kt +++ b/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