Skip to content

[feat][배포사항 아님!! 머지금지!!!] 적응형 앱 설계 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
chlwhdtn03 wants to merge 13 commits into
base: develop
Choose a base branch
from
Draft

[feat][배포사항 아님!! 머지금지!!!] 적응형 앱 설계 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
9169e0a
넓은 화면에서는 우측 화면에 시간표 표시
chlwhdtn03 Jun 19, 2026
eb5300f
장학금, 등록금, 졸업사정표 페이저에 추가
chlwhdtn03 Jun 19, 2026
60a0726
로그아웃 시 모든 DataStore 삭제
chlwhdtn03 Jun 19, 2026
eb3f303
일반 화면에서도 뷰페이저 지원
chlwhdtn03 Jun 20, 2026
e56f41f
뷰페이저 인디케이터 아이콘
chlwhdtn03 Jun 20, 2026
6e7b453
뷰페이저 인디케이터 아이콘 (대형 UI)
chlwhdtn03 Jun 20, 2026
8953bd7
성적 조회 Fragment 추가
chlwhdtn03 Jun 21, 2026
3c3d9b3
대화면 UI 수정
chlwhdtn03 Jun 21, 2026
a8a9f2e
장학금 지급 색상 수정
chlwhdtn03 Jun 21, 2026
a6589b1
시간표 전체 수업 시작 종료 시각 표기
chlwhdtn03 Jun 21, 2026
c48bfbb
성적 조회에서 Pass/Fail은 점수 안뜨도록 수정
chlwhdtn03 Jun 21, 2026
f3b4145
채플 탭 추가
chlwhdtn03 Jun 22, 2026
d4518d1
채플 데이터 없는 학기에 대한 예외처리
chlwhdtn03 Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .idea/deploymentTargetSelector.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,7 @@ android {
}

