diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 917bc45..4a163af 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,11 +7,11 @@ plugins { } android { - namespace = "com.aiosman.riderpro" + namespace = "com.aiosman.ravenow" compileSdk = 34 defaultConfig { - applicationId = "com.aiosman.riderpro" + applicationId = "com.aiosman.ravenow" minSdk = 24 targetSdk = 34 versionCode = 1000016 diff --git a/app/google-services.json b/app/google-services.json index 287dea6..35e9cea 100644 --- a/app/google-services.json +++ b/app/google-services.json @@ -9,7 +9,7 @@ "client_info": { "mobilesdk_app_id": "1:987156664714:android:2c29c11b9cd8be78b9f873", "android_client_info": { - "package_name": "com.aiosman.riderpro" + "package_name": "com.aiosman.ravenow" } }, "oauth_client": [], diff --git a/app/src/androidTest/java/com/aiosman/riderpro/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/aiosman/ravenow/ExampleInstrumentedTest.kt similarity index 85% rename from app/src/androidTest/java/com/aiosman/riderpro/ExampleInstrumentedTest.kt rename to app/src/androidTest/java/com/aiosman/ravenow/ExampleInstrumentedTest.kt index 79a2c03..25911e7 100644 --- a/app/src/androidTest/java/com/aiosman/riderpro/ExampleInstrumentedTest.kt +++ b/app/src/androidTest/java/com/aiosman/ravenow/ExampleInstrumentedTest.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro +package com.aiosman.ravenow import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 @@ -19,6 +19,6 @@ class ExampleInstrumentedTest { fun useAppContext() { // Context of the app under test. val appContext = InstrumentationRegistry.getInstrumentation().targetContext - assertEquals("com.aiosman.riderpro", appContext.packageName) + assertEquals("com.aiosman.ravenow", appContext.packageName) } } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 125842e..8407190 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -87,14 +87,14 @@ android:exported="false"> - + () diff --git a/app/src/main/java/com/aiosman/riderpro/ui/imageviewer/imageviewer.kt b/app/src/main/java/com/aiosman/ravenow/ui/imageviewer/imageviewer.kt similarity index 95% rename from app/src/main/java/com/aiosman/riderpro/ui/imageviewer/imageviewer.kt rename to app/src/main/java/com/aiosman/ravenow/ui/imageviewer/imageviewer.kt index cd78309..35a1553 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/imageviewer/imageviewer.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/imageviewer/imageviewer.kt @@ -37,13 +37,13 @@ import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout -import com.aiosman.riderpro.ui.imageviewer.ImageViewerViewModel -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.utils.FileUtil.saveImageToGallery +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout +import com.aiosman.ravenow.ui.imageviewer.ImageViewerViewModel +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.utils.FileUtil.saveImageToGallery import kotlinx.coroutines.launch import net.engawapg.lib.zoomable.rememberZoomState import net.engawapg.lib.zoomable.zoomable diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/Index.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt similarity index 91% rename from app/src/main/java/com/aiosman/riderpro/ui/index/Index.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt index e5b95da..a4f52df 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/Index.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/Index.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index +package com.aiosman.ravenow.ui.index import androidx.compose.animation.animateColorAsState import androidx.compose.animation.core.tween @@ -28,18 +28,18 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.unit.dp -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.index.tabs.add.AddPage -import com.aiosman.riderpro.ui.index.tabs.message.NotificationsScreen -import com.aiosman.riderpro.ui.index.tabs.moment.MomentsList -import com.aiosman.riderpro.ui.index.tabs.profile.ProfileWrap -import com.aiosman.riderpro.ui.index.tabs.search.DiscoverScreen -import com.aiosman.riderpro.ui.index.tabs.shorts.ShortVideo -import com.aiosman.riderpro.ui.index.tabs.street.StreetPage -import com.aiosman.riderpro.ui.post.NewPostViewModel +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.index.tabs.add.AddPage +import com.aiosman.ravenow.ui.index.tabs.message.NotificationsScreen +import com.aiosman.ravenow.ui.index.tabs.moment.MomentsList +import com.aiosman.ravenow.ui.index.tabs.profile.ProfileWrap +import com.aiosman.ravenow.ui.index.tabs.search.DiscoverScreen +import com.aiosman.ravenow.ui.index.tabs.shorts.ShortVideo +import com.aiosman.ravenow.ui.index.tabs.street.StreetPage +import com.aiosman.ravenow.ui.post.NewPostViewModel import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/IndexViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/IndexViewModel.kt similarity index 88% rename from app/src/main/java/com/aiosman/riderpro/ui/index/IndexViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/IndexViewModel.kt index 37a0d77..b6c098f 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/IndexViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/IndexViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index +package com.aiosman.ravenow.ui.index import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/NavigationItem.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/NavigationItem.kt similarity index 90% rename from app/src/main/java/com/aiosman/riderpro/ui/index/NavigationItem.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/NavigationItem.kt index a7163f5..9c20737 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/NavigationItem.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/NavigationItem.kt @@ -1,12 +1,9 @@ -package com.aiosman.riderpro.ui.index +package com.aiosman.ravenow.ui.index -import androidx.compose.material.Icon -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.Search import androidx.compose.runtime.Composable import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource -import com.aiosman.riderpro.R +import com.aiosman.ravenow.R sealed class NavigationItem( val route: String, diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/add/AddPage.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/add/AddPage.kt similarity index 90% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/add/AddPage.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/add/AddPage.kt index 4e990ba..6678820 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/add/AddPage.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/add/AddPage.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.add +package com.aiosman.ravenow.ui.index.tabs.add import androidx.annotation.DrawableRes import androidx.compose.foundation.Image @@ -20,9 +20,9 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.ui.post.NewPostViewModel -import com.aiosman.riderpro.R +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.ui.post.NewPostViewModel +import com.aiosman.ravenow.R @Composable fun AddPage(){ @@ -30,7 +30,7 @@ fun AddPage(){ Column(modifier = Modifier .fillMaxSize() .background(Color.Black)) { - AddBtn(icon = R.drawable.rider_pro_icon_rider_share, text = "Rider Share") { + AddBtn(icon = R.drawable.rider_pro_icon_rider_share, text = "Rave NowShare") { NewPostViewModel.asNewPost() navController.navigate("NewPost") } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt similarity index 95% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt index 3bd1bec..ecde6f9 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageList.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageList.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.message +package com.aiosman.ravenow.ui.index.tabs.message import android.widget.Toast import androidx.compose.foundation.Image @@ -42,17 +42,17 @@ import androidx.compose.ui.text.style.TextOverflow import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewModelScope -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.follower.FollowerNoticeViewModel -import com.aiosman.riderpro.ui.like.LikeNoticeViewModel -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.follower.FollowerNoticeViewModel +import com.aiosman.ravenow.ui.like.LikeNoticeViewModel +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageListViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageListViewModel.kt similarity index 91% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageListViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageListViewModel.kt index 473b148..df6f393 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/message/MessageListViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/message/MessageListViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.message +package com.aiosman.ravenow.ui.index.tabs.message import android.content.Context import android.icu.util.Calendar @@ -11,18 +11,17 @@ import androidx.navigation.NavController import androidx.navigation.NavHostController import androidx.paging.PagingData import androidx.paging.map -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.data.AccountNotice -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.entity.CommentEntity -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.UserService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.exp.formatChatTime -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel -import com.aiosman.riderpro.ui.navigateToChat -import com.aiosman.riderpro.utils.TrtcHelper +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.data.AccountNotice +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.entity.CommentEntity +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.UserService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.exp.formatChatTime +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.navigateToChat +import com.aiosman.ravenow.utils.TrtcHelper import com.tencent.imsdk.v2.V2TIMConversation import com.tencent.imsdk.v2.V2TIMConversationResult import com.tencent.imsdk.v2.V2TIMManager diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt similarity index 93% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt index 298b12d..b09d82b 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/Moment.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/Moment.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.moment +package com.aiosman.ravenow.ui.index.tabs.moment import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -29,10 +29,10 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.expolre.ExploreMomentsList -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre.ExploreMomentsList +import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import kotlinx.coroutines.launch /** diff --git a/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/MomentViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/MomentViewModel.kt new file mode 100644 index 0000000..2411128 --- /dev/null +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/MomentViewModel.kt @@ -0,0 +1,8 @@ +package com.aiosman.ravenow.ui.index.tabs.moment + +import androidx.lifecycle.ViewModel + + +object MomentViewModel : ViewModel() { + +} \ No newline at end of file diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/Moment.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Moment.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/Moment.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Moment.kt index b41c28d..d2d5249 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/Moment.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/Moment.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.moment.tabs.expolre +package com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,7 +14,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.ui.composables.MomentCard +import com.aiosman.ravenow.ui.composables.MomentCard import kotlinx.coroutines.launch /** diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt similarity index 92% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt index dc28918..6ff045d 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/expolre/MomentViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.moment.tabs.expolre +package com.aiosman.ravenow.ui.index.tabs.moment.tabs.expolre import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,14 +10,13 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.map -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.data.Moment -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/Moment.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/Moment.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt index f893fcf..de99236 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/Moment.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/Moment.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline +package com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,7 +14,7 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.ui.composables.MomentCard +import com.aiosman.ravenow.ui.composables.MomentCard import kotlinx.coroutines.launch /** diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt similarity index 93% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt index 50296db..5897002 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/moment/tabs/timeline/MomentViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline +package com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,14 +11,14 @@ import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.filter import androidx.paging.map -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UserService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UserService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/MyProfileViewModel.kt similarity index 87% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/MyProfileViewModel.kt index ba9d8c2..07fe9a0 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/MyProfileViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/MyProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile +package com.aiosman.ravenow.ui.index.tabs.profile import android.content.Context import android.net.Uri @@ -13,18 +13,18 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.filter -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.Messaging -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UploadImage -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.Messaging +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UploadImage +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileV3.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileV3.kt index 9eda753..c3d1d86 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileV3.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile +package com.aiosman.ravenow.ui.index.tabs.profile import android.content.Context import android.content.Intent @@ -60,32 +60,32 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.paging.PagingData import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.ConstVars -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.MainActivity -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.DropdownMenu -import com.aiosman.riderpro.ui.composables.MenuItem -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.composables.pickupAndCompressLauncher -import com.aiosman.riderpro.ui.composables.toolbar.CollapsingToolbarScaffold -import com.aiosman.riderpro.ui.composables.toolbar.ScrollStrategy -import com.aiosman.riderpro.ui.composables.toolbar.rememberCollapsingToolbarScaffoldState -import com.aiosman.riderpro.ui.index.tabs.profile.composable.EmptyMomentPostUnit -import com.aiosman.riderpro.ui.index.tabs.profile.composable.GalleryItem -import com.aiosman.riderpro.ui.index.tabs.profile.composable.MomentPostUnit -import com.aiosman.riderpro.ui.index.tabs.profile.composable.OtherProfileAction -import com.aiosman.riderpro.ui.index.tabs.profile.composable.SelfProfileAction -import com.aiosman.riderpro.ui.index.tabs.profile.composable.UserContentPageIndicator -import com.aiosman.riderpro.ui.index.tabs.profile.composable.UserItem -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.ui.post.NewPostViewModel +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.ConstVars +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.MainActivity +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.DropdownMenu +import com.aiosman.ravenow.ui.composables.MenuItem +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.composables.pickupAndCompressLauncher +import com.aiosman.ravenow.ui.composables.toolbar.CollapsingToolbarScaffold +import com.aiosman.ravenow.ui.composables.toolbar.ScrollStrategy +import com.aiosman.ravenow.ui.composables.toolbar.rememberCollapsingToolbarScaffoldState +import com.aiosman.ravenow.ui.index.tabs.profile.composable.EmptyMomentPostUnit +import com.aiosman.ravenow.ui.index.tabs.profile.composable.GalleryItem +import com.aiosman.ravenow.ui.index.tabs.profile.composable.MomentPostUnit +import com.aiosman.ravenow.ui.index.tabs.profile.composable.OtherProfileAction +import com.aiosman.ravenow.ui.index.tabs.profile.composable.SelfProfileAction +import com.aiosman.ravenow.ui.index.tabs.profile.composable.UserContentPageIndicator +import com.aiosman.ravenow.ui.index.tabs.profile.composable.UserItem +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.ui.post.NewPostViewModel import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileWrap.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileWrap.kt similarity index 83% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileWrap.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileWrap.kt index 99eb86c..39aefbb 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileWrap.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/ProfileWrap.kt @@ -1,10 +1,8 @@ -package com.aiosman.riderpro.ui.index.tabs.profile +package com.aiosman.ravenow.ui.index.tabs.profile import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.compose.ui.platform.LocalContext -import androidx.lifecycle.viewModelScope -import kotlinx.coroutines.launch @Composable fun ProfileWrap( diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/GalleryItem.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/GalleryItem.kt similarity index 84% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/GalleryItem.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/GalleryItem.kt index d0ba63c..444a918 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/GalleryItem.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/GalleryItem.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.aspectRatio @@ -11,11 +11,11 @@ import androidx.compose.ui.draw.clip import androidx.compose.ui.layout.ContentScale import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.unit.dp -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.ui.navigateToPost +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.ui.navigateToPost @Composable fun GalleryItem( diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/MomentCard.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/MomentCard.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/MomentCard.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/MomentCard.kt index adb037c..f5a1d62 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/MomentCard.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/MomentCard.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.annotation.DrawableRes import androidx.compose.foundation.Canvas @@ -41,16 +41,16 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.exp.formatPostTime2 -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.ui.navigateToPost -import com.aiosman.riderpro.ui.post.NewPostViewModel +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.exp.formatPostTime2 +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.ui.navigateToPost +import com.aiosman.ravenow.ui.post.NewPostViewModel @Composable fun EmptyMomentPostUnit() { diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/OtherProfileAction.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/OtherProfileAction.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt index 20753e5..4cf5aaf 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/OtherProfileAction.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/OtherProfileAction.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -24,10 +24,10 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.ui.modifiers.noRippleClickable @Composable fun OtherProfileAction( diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/SelfProfileAction.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/SelfProfileAction.kt similarity index 90% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/SelfProfileAction.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/SelfProfileAction.kt index 9bb6626..5f72b43 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/SelfProfileAction.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/SelfProfileAction.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -20,9 +20,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.modifiers.noRippleClickable @Composable fun SelfProfileAction( diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserContentPageIndicator.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserContentPageIndicator.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserContentPageIndicator.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserContentPageIndicator.kt index 6855638..f0bcaa3 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserContentPageIndicator.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserContentPageIndicator.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -23,9 +23,9 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import kotlinx.coroutines.launch @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserItem.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserItem.kt similarity index 92% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserItem.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserItem.kt index 0b6964d..a8432ed 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/composable/UserItem.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/profile/composable/UserItem.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.profile.composable +package com.aiosman.ravenow.ui.index.tabs.profile.composable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -20,13 +20,13 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.modifiers.noRippleClickable @Composable fun UserItem(accountProfileEntity: AccountProfileEntity) { diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverScreen.kt similarity index 93% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverScreen.kt index 0e86994..266a683 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverScreen.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverScreen.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.search +package com.aiosman.ravenow.ui.index.tabs.search import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -39,14 +39,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.ui.navigateToPost +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.ui.navigateToPost @OptIn( ExperimentalMaterialApi::class) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverViewModel.kt similarity index 81% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverViewModel.kt index 880c472..fca9645 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/DiscoverViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/DiscoverViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.search +package com.aiosman.ravenow.ui.index.tabs.search import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope @@ -6,11 +6,11 @@ import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchScreen.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchScreen.kt index e213fdf..a2c88dc 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchScreen.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchScreen.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.search +package com.aiosman.ravenow.ui.index.tabs.search import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.background @@ -53,14 +53,14 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.MomentCard -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.MomentCard +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchViewModel.kt similarity index 89% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchViewModel.kt index db3e4ea..39fa695 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/search/SearchViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/search/SearchViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.search +package com.aiosman.ravenow.ui.index.tabs.search import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -10,14 +10,14 @@ import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.map -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.entity.AccountPagingSource -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.entity.AccountPagingSource +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/Pager.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/Pager.kt similarity index 99% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/Pager.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/Pager.kt index d18f946..2beec2f 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/Pager.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/Pager.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.shorts +package com.aiosman.ravenow.ui.index.tabs.shorts import androidx.compose.animation.core.Animatable import androidx.compose.foundation.gestures.Orientation diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortVideo.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortVideo.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortVideo.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortVideo.kt index a2f0c9d..c62cab0 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortVideo.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortVideo.kt @@ -1,9 +1,9 @@ -package com.aiosman.riderpro.ui.index.tabs.shorts +package com.aiosman.ravenow.ui.index.tabs.shorts import androidx.compose.material3.MaterialTheme import androidx.compose.material3.Surface import androidx.compose.runtime.Composable -import com.aiosman.riderpro.ui.theme.RiderProTheme +import com.aiosman.ravenow.ui.theme.RiderProTheme val videoUrls = listOf( "https://api.rider-pro.com/test/shorts/1.mp4", diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortViewCompose.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortViewCompose.kt similarity index 98% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortViewCompose.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortViewCompose.kt index 6422361..0915651 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/shorts/ShortViewCompose.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/shorts/ShortViewCompose.kt @@ -1,6 +1,6 @@ @file:kotlin.OptIn(ExperimentalMaterial3Api::class) -package com.aiosman.riderpro.ui.index.tabs.shorts +package com.aiosman.ravenow.ui.index.tabs.shorts import android.net.Uri import android.view.Gravity @@ -65,9 +65,9 @@ import androidx.media3.exoplayer.ExoPlayer import androidx.media3.exoplayer.source.ProgressiveMediaSource import androidx.media3.ui.AspectRatioFrameLayout import androidx.media3.ui.PlayerView -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.comment.CommentModalContent -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.comment.CommentModalContent +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/street/Street.kt b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/street/Street.kt similarity index 98% rename from app/src/main/java/com/aiosman/riderpro/ui/index/tabs/street/Street.kt rename to app/src/main/java/com/aiosman/ravenow/ui/index/tabs/street/Street.kt index 2062e61..a1d6c68 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/street/Street.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/index/tabs/street/Street.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.index.tabs.street +package com.aiosman.ravenow.ui.index.tabs.street import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -37,9 +37,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.navigation.NavOptions -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.test.countries +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.test.countries import com.google.android.gms.maps.model.CameraPosition import com.google.android.gms.maps.model.LatLng import com.google.maps.android.compose.GoogleMap diff --git a/app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/like/LikeNoticeViewModel.kt similarity index 81% rename from app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/like/LikeNoticeViewModel.kt index d06239d..9ddd6ab 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/like/LikeNoticeViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/like/LikeNoticeViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.like +package com.aiosman.ravenow.ui.like import android.icu.util.Calendar import androidx.lifecycle.ViewModel @@ -7,12 +7,12 @@ import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn -import com.aiosman.riderpro.entity.AccountLikeEntity -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.entity.LikeItemPagingSource -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.api.ApiClient -import com.aiosman.riderpro.data.api.UpdateNoticeRequestBody +import com.aiosman.ravenow.entity.AccountLikeEntity +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.entity.LikeItemPagingSource +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.api.ApiClient +import com.aiosman.ravenow.data.api.UpdateNoticeRequestBody import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt b/app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt rename to app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt index 1bc57b9..a8660e2 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/like/LikePage.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/like/LikePage.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.like +package com.aiosman.ravenow.ui.like import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -32,20 +32,20 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.AccountLikeEntity -import com.aiosman.riderpro.exp.timeAgo -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout -import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.ui.navigateToPost +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.AccountLikeEntity +import com.aiosman.ravenow.exp.timeAgo +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.ui.composables.BottomNavigationPlaceholder +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout +import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.ui.navigateToPost import java.util.Date @Preview diff --git a/app/src/main/java/com/aiosman/riderpro/ui/location/LocationDetailScreen.kt b/app/src/main/java/com/aiosman/ravenow/ui/location/LocationDetailScreen.kt similarity index 99% rename from app/src/main/java/com/aiosman/riderpro/ui/location/LocationDetailScreen.kt rename to app/src/main/java/com/aiosman/ravenow/ui/location/LocationDetailScreen.kt index c1ab6e0..fcafef7 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/location/LocationDetailScreen.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/location/LocationDetailScreen.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.location +package com.aiosman.ravenow.ui.location import androidx.compose.animation.AnimatedVisibility import androidx.compose.animation.animateContentSize @@ -59,8 +59,8 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R data class OfficialGalleryItem( val id: Int, diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt similarity index 92% rename from app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt rename to app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt index 1586112..07a4a2d 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/login/emailsignup.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/login/emailsignup.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.login +package com.aiosman.ravenow.ui.login import android.widget.Toast import androidx.compose.foundation.background @@ -22,22 +22,22 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.data.api.ErrorCode -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.ServiceException -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.api.getErrorMessageCode -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.ui.composables.ActionButton -import com.aiosman.riderpro.ui.composables.CheckboxWithLabel -import com.aiosman.riderpro.ui.composables.PolicyCheckbox -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.composables.TextInputField +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.data.api.ErrorCode +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.ServiceException +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.api.getErrorMessageCode +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.ui.composables.ActionButton +import com.aiosman.ravenow.ui.composables.CheckboxWithLabel +import com.aiosman.ravenow.ui.composables.PolicyCheckbox +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.composables.TextInputField import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/login.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/login.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/ui/login/login.kt rename to app/src/main/java/com/aiosman/ravenow/ui/login/login.kt index 30608a4..5e16804 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/login/login.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/login/login.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.login +package com.aiosman.ravenow.ui.login import android.content.ContentValues.TAG import android.content.res.Resources @@ -48,20 +48,20 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.data.api.ErrorCode -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.ServiceException -import com.aiosman.riderpro.data.api.getErrorMessageCode -import com.aiosman.riderpro.data.api.showToast -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.ActionButton -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.utils.GoogleLogin +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.data.api.ErrorCode +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.ServiceException +import com.aiosman.ravenow.data.api.getErrorMessageCode +import com.aiosman.ravenow.data.api.showToast +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.ActionButton +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.utils.GoogleLogin import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.delay @@ -168,24 +168,25 @@ fun LoginPage() { Spacer(modifier = Modifier.weight(1f)) Image( painter = painterResource(id = R.mipmap.rider_pro_color_logo_next), - contentDescription = "Rider Pro", + contentDescription = "Rave Now", modifier = Modifier .size(52.dp) ) - Spacer(modifier = Modifier.height(32.dp)) + Spacer(modifier = Modifier.height(8.dp)) Text( - "Connecting Riders", + "Rave Now", fontSize = 28.sp, fontWeight = FontWeight.W900, color = AppColors.text ) + Spacer(modifier = Modifier.height(16.dp)) Text( - "Worldwide", - fontSize = 28.sp, - fontWeight = FontWeight.W900, + "Your Night Starts Here", + fontSize = 20.sp, + fontWeight = FontWeight.W600, color = AppColors.text ) - Spacer(modifier = Modifier.height(32.dp)) + Spacer(modifier = Modifier.height(8.dp)) ActionButton( modifier = Modifier.fillMaxWidth(), text = stringResource(R.string.sign_up_upper), diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/signup.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/signup.kt similarity index 91% rename from app/src/main/java/com/aiosman/riderpro/ui/login/signup.kt rename to app/src/main/java/com/aiosman/ravenow/ui/login/signup.kt index 8d6d89a..8ae7f42 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/login/signup.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/login/signup.kt @@ -1,8 +1,6 @@ -package com.aiosman.riderpro.ui.login +package com.aiosman.ravenow.ui.login import android.content.ContentValues.TAG -import android.icu.util.Calendar -import android.icu.util.TimeZone import android.util.Log import android.widget.Toast import androidx.compose.foundation.Image @@ -30,20 +28,18 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.Messaging -import com.aiosman.riderpro.R -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.ServiceException -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.ActionButton -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.utils.GoogleLogin -import com.aiosman.riderpro.utils.Utils +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.ServiceException +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.ActionButton +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.utils.GoogleLogin import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.launch @@ -132,18 +128,18 @@ fun SignupScreen() { ) { Image( painter = painterResource(id = R.mipmap.rider_pro_logo), - contentDescription = "Rider Pro", + contentDescription = "Rave Now", modifier = Modifier .width(108.dp) .height(45.dp) ) Spacer(modifier = Modifier.height(32.dp)) Text( - "Connecting Riders".uppercase(), + "Rave Now".uppercase(), fontSize = 28.sp, fontWeight = FontWeight.Bold ) - Text("Worldwide".uppercase(), fontSize = 28.sp, fontWeight = FontWeight.Bold) + Text("Your Night Starts Here".uppercase(), fontSize = 20.sp, fontWeight = FontWeight.W600) } } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt b/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt similarity index 90% rename from app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt rename to app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt index 20c3f3d..8ef04a5 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/login/userauth.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/login/userauth.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.login +package com.aiosman.ravenow.ui.login import android.widget.Toast import androidx.compose.foundation.Image @@ -29,28 +29,28 @@ import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.AppStore -import com.aiosman.riderpro.data.api.ErrorCode -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.CaptchaService -import com.aiosman.riderpro.data.CaptchaServiceImpl -import com.aiosman.riderpro.data.ServiceException -import com.aiosman.riderpro.data.api.CaptchaInfo -import com.aiosman.riderpro.data.api.CaptchaResponseBody -import com.aiosman.riderpro.data.api.DotPosition -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.ui.composables.ActionButton -import com.aiosman.riderpro.ui.composables.ClickCaptchaDialog -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.composables.TextInputField -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.utils.GoogleLogin +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.AppStore +import com.aiosman.ravenow.data.api.ErrorCode +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.CaptchaService +import com.aiosman.ravenow.data.CaptchaServiceImpl +import com.aiosman.ravenow.data.ServiceException +import com.aiosman.ravenow.data.api.CaptchaInfo +import com.aiosman.ravenow.data.api.CaptchaResponseBody +import com.aiosman.ravenow.data.api.DotPosition +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.ui.composables.ActionButton +import com.aiosman.ravenow.ui.composables.ClickCaptchaDialog +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.composables.TextInputField +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.utils.GoogleLogin import kotlinx.coroutines.launch @@ -254,7 +254,7 @@ fun UserAuthScreen() { Row( verticalAlignment = Alignment.CenterVertically ) { - com.aiosman.riderpro.ui.composables.Checkbox( + com.aiosman.ravenow.ui.composables.Checkbox( checked = rememberMe, onCheckedChange = { rememberMe = it diff --git a/app/src/main/java/com/aiosman/riderpro/ui/message/Message.kt b/app/src/main/java/com/aiosman/ravenow/ui/message/Message.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/message/Message.kt rename to app/src/main/java/com/aiosman/ravenow/ui/message/Message.kt index 931dc34..5b377f2 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/message/Message.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/message/Message.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.message +package com.aiosman.ravenow.ui.message import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -33,10 +33,10 @@ import androidx.paging.LoadState import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.ui.composables.MomentListLoading -import com.aiosman.riderpro.R -import com.aiosman.riderpro.model.ChatNotificationData -import com.aiosman.riderpro.model.TestChatBackend +import com.aiosman.ravenow.ui.composables.MomentListLoading +import com.aiosman.ravenow.R +import com.aiosman.ravenow.model.ChatNotificationData +import com.aiosman.ravenow.model.TestChatBackend val chatNotificationData = ChatNotificationData( R.drawable.default_avatar, diff --git a/app/src/main/java/com/aiosman/riderpro/ui/modification/AddModification.kt b/app/src/main/java/com/aiosman/ravenow/ui/modification/AddModification.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/modification/AddModification.kt rename to app/src/main/java/com/aiosman/ravenow/ui/modification/AddModification.kt index 235b8da..8197625 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/modification/AddModification.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/modification/AddModification.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.modification +package com.aiosman.ravenow.ui.modification import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -44,10 +44,10 @@ import androidx.compose.ui.text.input.KeyboardType import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.ui.post.NewPostViewModel -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.R -import com.aiosman.riderpro.utils.Utils +import com.aiosman.ravenow.ui.post.NewPostViewModel +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.R +import com.aiosman.ravenow.utils.Utils @Preview @Composable diff --git a/app/src/main/java/com/aiosman/riderpro/ui/modification/ModificationList.kt b/app/src/main/java/com/aiosman/ravenow/ui/modification/ModificationList.kt similarity index 95% rename from app/src/main/java/com/aiosman/riderpro/ui/modification/ModificationList.kt rename to app/src/main/java/com/aiosman/ravenow/ui/modification/ModificationList.kt index e26f895..ac848fb 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/modification/ModificationList.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/modification/ModificationList.kt @@ -17,9 +17,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout +import com.aiosman.ravenow.ui.composables.BottomNavigationPlaceholder +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout import com.google.accompanist.systemuicontroller.rememberSystemUiController @Preview diff --git a/app/src/main/java/com/aiosman/riderpro/ui/modifiers/ModifierExp.kt b/app/src/main/java/com/aiosman/ravenow/ui/modifiers/ModifierExp.kt similarity index 92% rename from app/src/main/java/com/aiosman/riderpro/ui/modifiers/ModifierExp.kt rename to app/src/main/java/com/aiosman/ravenow/ui/modifiers/ModifierExp.kt index 7e6d943..6d55491 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/modifiers/ModifierExp.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/modifiers/ModifierExp.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.modifiers +package com.aiosman.ravenow.ui.modifiers import androidx.compose.foundation.clickable import androidx.compose.foundation.interaction.MutableInteractionSource @@ -6,7 +6,6 @@ import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Modifier import androidx.compose.ui.composed -import com.aiosman.riderpro.LocalNavController import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/CommentsViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/CommentsViewModel.kt similarity index 95% rename from app/src/main/java/com/aiosman/riderpro/ui/post/CommentsViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/CommentsViewModel.kt index 2e8e260..0d86967 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/CommentsViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/CommentsViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -11,13 +11,12 @@ import androidx.paging.PagingData import androidx.paging.cachedIn import androidx.paging.filter import androidx.paging.map -import com.aiosman.riderpro.data.CommentRemoteDataSource -import com.aiosman.riderpro.data.CommentService -import com.aiosman.riderpro.data.CommentServiceImpl -import com.aiosman.riderpro.entity.CommentEntity -import com.aiosman.riderpro.entity.CommentPagingSource -import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel +import com.aiosman.ravenow.data.CommentRemoteDataSource +import com.aiosman.ravenow.data.CommentService +import com.aiosman.ravenow.data.CommentServiceImpl +import com.aiosman.ravenow.entity.CommentEntity +import com.aiosman.ravenow.entity.CommentPagingSource +import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPost.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/NewPost.kt index b0db42f..a8b7f3b 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPost.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPost.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import android.net.Uri import android.widget.Toast @@ -59,16 +59,16 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.content.FileProvider import androidx.lifecycle.viewModelScope -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.DraggableGrid -import com.aiosman.riderpro.ui.composables.RelPostCard -import com.aiosman.riderpro.ui.composables.StatusBarMaskLayout -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.DraggableGrid +import com.aiosman.ravenow.ui.composables.RelPostCard +import com.aiosman.ravenow.ui.composables.StatusBarMaskLayout +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import com.google.accompanist.systemuicontroller.rememberSystemUiController import kotlinx.coroutines.launch import java.io.File diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPostImageGrid.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/NewPostImageGrid.kt index e6669c2..c6b4cc9 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostImageGrid.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPostImageGrid.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import androidx.compose.foundation.ExperimentalFoundationApi import androidx.compose.foundation.Image @@ -31,8 +31,8 @@ import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import coil.compose.rememberAsyncImagePainter -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.ui.modifiers.noRippleClickable import com.google.accompanist.systemuicontroller.rememberSystemUiController @OptIn(ExperimentalFoundationApi::class) diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPostViewModel.kt similarity index 90% rename from app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/NewPostViewModel.kt index b7eb8b8..4101e2a 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/NewPostViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/NewPostViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import android.content.Context import android.graphics.Bitmap @@ -10,17 +10,15 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.entity.MomentServiceImpl -import com.aiosman.riderpro.data.UploadImage -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.exp.rotate -import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel -import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel -import com.aiosman.riderpro.ui.modification.Modification -import com.aiosman.riderpro.utils.FileUtil -import com.aiosman.riderpro.utils.Utils +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.entity.MomentServiceImpl +import com.aiosman.ravenow.data.UploadImage +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.exp.rotate +import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel +import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel +import com.aiosman.ravenow.ui.modification.Modification +import com.aiosman.ravenow.utils.FileUtil import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/Post.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/Post.kt index e294840..c5296b3 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/Post.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/Post.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import android.util.Log import androidx.compose.animation.AnimatedVisibility @@ -8,7 +8,6 @@ import androidx.compose.animation.core.spring import androidx.compose.animation.core.tween import androidx.compose.animation.fadeIn import androidx.compose.animation.fadeOut -import androidx.compose.animation.rememberSplineBasedDecay import androidx.compose.animation.slideInVertically import androidx.compose.animation.slideOutVertically import androidx.compose.foundation.ExperimentalFoundationApi @@ -87,27 +86,27 @@ import androidx.lifecycle.viewModelScope import androidx.lifecycle.viewmodel.compose.viewModel import androidx.paging.LoadState import androidx.paging.compose.collectAsLazyPagingItems -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.LocalAppTheme -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.R -import com.aiosman.riderpro.entity.CommentEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentImageEntity -import com.aiosman.riderpro.exp.formatPostTime -import com.aiosman.riderpro.exp.timeAgo -import com.aiosman.riderpro.ui.NavigationRoute -import com.aiosman.riderpro.ui.comment.NoticeScreenHeader -import com.aiosman.riderpro.ui.composables.AnimatedFavouriteIcon -import com.aiosman.riderpro.ui.composables.AnimatedLikeIcon -import com.aiosman.riderpro.ui.composables.BottomNavigationPlaceholder -import com.aiosman.riderpro.ui.composables.CustomAsyncImage -import com.aiosman.riderpro.ui.composables.CustomClickableText -import com.aiosman.riderpro.ui.composables.EditCommentBottomModal -import com.aiosman.riderpro.ui.composables.FollowButton -import com.aiosman.riderpro.ui.composables.StatusBarSpacer -import com.aiosman.riderpro.ui.modifiers.noRippleClickable -import com.aiosman.riderpro.utils.FileUtil.saveImageToGallery +import com.aiosman.ravenow.AppState +import com.aiosman.ravenow.LocalAppTheme +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.R +import com.aiosman.ravenow.entity.CommentEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentImageEntity +import com.aiosman.ravenow.exp.formatPostTime +import com.aiosman.ravenow.exp.timeAgo +import com.aiosman.ravenow.ui.NavigationRoute +import com.aiosman.ravenow.ui.comment.NoticeScreenHeader +import com.aiosman.ravenow.ui.composables.AnimatedFavouriteIcon +import com.aiosman.ravenow.ui.composables.AnimatedLikeIcon +import com.aiosman.ravenow.ui.composables.BottomNavigationPlaceholder +import com.aiosman.ravenow.ui.composables.CustomAsyncImage +import com.aiosman.ravenow.ui.composables.CustomClickableText +import com.aiosman.ravenow.ui.composables.EditCommentBottomModal +import com.aiosman.ravenow.ui.composables.FollowButton +import com.aiosman.ravenow.ui.composables.StatusBarSpacer +import com.aiosman.ravenow.ui.modifiers.noRippleClickable +import com.aiosman.ravenow.utils.FileUtil.saveImageToGallery import kotlinx.coroutines.launch import net.engawapg.lib.zoomable.rememberZoomState import net.engawapg.lib.zoomable.zoomable diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/PostViewModel.kt similarity index 86% rename from app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/PostViewModel.kt index 4c8bcab..a2f2192 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/PostViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/PostViewModel.kt @@ -1,22 +1,20 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.setValue import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UserService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentServiceImpl -import com.aiosman.riderpro.ui.index.tabs.moment.MomentViewModel -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel -import com.aiosman.riderpro.ui.index.tabs.moment.tabs.timeline.TimelineMomentsList -import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UserService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentServiceImpl +import com.aiosman.ravenow.ui.index.tabs.moment.tabs.timeline.TimelineMomentViewModel +import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt b/app/src/main/java/com/aiosman/ravenow/ui/post/SelectLocationModal.kt similarity index 99% rename from app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt rename to app/src/main/java/com/aiosman/ravenow/ui/post/SelectLocationModal.kt index 3d37eb4..a64bdd9 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/post/SelectLocationModal.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/post/SelectLocationModal.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.post +package com.aiosman.ravenow.ui.post import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -34,7 +34,7 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.input.ImeAction import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.R +import com.aiosman.ravenow.R data class SearchPlaceAddressResult( diff --git a/app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileV2.kt b/app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileV2.kt similarity index 76% rename from app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileV2.kt rename to app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileV2.kt index 50dce79..f4284d6 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileV2.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileV2.kt @@ -1,14 +1,13 @@ -package com.aiosman.riderpro.ui.profile +package com.aiosman.ravenow.ui.profile -import android.util.Log import androidx.compose.runtime.Composable import androidx.compose.runtime.LaunchedEffect import androidx.lifecycle.viewmodel.compose.viewModel -import com.aiosman.riderpro.LocalNavController -import com.aiosman.riderpro.exp.viewModelFactory -import com.aiosman.riderpro.ui.index.tabs.profile.MyProfileViewModel -import com.aiosman.riderpro.ui.index.tabs.profile.ProfileV3 -import com.aiosman.riderpro.ui.navigateToChat +import com.aiosman.ravenow.LocalNavController +import com.aiosman.ravenow.exp.viewModelFactory +import com.aiosman.ravenow.ui.index.tabs.profile.MyProfileViewModel +import com.aiosman.ravenow.ui.index.tabs.profile.ProfileV3 +import com.aiosman.ravenow.ui.navigateToChat @Composable fun AccountProfileV2(id: String){ diff --git a/app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileViewModel.kt b/app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileViewModel.kt similarity index 83% rename from app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileViewModel.kt rename to app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileViewModel.kt index 1f3d020..82b328c 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/profile/AccountProfileViewModel.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/profile/AccountProfileViewModel.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.profile +package com.aiosman.ravenow.ui.profile import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf @@ -9,15 +9,15 @@ import androidx.paging.Pager import androidx.paging.PagingConfig import androidx.paging.PagingData import androidx.paging.cachedIn -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.UserServiceImpl -import com.aiosman.riderpro.entity.AccountProfileEntity -import com.aiosman.riderpro.entity.MomentEntity -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.entity.MomentServiceImpl +import com.aiosman.ravenow.data.AccountService +import com.aiosman.ravenow.data.AccountServiceImpl +import com.aiosman.ravenow.data.MomentService +import com.aiosman.ravenow.data.UserServiceImpl +import com.aiosman.ravenow.entity.AccountProfileEntity +import com.aiosman.ravenow.entity.MomentEntity +import com.aiosman.ravenow.entity.MomentPagingSource +import com.aiosman.ravenow.entity.MomentRemoteDataSource +import com.aiosman.ravenow.entity.MomentServiceImpl import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.collectLatest diff --git a/app/src/main/java/com/aiosman/riderpro/ui/search/search.kt b/app/src/main/java/com/aiosman/ravenow/ui/search/search.kt similarity index 98% rename from app/src/main/java/com/aiosman/riderpro/ui/search/search.kt rename to app/src/main/java/com/aiosman/ravenow/ui/search/search.kt index 086d6c3..6470d9a 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/search/search.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/search/search.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.search +package com.aiosman.ravenow.ui.search import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.fillMaxWidth diff --git a/app/src/main/java/com/aiosman/riderpro/ui/splash/splash.kt b/app/src/main/java/com/aiosman/ravenow/ui/splash/splash.kt similarity index 84% rename from app/src/main/java/com/aiosman/riderpro/ui/splash/splash.kt rename to app/src/main/java/com/aiosman/ravenow/ui/splash/splash.kt index 1f75f84..04e67a7 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/splash/splash.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/splash/splash.kt @@ -1,6 +1,5 @@ -package com.aiosman.riderpro.ui.splash +package com.aiosman.ravenow.ui.splash -import android.window.SplashScreen import androidx.compose.foundation.Image import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -19,7 +18,7 @@ import androidx.compose.ui.res.painterResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp -import com.aiosman.riderpro.R +import com.aiosman.ravenow.R @Composable fun SplashScreen() { @@ -39,18 +38,18 @@ fun SplashScreen() { ) { Image( painter = painterResource(id = R.mipmap.rider_pro_logo), - contentDescription = "Rider Pro", + contentDescription = "Rave Now", modifier = Modifier .width(108.dp) .height(45.dp) ) Spacer(modifier = Modifier.height(32.dp)) Text( - "Connecting Riders".uppercase(), + "Rave Now".uppercase(), fontSize = 28.sp, fontWeight = FontWeight.Bold ) - Text("Worldwide".uppercase(), fontSize = 28.sp, fontWeight = FontWeight.Bold) + Text("Your Night Starts Here".uppercase(), fontSize = 20.sp, fontWeight = FontWeight.W600) } } diff --git a/app/src/main/java/com/aiosman/riderpro/ui/theme/Color.kt b/app/src/main/java/com/aiosman/ravenow/ui/theme/Color.kt similarity index 86% rename from app/src/main/java/com/aiosman/riderpro/ui/theme/Color.kt rename to app/src/main/java/com/aiosman/ravenow/ui/theme/Color.kt index 30a93c9..666b23b 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/theme/Color.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/theme/Color.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.theme +package com.aiosman.ravenow.ui.theme import androidx.compose.ui.graphics.Color diff --git a/app/src/main/java/com/aiosman/riderpro/ui/theme/Theme.kt b/app/src/main/java/com/aiosman/ravenow/ui/theme/Theme.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/theme/Theme.kt rename to app/src/main/java/com/aiosman/ravenow/ui/theme/Theme.kt index 15e3246..f4bca40 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/theme/Theme.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/theme/Theme.kt @@ -1,6 +1,5 @@ -package com.aiosman.riderpro.ui.theme +package com.aiosman.ravenow.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme diff --git a/app/src/main/java/com/aiosman/riderpro/ui/theme/Type.kt b/app/src/main/java/com/aiosman/ravenow/ui/theme/Type.kt similarity index 96% rename from app/src/main/java/com/aiosman/riderpro/ui/theme/Type.kt rename to app/src/main/java/com/aiosman/ravenow/ui/theme/Type.kt index 95a8a96..56c67fc 100644 --- a/app/src/main/java/com/aiosman/riderpro/ui/theme/Type.kt +++ b/app/src/main/java/com/aiosman/ravenow/ui/theme/Type.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.ui.theme +package com.aiosman.ravenow.ui.theme import androidx.compose.material3.Typography import androidx.compose.ui.text.TextStyle diff --git a/app/src/main/java/com/aiosman/riderpro/utils/BlurHashDecoder.kt b/app/src/main/java/com/aiosman/ravenow/utils/BlurHashDecoder.kt similarity index 99% rename from app/src/main/java/com/aiosman/riderpro/utils/BlurHashDecoder.kt rename to app/src/main/java/com/aiosman/ravenow/utils/BlurHashDecoder.kt index 13b7613..05f5806 100644 --- a/app/src/main/java/com/aiosman/riderpro/utils/BlurHashDecoder.kt +++ b/app/src/main/java/com/aiosman/ravenow/utils/BlurHashDecoder.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.utils +package com.aiosman.ravenow.utils import android.graphics.Bitmap import android.graphics.Color diff --git a/app/src/main/java/com/aiosman/riderpro/utils/FileUtil.kt b/app/src/main/java/com/aiosman/ravenow/utils/FileUtil.kt similarity index 98% rename from app/src/main/java/com/aiosman/riderpro/utils/FileUtil.kt rename to app/src/main/java/com/aiosman/ravenow/utils/FileUtil.kt index 8b415a4..6e95cc8 100644 --- a/app/src/main/java/com/aiosman/riderpro/utils/FileUtil.kt +++ b/app/src/main/java/com/aiosman/ravenow/utils/FileUtil.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.utils +package com.aiosman.ravenow.utils import android.content.ContentValues import android.content.Context @@ -12,7 +12,7 @@ import android.provider.MediaStore import android.widget.Toast import coil.request.ImageRequest import coil.request.SuccessResult -import com.aiosman.riderpro.utils.Utils.getImageLoader +import com.aiosman.ravenow.utils.Utils.getImageLoader import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.withContext import java.io.File diff --git a/app/src/main/java/com/aiosman/riderpro/utils/GoogleLogin.kt b/app/src/main/java/com/aiosman/ravenow/utils/GoogleLogin.kt similarity index 97% rename from app/src/main/java/com/aiosman/riderpro/utils/GoogleLogin.kt rename to app/src/main/java/com/aiosman/ravenow/utils/GoogleLogin.kt index 878d4bc..8c4808e 100644 --- a/app/src/main/java/com/aiosman/riderpro/utils/GoogleLogin.kt +++ b/app/src/main/java/com/aiosman/ravenow/utils/GoogleLogin.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.utils +package com.aiosman.ravenow.utils import android.content.Context import androidx.credentials.Credential diff --git a/app/src/main/java/com/aiosman/riderpro/utils/TrtcHelper.kt b/app/src/main/java/com/aiosman/ravenow/utils/TrtcHelper.kt similarity index 95% rename from app/src/main/java/com/aiosman/riderpro/utils/TrtcHelper.kt rename to app/src/main/java/com/aiosman/ravenow/utils/TrtcHelper.kt index f127200..186ca9f 100644 --- a/app/src/main/java/com/aiosman/riderpro/utils/TrtcHelper.kt +++ b/app/src/main/java/com/aiosman/ravenow/utils/TrtcHelper.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro.utils +package com.aiosman.ravenow.utils import com.tencent.imsdk.v2.V2TIMManager import com.tencent.imsdk.v2.V2TIMValueCallback diff --git a/app/src/main/java/com/aiosman/riderpro/utils/Utils.kt b/app/src/main/java/com/aiosman/ravenow/utils/Utils.kt similarity index 94% rename from app/src/main/java/com/aiosman/riderpro/utils/Utils.kt rename to app/src/main/java/com/aiosman/ravenow/utils/Utils.kt index b5cbdb2..b4d097b 100644 --- a/app/src/main/java/com/aiosman/riderpro/utils/Utils.kt +++ b/app/src/main/java/com/aiosman/ravenow/utils/Utils.kt @@ -1,15 +1,13 @@ -package com.aiosman.riderpro.utils +package com.aiosman.ravenow.utils import android.content.Context import android.graphics.Bitmap import android.graphics.BitmapFactory import android.net.Uri import coil.ImageLoader -import coil.disk.DiskCache -import coil.memory.MemoryCache import coil.request.CachePolicy -import com.aiosman.riderpro.data.api.AuthInterceptor -import com.aiosman.riderpro.data.api.getUnsafeOkHttpClient +import com.aiosman.ravenow.data.api.AuthInterceptor +import com.aiosman.ravenow.data.api.getUnsafeOkHttpClient import java.io.File import java.io.FileOutputStream import java.util.Date diff --git a/app/src/main/java/com/aiosman/riderpro/ui/composables/toolbar/FabPosition.kt b/app/src/main/java/com/aiosman/riderpro/ui/composables/toolbar/FabPosition.kt deleted file mode 100644 index f487424..0000000 --- a/app/src/main/java/com/aiosman/riderpro/ui/composables/toolbar/FabPosition.kt +++ /dev/null @@ -1,6 +0,0 @@ -package com.aiosman.riderpro.ui.composables.toolbar - -enum class FabPosition { - Center, - End -} \ No newline at end of file diff --git a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/MomentViewModel.kt b/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/MomentViewModel.kt deleted file mode 100644 index 36308a4..0000000 --- a/app/src/main/java/com/aiosman/riderpro/ui/index/tabs/moment/MomentViewModel.kt +++ /dev/null @@ -1,30 +0,0 @@ -package com.aiosman.riderpro.ui.index.tabs.moment - -import androidx.compose.runtime.getValue -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import androidx.paging.Pager -import androidx.paging.PagingConfig -import androidx.paging.PagingData -import androidx.paging.cachedIn -import androidx.paging.filter -import androidx.paging.map -import com.aiosman.riderpro.AppState -import com.aiosman.riderpro.data.AccountService -import com.aiosman.riderpro.entity.MomentPagingSource -import com.aiosman.riderpro.entity.MomentRemoteDataSource -import com.aiosman.riderpro.data.MomentService -import com.aiosman.riderpro.data.AccountServiceImpl -import com.aiosman.riderpro.entity.MomentServiceImpl -import com.aiosman.riderpro.entity.MomentEntity -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.asStateFlow -import kotlinx.coroutines.flow.collectLatest -import kotlinx.coroutines.launch - - -object MomentViewModel : ViewModel() { - -} \ No newline at end of file diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index c40a402..b60bf62 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -1,6 +1,6 @@ - RiderPro + Rave Now 世界 %1d分钟前 %1d秒前 @@ -37,7 +37,7 @@ 再次输入密码 再次输入密码 我已阅读用户协议 - 我同意 Rider Pro 推送消息 + 我同意 Rave Now 推送消息 邮箱格式错误 密码至少为 8 位,包含大写字母、小写字母、数字 密码和确认密码必须相同 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 62991b3..66c2c29 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - RiderPro + Rave Now Worldwide %1d minute ago %1d second ago @@ -19,7 +19,7 @@ Say something... FOLLOW Log in - Let\'s Ride + Let\'s Rave Now or Remember me. Forgot password? @@ -36,7 +36,7 @@ Enter your password again Confirm password Yes, I have read and agree to RiderPro’s Privacy Policy. - Yes, I want to be added to the Rider Pro mailing list. + Yes, I want to be added to the Rave Now mailing list. Invalid email The password must be at least 8 characters long and contain a combination of uppercase letters, lowercase letters, and numbers. Please ensure that the passwords entered twice are consistent. @@ -78,7 +78,7 @@ %1d seconds ago %1d minutes ago I agree to the - Rider Pro’s Privacy Policy + Rave Now’s Privacy Policy Gallery CHAT Like your post diff --git a/app/src/test/java/com/aiosman/riderpro/ExampleUnitTest.kt b/app/src/test/java/com/aiosman/ravenow/ExampleUnitTest.kt similarity index 91% rename from app/src/test/java/com/aiosman/riderpro/ExampleUnitTest.kt rename to app/src/test/java/com/aiosman/ravenow/ExampleUnitTest.kt index eaf7ea6..f8cc548 100644 --- a/app/src/test/java/com/aiosman/riderpro/ExampleUnitTest.kt +++ b/app/src/test/java/com/aiosman/ravenow/ExampleUnitTest.kt @@ -1,4 +1,4 @@ -package com.aiosman.riderpro +package com.aiosman.ravenow import org.junit.Test