diff --git a/app/src/main/java/com/msg/bitgoeul_android/navigation/TopLevelDestination.kt b/app/src/main/java/com/msg/bitgoeul_android/navigation/TopLevelDestination.kt index 19141ae8..93e405af 100644 --- a/app/src/main/java/com/msg/bitgoeul_android/navigation/TopLevelDestination.kt +++ b/app/src/main/java/com/msg/bitgoeul_android/navigation/TopLevelDestination.kt @@ -1,6 +1,5 @@ package com.msg.bitgoeul_android.navigation -import androidx.compose.ui.graphics.vector.ImageVector import com.msg.design_system.R enum class TopLevelDestination( diff --git a/app/src/main/java/com/msg/bitgoeul_android/ui/BitgoeulApp.kt b/app/src/main/java/com/msg/bitgoeul_android/ui/BitgoeulApp.kt index 4401419a..dcbc288a 100644 --- a/app/src/main/java/com/msg/bitgoeul_android/ui/BitgoeulApp.kt +++ b/app/src/main/java/com/msg/bitgoeul_android/ui/BitgoeulApp.kt @@ -13,7 +13,6 @@ import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import androidx.compose.ui.semantics.semantics import androidx.navigation.NavDestination import androidx.navigation.NavDestination.Companion.hierarchy import androidx.navigation.compose.currentBackStackEntryAsState diff --git a/core/datastore/src/main/java/com/msg/datastore/AuthTokenDataSource.kt b/core/datastore/src/main/java/com/msg/datastore/AuthTokenDataSource.kt index f8a662f1..d7e845c8 100644 --- a/core/datastore/src/main/java/com/msg/datastore/AuthTokenDataSource.kt +++ b/core/datastore/src/main/java/com/msg/datastore/AuthTokenDataSource.kt @@ -1,7 +1,7 @@ package com.msg.datastore -import androidx.datastore.core.DataStore import Authority +import androidx.datastore.core.DataStore import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.mapNotNull diff --git a/core/design-system/src/main/java/com/msg/design_system/component/checkbox/BitgoeulCheckBox.kt b/core/design-system/src/main/java/com/msg/design_system/component/checkbox/BitgoeulCheckBox.kt index 16c2afd0..de88e187 100644 --- a/core/design-system/src/main/java/com/msg/design_system/component/checkbox/BitgoeulCheckBox.kt +++ b/core/design-system/src/main/java/com/msg/design_system/component/checkbox/BitgoeulCheckBox.kt @@ -4,13 +4,11 @@ import androidx.compose.foundation.Image import androidx.compose.foundation.background import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.msg.design_system.R diff --git a/core/design-system/src/main/java/com/msg/design_system/component/icon/BitgoeulIcon.kt b/core/design-system/src/main/java/com/msg/design_system/component/icon/BitgoeulIcon.kt index 8c4b8d57..5b4eade3 100644 --- a/core/design-system/src/main/java/com/msg/design_system/component/icon/BitgoeulIcon.kt +++ b/core/design-system/src/main/java/com/msg/design_system/component/icon/BitgoeulIcon.kt @@ -1,7 +1,6 @@ package com.msg.design_system.component.icon import androidx.compose.foundation.Image -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.height diff --git a/core/design-system/src/main/java/com/msg/design_system/component/topbar/DetailSettingTopBar.kt b/core/design-system/src/main/java/com/msg/design_system/component/topbar/DetailSettingTopBar.kt index 8c907017..5851d92c 100644 --- a/core/design-system/src/main/java/com/msg/design_system/component/topbar/DetailSettingTopBar.kt +++ b/core/design-system/src/main/java/com/msg/design_system/component/topbar/DetailSettingTopBar.kt @@ -2,7 +2,6 @@ package com.msg.design_system.component.topbar import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.size import androidx.compose.material3.IconButton diff --git a/core/model/src/main/java/com/msg/model/remote/response/lecture/GetTakingLectureStudentListResponse.kt b/core/model/src/main/java/com/msg/model/remote/response/lecture/GetTakingLectureStudentListResponse.kt index 34a53621..607b0ac2 100644 --- a/core/model/src/main/java/com/msg/model/remote/response/lecture/GetTakingLectureStudentListResponse.kt +++ b/core/model/src/main/java/com/msg/model/remote/response/lecture/GetTakingLectureStudentListResponse.kt @@ -1,7 +1,6 @@ package com.msg.model.remote.response.lecture import com.msg.model.remote.enumdatatype.HighSchool -import java.time.LocalDate import java.util.UUID data class GetTakingLectureStudentListResponse( diff --git a/core/ui/src/main/java/com/msg/ui/StudentActivityCard.kt b/core/ui/src/main/java/com/msg/ui/StudentActivityCard.kt index 34468e84..1c989a6a 100644 --- a/core/ui/src/main/java/com/msg/ui/StudentActivityCard.kt +++ b/core/ui/src/main/java/com/msg/ui/StudentActivityCard.kt @@ -1,5 +1,6 @@ package com.msg.ui +import Authority import androidx.compose.foundation.BorderStroke import androidx.compose.foundation.background import androidx.compose.foundation.clickable @@ -20,7 +21,6 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.model.remote.enumdatatype.ApproveStatus -import Authority import com.msg.model.remote.model.activity.GetStudentActivityModel import com.msg.ui.util.toKoreanFormat import java.time.LocalDate diff --git a/core/ui/src/main/java/com/msg/ui/StudentActivityList.kt b/core/ui/src/main/java/com/msg/ui/StudentActivityList.kt index 917dc4d8..1f3f7218 100644 --- a/core/ui/src/main/java/com/msg/ui/StudentActivityList.kt +++ b/core/ui/src/main/java/com/msg/ui/StudentActivityList.kt @@ -1,5 +1,6 @@ package com.msg.ui +import Authority import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.lazy.LazyColumn @@ -7,7 +8,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.model.activity.GetStudentActivityModel import java.util.UUID diff --git a/feature/certification/src/androidTest/java/com/msg/certification/ExampleInstrumentedTest.kt b/feature/certification/src/androidTest/java/com/msg/certification/ExampleInstrumentedTest.kt index 3ff9ff09..a9b8a2e9 100644 --- a/feature/certification/src/androidTest/java/com/msg/certification/ExampleInstrumentedTest.kt +++ b/feature/certification/src/androidTest/java/com/msg/certification/ExampleInstrumentedTest.kt @@ -1,13 +1,11 @@ package com.msg.certification -import androidx.test.platform.app.InstrumentationRegistry import androidx.test.ext.junit.runners.AndroidJUnit4 - +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.assertEquals import org.junit.Test import org.junit.runner.RunWith -import org.junit.Assert.* - /** * Instrumented test, which will execute on an Android device. * diff --git a/feature/certification/src/main/AndroidManifest.xml b/feature/certification/src/main/AndroidManifest.xml index a5918e68..44008a43 100644 --- a/feature/certification/src/main/AndroidManifest.xml +++ b/feature/certification/src/main/AndroidManifest.xml @@ -1,4 +1,4 @@ - + \ No newline at end of file diff --git a/feature/certification/src/main/java/com/msg/certification/AddCertificationScreen.kt b/feature/certification/src/main/java/com/msg/certification/AddCertificationScreen.kt index 5d40d72c..b42a9778 100644 --- a/feature/certification/src/main/java/com/msg/certification/AddCertificationScreen.kt +++ b/feature/certification/src/main/java/com/msg/certification/AddCertificationScreen.kt @@ -9,7 +9,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf @@ -22,7 +21,6 @@ import com.msg.certification.component.AddAcquisitionDateSection import com.msg.certification.component.AddCertificationSection import com.msg.design_system.component.button.BitgoeulButton import com.msg.design_system.component.topbar.DetailSettingTopBar -import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.design_system.theme.color.BitgoeulColor import com.msg.ui.DevicePreviews import com.msg.ui.util.toKoreanFormat diff --git a/feature/certification/src/main/java/com/msg/certification/CertificationViewModel.kt b/feature/certification/src/main/java/com/msg/certification/CertificationViewModel.kt index cb9ed6ff..9e952cc2 100644 --- a/feature/certification/src/main/java/com/msg/certification/CertificationViewModel.kt +++ b/feature/certification/src/main/java/com/msg/certification/CertificationViewModel.kt @@ -1,5 +1,6 @@ package com.msg.certification +import Authority import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.SavedStateHandle @@ -14,7 +15,6 @@ import com.msg.domain.certification.GetCertificationListForTeacherUseCase import com.msg.domain.certification.WriteCertificationUseCase import com.msg.domain.club.GetStudentBelongClubUseCase import com.msg.domain.lecture.GetLectureSignUpHistoryUseCase -import Authority import com.msg.model.remote.request.certification.WriteCertificationRequest import com.msg.model.remote.response.certification.CertificationListResponse import com.msg.model.remote.response.club.StudentBelongClubResponse diff --git a/feature/certification/src/main/java/com/msg/certification/component/CertificationItem.kt b/feature/certification/src/main/java/com/msg/certification/component/CertificationItem.kt index cb322f52..70d6c8d5 100644 --- a/feature/certification/src/main/java/com/msg/certification/component/CertificationItem.kt +++ b/feature/certification/src/main/java/com/msg/certification/component/CertificationItem.kt @@ -18,9 +18,9 @@ import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextDecoration import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp +import com.msg.design_system.R import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.model.remote.response.certification.CertificationListResponse -import com.msg.design_system.R import com.msg.ui.util.toDotFormat import java.time.LocalDate import java.util.UUID diff --git a/feature/certification/src/main/java/com/msg/certification/navigation/CertificationNavigation.kt b/feature/certification/src/main/java/com/msg/certification/navigation/CertificationNavigation.kt index fd5f322f..d34ac30f 100644 --- a/feature/certification/src/main/java/com/msg/certification/navigation/CertificationNavigation.kt +++ b/feature/certification/src/main/java/com/msg/certification/navigation/CertificationNavigation.kt @@ -8,7 +8,6 @@ import androidx.navigation.compose.composable import androidx.navigation.navArgument import com.msg.certification.AddCertificationScreenRoute import com.msg.certification.CertificationScreenRoute -import java.util.UUID const val certificationRoute = "certification_route" const val addCertificationRoute = "add_certification_route" diff --git a/feature/certification/src/test/java/com/msg/certification/ExampleUnitTest.kt b/feature/certification/src/test/java/com/msg/certification/ExampleUnitTest.kt index 43163abf..a1b3ec42 100644 --- a/feature/certification/src/test/java/com/msg/certification/ExampleUnitTest.kt +++ b/feature/certification/src/test/java/com/msg/certification/ExampleUnitTest.kt @@ -1,9 +1,8 @@ package com.msg.certification +import org.junit.Assert.assertEquals import org.junit.Test -import org.junit.Assert.* - /** * Example local unit test, which will execute on the development machine (host). * diff --git a/feature/club/src/main/java/com/msg/club/ClubDetailScreen.kt b/feature/club/src/main/java/com/msg/club/ClubDetailScreen.kt index 0254a7ff..0768ad25 100644 --- a/feature/club/src/main/java/com/msg/club/ClubDetailScreen.kt +++ b/feature/club/src/main/java/com/msg/club/ClubDetailScreen.kt @@ -1,5 +1,6 @@ package com.msg.club +import Authority import androidx.activity.ComponentActivity import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -16,7 +17,6 @@ import com.msg.club.component.ClubMemberInfoListSection import com.msg.design_system.component.icon.GoBackIcon import com.msg.design_system.component.topbar.GoBackTopBar import com.msg.design_system.theme.color.BitgoeulColor -import Authority import com.msg.model.remote.response.club.ClubDetailResponse import com.msg.ui.DevicePreviews import java.util.UUID diff --git a/feature/club/src/main/java/com/msg/club/ClubScreen.kt b/feature/club/src/main/java/com/msg/club/ClubScreen.kt index 8eea3f48..dbc97483 100644 --- a/feature/club/src/main/java/com/msg/club/ClubScreen.kt +++ b/feature/club/src/main/java/com/msg/club/ClubScreen.kt @@ -1,5 +1,6 @@ package com.msg.club +import Authority import androidx.activity.ComponentActivity import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -31,7 +32,6 @@ import com.msg.design_system.component.dialog.GetClubListDialog import com.msg.design_system.component.icon.BigAlertIcon import com.msg.design_system.component.icon.GreySettingIcon import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.enumdatatype.HighSchool import com.msg.model.remote.response.club.ClubListResponse import com.msg.ui.DevicePreviews diff --git a/feature/club/src/main/java/com/msg/club/ClubViewModel.kt b/feature/club/src/main/java/com/msg/club/ClubViewModel.kt index 4b73f38f..2960a634 100644 --- a/feature/club/src/main/java/com/msg/club/ClubViewModel.kt +++ b/feature/club/src/main/java/com/msg/club/ClubViewModel.kt @@ -1,5 +1,6 @@ package com.msg.club +import Authority import androidx.compose.runtime.mutableLongStateOf import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf @@ -12,7 +13,6 @@ import com.msg.domain.club.GetClubDetailUseCase import com.msg.domain.club.GetClubListUseCase import com.msg.domain.club.GetMyClubDetailUseCase import com.msg.domain.club.GetStudentBelongClubUseCase -import Authority import com.msg.model.remote.enumdatatype.HighSchool import com.msg.model.remote.response.club.ClubDetailResponse import com.msg.model.remote.response.club.ClubListResponse diff --git a/feature/lecture/src/main/java/com/msg/lecture/LectureDetailScreen.kt b/feature/lecture/src/main/java/com/msg/lecture/LectureDetailScreen.kt index af34db74..226384b0 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/LectureDetailScreen.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/LectureDetailScreen.kt @@ -38,7 +38,6 @@ import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.lecture.component.LectureExcelDownloadBottomSheet import com.msg.lecture.util.Event import com.msg.lecture.viewmodel.LectureViewModel -import Authority import com.msg.model.remote.enumdatatype.LectureStatus import com.msg.model.remote.response.lecture.DetailLectureResponse import com.msg.ui.util.toKoreanFormat diff --git a/feature/lecture/src/main/java/com/msg/lecture/LectureListScreen.kt b/feature/lecture/src/main/java/com/msg/lecture/LectureListScreen.kt index ba1f6373..e69feb45 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/LectureListScreen.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/LectureListScreen.kt @@ -22,7 +22,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.hilt.navigation.compose.hiltViewModel import com.msg.design_system.R @@ -33,7 +32,6 @@ import com.msg.lecture.component.LectureFilterDialog import com.msg.lecture.component.LectureList import com.msg.lecture.util.Event import com.msg.lecture.viewmodel.LectureViewModel -import Authority import com.msg.model.remote.response.lecture.LectureListResponse import com.msg.model.remote.response.lecture.Lectures import java.util.UUID diff --git a/feature/lecture/src/main/java/com/msg/lecture/LectureOpenScreen.kt b/feature/lecture/src/main/java/com/msg/lecture/LectureOpenScreen.kt index 25775b4a..85ed2eca 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/LectureOpenScreen.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/LectureOpenScreen.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.text.BasicTextField import androidx.compose.foundation.verticalScroll import androidx.compose.material3.HorizontalDivider -import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.mutableStateOf diff --git a/feature/lecture/src/main/java/com/msg/lecture/component/LectureDomainBottomSheet.kt b/feature/lecture/src/main/java/com/msg/lecture/component/LectureDomainBottomSheet.kt index e87edd11..10651c8e 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/component/LectureDomainBottomSheet.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/component/LectureDomainBottomSheet.kt @@ -1,9 +1,7 @@ package com.msg.lecture.component -import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -27,7 +25,6 @@ import androidx.compose.ui.unit.dp import com.msg.design_system.component.button.BitgoeulButton import com.msg.design_system.component.icon.CloseIcon import com.msg.design_system.component.icon.FileIcon -import com.msg.design_system.component.icon.FilterIcon import com.msg.design_system.component.icon.RedCloseIcon import com.msg.design_system.component.textfield.TrailingIconTextField import com.msg.design_system.theme.BitgoeulAndroidTheme diff --git a/feature/lecture/src/main/java/com/msg/lecture/util/timeFormatter.kt b/feature/lecture/src/main/java/com/msg/lecture/util/timeFormatter.kt index 1e72a449..c5950710 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/util/timeFormatter.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/util/timeFormatter.kt @@ -1,6 +1,5 @@ package com.msg.lecture.util -import java.time.LocalDate import java.time.LocalTime import java.time.format.DateTimeFormatter diff --git a/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt b/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt index a22900a0..9029fb2a 100644 --- a/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt +++ b/feature/lecture/src/main/java/com/msg/lecture/viewmodel/LectureViewModel.kt @@ -1,7 +1,7 @@ package com.msg.lecture.viewmodel +import Authority import android.app.Application -import android.util.Log import androidx.compose.runtime.mutableIntStateOf import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf @@ -23,7 +23,6 @@ import com.msg.domain.lecture.SearchLineUseCase import com.msg.domain.lecture.SearchProfessorUseCase import com.msg.lecture.util.Event import com.msg.lecture.util.errorHandling -import Authority import com.msg.model.remote.enumdatatype.HighSchool import com.msg.model.remote.enumdatatype.LectureStatus import com.msg.model.remote.enumdatatype.Semester diff --git a/feature/login/src/main/java/com/bitgoeul/login/LoginScreen.kt b/feature/login/src/main/java/com/bitgoeul/login/LoginScreen.kt index 4a71b736..81014fa2 100644 --- a/feature/login/src/main/java/com/bitgoeul/login/LoginScreen.kt +++ b/feature/login/src/main/java/com/bitgoeul/login/LoginScreen.kt @@ -1,7 +1,6 @@ package com.bitgoeul.login import android.content.pm.ActivityInfo -import android.util.Log import android.widget.Toast import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -20,12 +19,10 @@ import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.platform.LocalLifecycleOwner import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.hilt.navigation.compose.hiltViewModel -import androidx.lifecycle.LifecycleOwner import com.bitgoeul.login.viewmodel.AuthViewModel import com.bitgoeul.login.viewmodel.util.Event import com.msg.design_system.R @@ -38,9 +35,6 @@ import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.design_system.util.LockScreenOrientation import com.msg.design_system.util.checkEmailRegex import com.msg.design_system.util.checkPasswordRegex -import com.msg.model.remote.model.auth.AuthTokenModel -import com.msg.model.remote.request.auth.LoginRequest -import com.msg.model.remote.response.lecture.LectureListResponse import kotlinx.coroutines.launch @Composable diff --git a/feature/login/src/main/java/com/bitgoeul/login/viewmodel/AuthViewModel.kt b/feature/login/src/main/java/com/bitgoeul/login/viewmodel/AuthViewModel.kt index 7a3184a3..36a4a2ed 100644 --- a/feature/login/src/main/java/com/bitgoeul/login/viewmodel/AuthViewModel.kt +++ b/feature/login/src/main/java/com/bitgoeul/login/viewmodel/AuthViewModel.kt @@ -1,9 +1,5 @@ package com.bitgoeul.login.viewmodel -import androidx.compose.runtime.State -import androidx.compose.runtime.mutableStateOf -import androidx.lifecycle.LiveData -import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.bitgoeul.login.viewmodel.util.Event diff --git a/feature/main/src/main/java/com/msg/main/FaqViewModel.kt b/feature/main/src/main/java/com/msg/main/FaqViewModel.kt index 0ef0040a..f09ba236 100644 --- a/feature/main/src/main/java/com/msg/main/FaqViewModel.kt +++ b/feature/main/src/main/java/com/msg/main/FaqViewModel.kt @@ -1,12 +1,12 @@ package com.msg.main +import Authority import androidx.compose.runtime.mutableStateListOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.msg.datastore.AuthTokenDataSource import com.msg.main.util.Event import com.msg.main.util.errorHandling -import Authority import dagger.hilt.android.lifecycle.HiltViewModel import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow diff --git a/feature/main/src/main/java/com/msg/main/MainPageScreen.kt b/feature/main/src/main/java/com/msg/main/MainPageScreen.kt index c2c5cc7c..161badc8 100644 --- a/feature/main/src/main/java/com/msg/main/MainPageScreen.kt +++ b/feature/main/src/main/java/com/msg/main/MainPageScreen.kt @@ -1,5 +1,6 @@ package com.msg.main +import Authority import android.app.Activity import androidx.compose.foundation.Image import androidx.compose.foundation.background @@ -41,7 +42,6 @@ import com.msg.main.component.HighSchoolCardView import com.msg.main.component.HorizontalInfiniteBannerLoopPager import com.msg.main.component.HorizontalInfiniteLoopPager import com.msg.main.util.Event -import Authority import com.msg.model.remote.enumdatatype.HighSchool import com.msg.model.ui.CSTCollegeData import com.msg.model.ui.DKCollegeData diff --git a/feature/my-page/src/main/java/com/example/my_page/MyPageScreen.kt b/feature/my-page/src/main/java/com/example/my_page/MyPageScreen.kt index 556e46c4..1e7c19fe 100644 --- a/feature/my-page/src/main/java/com/example/my_page/MyPageScreen.kt +++ b/feature/my-page/src/main/java/com/example/my_page/MyPageScreen.kt @@ -1,5 +1,6 @@ package com.example.my_page +import Authority import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column @@ -22,7 +23,6 @@ import com.example.my_page.component.MyInfoView import com.example.my_page.util.Event import com.msg.design_system.component.dialog.NegativeActionDialog import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.response.user.InquiryMyPageResponse @Composable diff --git a/feature/my-page/src/main/java/com/example/my_page/MyPageViewModel.kt b/feature/my-page/src/main/java/com/example/my_page/MyPageViewModel.kt index f9eee555..f3343631 100644 --- a/feature/my-page/src/main/java/com/example/my_page/MyPageViewModel.kt +++ b/feature/my-page/src/main/java/com/example/my_page/MyPageViewModel.kt @@ -1,15 +1,15 @@ package com.example.my_page +import Authority import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.example.my_page.util.Event import com.example.my_page.util.errorHandling +import com.msg.domain.auth.LogoutUseCase import com.msg.domain.auth.WithdrawUseCase import com.msg.domain.user.ChangePasswordUseCase import com.msg.domain.user.InquiryMyPageUseCase -import Authority -import com.msg.domain.auth.LogoutUseCase import com.msg.model.remote.request.user.ChangePasswordRequest import com.msg.model.remote.response.user.InquiryMyPageResponse import dagger.hilt.android.lifecycle.HiltViewModel diff --git a/feature/my-page/src/main/java/com/example/my_page/component/MyInfoView.kt b/feature/my-page/src/main/java/com/example/my_page/component/MyInfoView.kt index b088381f..b2080782 100644 --- a/feature/my-page/src/main/java/com/example/my_page/component/MyInfoView.kt +++ b/feature/my-page/src/main/java/com/example/my_page/component/MyInfoView.kt @@ -1,5 +1,6 @@ package com.example.my_page.component +import Authority import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -12,7 +13,6 @@ import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.response.user.InquiryMyPageResponse @Composable diff --git a/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt b/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt index 749bf087..3398f1c8 100644 --- a/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt +++ b/feature/post/src/main/java/com/msg/post/PostDetailScreen.kt @@ -1,5 +1,6 @@ package com.msg.post +import Authority import androidx.activity.ComponentActivity import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement @@ -35,7 +36,6 @@ import com.msg.design_system.component.dialog.NegativeActionDialog import com.msg.design_system.component.icon.GoBackIcon import com.msg.design_system.component.topbar.GoBackTopBar import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.enumdatatype.FeedType import com.msg.model.remote.response.post.GetDetailPostResponse import com.msg.post.util.Event diff --git a/feature/post/src/main/java/com/msg/post/PostScreen.kt b/feature/post/src/main/java/com/msg/post/PostScreen.kt index 21d72e91..39d95905 100644 --- a/feature/post/src/main/java/com/msg/post/PostScreen.kt +++ b/feature/post/src/main/java/com/msg/post/PostScreen.kt @@ -1,5 +1,6 @@ package com.msg.post +import Authority import androidx.activity.ComponentActivity import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column @@ -23,14 +24,10 @@ import com.msg.design_system.component.icon.HelpIcon import com.msg.design_system.component.icon.MegaphoneIcon import com.msg.design_system.component.icon.PlusIcon import com.msg.design_system.theme.BitgoeulAndroidTheme -import Authority import com.msg.model.remote.enumdatatype.FeedType -import com.msg.model.remote.model.post.PostModel import com.msg.model.remote.response.post.GetPostListResponse import com.msg.post.util.Event -import com.msg.ui.DevicePreviews import com.msg.ui.PostList -import java.time.LocalDateTime import java.util.UUID @Composable diff --git a/feature/post/src/main/java/com/msg/post/PostViewModel.kt b/feature/post/src/main/java/com/msg/post/PostViewModel.kt index ef2404c8..df31908b 100644 --- a/feature/post/src/main/java/com/msg/post/PostViewModel.kt +++ b/feature/post/src/main/java/com/msg/post/PostViewModel.kt @@ -1,5 +1,6 @@ package com.msg.post +import Authority import androidx.compose.runtime.mutableStateListOf import androidx.compose.runtime.mutableStateOf import androidx.lifecycle.ViewModel @@ -10,7 +11,6 @@ import com.msg.domain.post.EditPostUseCase import com.msg.domain.post.GetDetailPostUseCase import com.msg.domain.post.GetPostListUseCase import com.msg.domain.post.SendPostUseCase -import Authority import com.msg.model.remote.enumdatatype.FeedType import com.msg.model.remote.request.post.WritePostRequest import com.msg.model.remote.response.post.GetDetailPostResponse diff --git a/feature/sign-up/src/main/java/com/msg/sign_up/SignUpScreen.kt b/feature/sign-up/src/main/java/com/msg/sign_up/SignUpScreen.kt index e9f0016c..6c1fb397 100644 --- a/feature/sign-up/src/main/java/com/msg/sign_up/SignUpScreen.kt +++ b/feature/sign-up/src/main/java/com/msg/sign_up/SignUpScreen.kt @@ -14,11 +14,9 @@ import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.windowInsetsEndWidth import androidx.compose.foundation.layout.wrapContentHeight import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll -import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.DisposableEffect @@ -43,7 +41,23 @@ import com.msg.design_system.component.textfield.PasswordTextField import com.msg.design_system.component.topbar.GoBackTopBar import com.msg.design_system.theme.BitgoeulAndroidTheme import com.msg.design_system.util.LockScreenOrientation -import com.msg.sign_up.SignUpState.* +import com.msg.sign_up.SignUpState.Belong +import com.msg.sign_up.SignUpState.Club +import com.msg.sign_up.SignUpState.College +import com.msg.sign_up.SignUpState.Email +import com.msg.sign_up.SignUpState.Enrollment +import com.msg.sign_up.SignUpState.Enterprise +import com.msg.sign_up.SignUpState.Government +import com.msg.sign_up.SignUpState.GradeAndNumber +import com.msg.sign_up.SignUpState.Job +import com.msg.sign_up.SignUpState.Loading +import com.msg.sign_up.SignUpState.Name +import com.msg.sign_up.SignUpState.Password +import com.msg.sign_up.SignUpState.PhoneNumber +import com.msg.sign_up.SignUpState.Position +import com.msg.sign_up.SignUpState.RePassword +import com.msg.sign_up.SignUpState.School +import com.msg.sign_up.SignUpState.Sectors import com.msg.sign_up.component.SignUpBottomSheet import com.msg.sign_up.data.BelongList import com.msg.sign_up.data.HighSchoolList diff --git a/feature/sign-up/src/main/java/com/msg/sign_up/SignUpViewModel.kt b/feature/sign-up/src/main/java/com/msg/sign_up/SignUpViewModel.kt index b39ee7da..2c1c06d6 100644 --- a/feature/sign-up/src/main/java/com/msg/sign_up/SignUpViewModel.kt +++ b/feature/sign-up/src/main/java/com/msg/sign_up/SignUpViewModel.kt @@ -10,7 +10,6 @@ import com.msg.domain.auth.SignUpGovernmentUseCase import com.msg.domain.auth.SignUpJobClubTeacherUseCase import com.msg.domain.auth.SignUpProfessorUseCase import com.msg.domain.auth.SignUpStudentUseCase -import com.msg.model.remote.enumdatatype.HighSchool import com.msg.model.remote.request.auth.SignUpBbozzakTeacherRequest import com.msg.model.remote.request.auth.SignUpCompanyInstructorRequest import com.msg.model.remote.request.auth.SignUpGovernmentRequest diff --git a/feature/student-activity/src/main/java/com/msg/student_activity/ActivityDetailScreen.kt b/feature/student-activity/src/main/java/com/msg/student_activity/ActivityDetailScreen.kt index a6cc2c1d..fdccf10a 100644 --- a/feature/student-activity/src/main/java/com/msg/student_activity/ActivityDetailScreen.kt +++ b/feature/student-activity/src/main/java/com/msg/student_activity/ActivityDetailScreen.kt @@ -1,5 +1,6 @@ package com.msg.student_activity +import Authority import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box