dependencies {
implementation(libs.androidx.compose.adaptive)
val glanceVersion = "1.1.1"

implementation(platform(libs.androidx.compose.bom))
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/com/yourssu/ssutime/v2/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@ import androidx.activity.result.ActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
import androidx.compose.runtime.mutableIntStateOf
import androidx.compose.runtime.mutableStateOf
import androidx.compose.ui.Modifier
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import androidx.window.core.layout.WindowSizeClass
import com.google.android.play.core.appupdate.AppUpdateInfo
import com.google.android.play.core.appupdate.AppUpdateManagerFactory
import com.google.android.play.core.appupdate.AppUpdateOptions
Expand Down Expand Up @@ -138,7 +140,15 @@ class MainActivity : ComponentActivity() {
backStackEntry.savedStateHandle.remove<Boolean>(
SKIP_MAIN_LOAD_FROM_MY_PAGE_BACK_KEY
) == true

val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
val isLargeScreen = windowSizeClass.isAtLeastBreakpoint(
WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND,
WindowSizeClass.HEIGHT_DP_MEDIUM_LOWER_BOUND
)

MainScreen(
isLargeScreen = isLargeScreen,
skipInitialLmsRefresh = skipInitialLmsRefresh.value,
forceInitialLmsRefresh = forceInitialLmsRefresh.value,
homeEntrySource = homeEntrySource.value,
Expand Down
36 changes: 36 additions & 0 deletions app/src/main/java/com/yourssu/ssutime/v2/SSUTime.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,12 @@ import androidx.datastore.core.Serializer
import androidx.datastore.core.handlers.ReplaceFileCorruptionHandler
import androidx.datastore.dataStore
import com.yourssu.data.AlertData
import com.yourssu.data.LocalChapel
import com.yourssu.data.LocalGrade
import com.yourssu.data.LocalGraduate
import com.yourssu.data.LocalScholarship
import com.yourssu.data.LocalTimetable
import com.yourssu.data.LocalTuition
import com.yourssu.data.LoginData
import com.yourssu.data.TodoData
import com.yourssu.ssutime.v2.network.ApiRepository
Expand All @@ -17,8 +23,14 @@ import com.yourssu.ssutime.v2.screen.login.LoginViewModel
import com.yourssu.ssutime.v2.screen.main.LmsRefreshRepository
import com.yourssu.ssutime.v2.screen.main.MainRepository
import com.yourssu.ssutime.v2.screen.main.MainViewModel
import com.yourssu.ssutime.v2.screen.main.chapelDataStore
import com.yourssu.ssutime.v2.screen.main.gradeDataStore
import com.yourssu.ssutime.v2.screen.main.graduateDataStore
import com.yourssu.ssutime.v2.screen.main.notificationStore
import com.yourssu.ssutime.v2.screen.main.scholarshipDataStore
import com.yourssu.ssutime.v2.screen.main.timetableDataStore
import com.yourssu.ssutime.v2.screen.main.todoDataStore
import com.yourssu.ssutime.v2.screen.main.tuitionDataStore
import com.yourssu.ssutime.v2.screen.my.MyViewModel
import com.yourssu.ssutime.v2.screen.onboarding.OnBoardingData
import com.yourssu.ssutime.v2.screen.onboarding.OnBoardingRepository
Expand Down Expand Up @@ -52,12 +64,24 @@ val appModule = module {
single<DataStore<TodoData>>(named("todoDataStore")) { androidContext().todoDataStore }
single<DataStore<OnBoardingData>>(named("onBoardingDataStore")) { androidContext().onBoardingDataStore }
single<DataStore<AlertData>>(named("alertDataStore")) { androidContext().notificationStore }
single<DataStore<LocalTimetable>>(named("timetableDataStore")) { androidContext().timetableDataStore }
single<DataStore<LocalScholarship>>(named("scholarshipDataStore")) { androidContext().scholarshipDataStore }
single<DataStore<LocalTuition>>(named("tuitionDataStore")) { androidContext().tuitionDataStore }
single<DataStore<LocalGraduate>>(named("graduateDataStore")) { androidContext().graduateDataStore }
single<DataStore<LocalGrade>>(named("gradeDataStore")) { androidContext().gradeDataStore }
single<DataStore<LocalChapel>>(named("chapelDataStore")) { androidContext().chapelDataStore }

single { LoginRepository(get()) }
single {
MainRepository(
get(named("todoDataStore")),
get(named("alertDataStore")),
get(named("timetableDataStore")),
get(named("scholarshipDataStore")),
get(named("tuitionDataStore")),
get(named("graduateDataStore")),
get(named("gradeDataStore")),
get(named("chapelDataStore")),
get(),
androidContext()
)
Expand Down Expand Up @@ -98,6 +122,12 @@ val previewModule = module {
single<DataStore<TodoData>>(named("todoDataStore")) { androidContext().todoDataStore }
single<DataStore<OnBoardingData>>(named("onBoardingDataStore")) { androidContext().onBoardingDataStore }
single<DataStore<AlertData>>(named("alertDataStore")) { androidContext().notificationStore }
single<DataStore<LocalTimetable>>(named("timetableDataStore")) { androidContext().timetableDataStore }
single<DataStore<LocalScholarship>>(named("scholarshipDataStore")) { androidContext().scholarshipDataStore }
single<DataStore<LocalTuition>>(named("tuitionDataStore")) { androidContext().tuitionDataStore }
single<DataStore<LocalGraduate>>(named("graduateDataStore")) { androidContext().graduateDataStore }
single<DataStore<LocalGrade>>(named("gradeDataStore")) { androidContext().gradeDataStore }
single<DataStore<LocalChapel>>(named("chapelDataStore")) { androidContext().chapelDataStore }

single { LoginRepository(get()) }
single {
Expand All @@ -107,6 +137,12 @@ val previewModule = module {
MainRepository(
get(named("todoDataStore")),
get(named("alertDataStore")),
get(named("timetableDataStore")),
get(named("scholarshipDataStore")),
get(named("tuitionDataStore")),
get(named("graduateDataStore")),
get(named("gradeDataStore")),
get(named("chapelDataStore")),
get(),
androidContext()
)
Expand Down
Loading