Skip to content

Commit

Permalink
refactor:rename packages
Browse files Browse the repository at this point in the history
  • Loading branch information
I-Info committed Oct 29, 2023
1 parent b69a4a0 commit 0f0ae2b
Show file tree
Hide file tree
Showing 27 changed files with 114 additions and 49 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import androidx.compose.ui.unit.Constraints
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import androidx.core.os.LocaleListCompat
import com.zjutjh.ijh.data.repository.mock.CourseRepositoryMock
import com.zjutjh.ijh.data.mock.CourseRepositoryMock
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Section
import com.zjutjh.ijh.ui.theme.Blue0
Expand Down
14 changes: 8 additions & 6 deletions app/src/main/kotlin/com/zjutjh/ijh/ui/component/ScheduleCard.kt
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import androidx.compose.material3.Card
import androidx.compose.material3.CircularProgressIndicator
import androidx.compose.material3.Divider
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.FilledIconButton
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.material3.Text
Expand All @@ -49,7 +49,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.em
import androidx.compose.ui.unit.sp
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.mock.CourseRepositoryMock
import com.zjutjh.ijh.data.mock.CourseRepositoryMock
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Term
import com.zjutjh.ijh.ui.model.TermDayState
Expand Down Expand Up @@ -89,18 +89,20 @@ fun ScheduleCard(
Text(
text = stringResource(id = R.string.schedule),
style = MaterialTheme.typography.headlineMedium,
fontWeight = FontWeight.Bold
fontWeight = FontWeight.Bold,
maxLines = 1,
)
// Subtitle
Text(
text = subtitle,
style = MaterialTheme.typography.titleSmall,
color = MaterialTheme.colorScheme.outline
color = MaterialTheme.colorScheme.outline,
maxLines = 1,
)
}

IconButton(
onClick = onCalendarClick
FilledIconButton(
onClick = onCalendarClick,
) {
Icon(
imageVector = Icons.Default.CalendarViewWeek,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ fun Modifier.verticalScrollbar(

val alpha by animateFloatAsState(
targetValue = targetAlpha,
animationSpec = tween(durationMillis = duration)
animationSpec = tween(durationMillis = duration), label = "scrollbarTransition"
)

val color = MaterialTheme.colorScheme.outline
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.mock.CourseRepositoryMock
import com.zjutjh.ijh.data.mock.CourseRepositoryMock
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Term
import com.zjutjh.ijh.ui.component.BackIconButton
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/kotlin/com/zjutjh/ijh/ui/screen/HomeScreen.kt
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.mock.CourseRepositoryMock
import com.zjutjh.ijh.data.mock.CourseRepositoryMock
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Term
import com.zjutjh.ijh.ui.component.IJhScaffold
Expand Down
43 changes: 37 additions & 6 deletions app/src/main/kotlin/com/zjutjh/ijh/ui/screen/LoginScreen.kt
Original file line number Diff line number Diff line change
@@ -1,14 +1,45 @@
package com.zjutjh.ijh.ui.screen

import android.content.res.Configuration.UI_MODE_NIGHT_YES
import androidx.compose.animation.*
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateContentSize
import androidx.compose.animation.expandVertically
import androidx.compose.animation.fadeIn
import androidx.compose.animation.fadeOut
import androidx.compose.animation.shrinkVertically
import androidx.compose.foundation.gestures.detectTapGestures
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.offset
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.*
import androidx.compose.material3.*
import androidx.compose.runtime.*
import androidx.compose.material.icons.filled.AccountCircle
import androidx.compose.material.icons.filled.Password
import androidx.compose.material.icons.filled.Person
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.LinearProgressIndicator
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.OutlinedTextField
import androidx.compose.material3.SnackbarHost
import androidx.compose.material3.SnackbarHostState
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.input.pointer.pointerInput
Expand All @@ -22,7 +53,7 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.mock.WeJhUserRepositoryMock
import com.zjutjh.ijh.data.mock.WeJhUserRepositoryMock
import com.zjutjh.ijh.ui.component.BackIconButton
import com.zjutjh.ijh.ui.component.IJhScaffold
import com.zjutjh.ijh.ui.model.CancellableLoadingState
Expand Down
21 changes: 18 additions & 3 deletions app/src/main/kotlin/com/zjutjh/ijh/ui/screen/ProfileScreen.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,24 @@
package com.zjutjh.ijh.ui.screen

import androidx.compose.foundation.layout.*
import androidx.compose.foundation.layout.BoxScope
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.ExperimentalLayoutApi
import androidx.compose.foundation.layout.FlowRow
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.widthIn
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Done
import androidx.compose.material3.*
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.FilterChip
import androidx.compose.material3.Icon
import androidx.compose.material3.ListItem
import androidx.compose.material3.Text
import androidx.compose.material3.TextButton
import androidx.compose.material3.TopAppBar
import androidx.compose.material3.TopAppBarScrollBehavior
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.ui.Alignment
Expand All @@ -14,7 +29,7 @@ import androidx.compose.ui.unit.dp
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.mock.WeJhUserRepositoryMock
import com.zjutjh.ijh.data.mock.WeJhUserRepositoryMock
import com.zjutjh.ijh.model.WeJhUser
import com.zjutjh.ijh.ui.component.BackIconButton
import com.zjutjh.ijh.ui.component.IJhScaffold
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.zjutjh.ijh.ui.viewmodel
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.zjutjh.ijh.data.repository.CourseRepository
import com.zjutjh.ijh.data.repository.WeJhInfoRepository
import com.zjutjh.ijh.data.repository.WeJhUserRepository
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.data.WeJhInfoRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Term
import com.zjutjh.ijh.ui.model.TermDayState
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package com.zjutjh.ijh.ui.viewmodel
import android.util.Log
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.zjutjh.ijh.data.repository.CourseRepository
import com.zjutjh.ijh.data.repository.WeJhInfoRepository
import com.zjutjh.ijh.data.repository.WeJhUserRepository
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.data.WeJhInfoRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Session
import com.zjutjh.ijh.model.Term
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.squareup.moshi.JsonDataException
import com.zjutjh.ijh.R
import com.zjutjh.ijh.data.repository.WeJhUserRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.exception.ApiResponseException
import com.zjutjh.ijh.exception.HttpStatusException
import com.zjutjh.ijh.exception.WeJhApiExceptions
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package com.zjutjh.ijh.ui.viewmodel

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.zjutjh.ijh.data.repository.WeJhUserRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.model.WeJhUser
import dagger.hilt.android.lifecycle.HiltViewModel
import kotlinx.coroutines.flow.SharingStarted
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/kotlin/com/zjutjh/ijh/util/CourseStack.kt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ import kotlinx.collections.immutable.toImmutableList
import kotlin.math.max
import kotlin.math.min

/**
* Course stack is a data structure to store courses that have time conflict.
*/
@Stable
class CourseStack(
course: Course,
Expand Down
11 changes: 9 additions & 2 deletions app/src/main/kotlin/com/zjutjh/ijh/util/LoadResult.kt
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
package com.zjutjh.ijh.util

import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.flow.*
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.SharedFlow
import kotlinx.coroutines.flow.SharingStarted
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.map
import kotlinx.coroutines.flow.onStart
import kotlinx.coroutines.flow.shareIn
import kotlinx.coroutines.flow.stateIn

sealed interface LoadResult<out T> {
object Loading : LoadResult<Nothing>
data object Loading : LoadResult<Nothing>
class Ready<T>(val data: T) : LoadResult<T>

fun <T> isEqual(v: LoadResult<T>): Boolean =
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ package com.zjutjh.ijh.util
import android.util.Log
import androidx.lifecycle.ViewModelProvider
import androidx.lifecycle.ViewModelStore
import androidx.lifecycle.ViewModelStoreOwner
import androidx.lifecycle.viewmodel.CreationExtras

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import androidx.work.Constraints
import androidx.work.ExistingPeriodicWorkPolicy
import androidx.work.PeriodicWorkRequestBuilder
import androidx.work.WorkManager
import com.zjutjh.ijh.data.repository.CourseRepository
import com.zjutjh.ijh.data.repository.WeJhInfoRepository
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.data.WeJhInfoRepository
import com.zjutjh.ijh.work.ScheduleWidgetUpdater
import com.zjutjh.ijh.work.enqueueWidgetRefresh
import dagger.hilt.EntryPoint
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data

import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.Term
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data

import com.zjutjh.ijh.model.Term
import com.zjutjh.ijh.model.WeJhInfo
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data

import com.zjutjh.ijh.model.Session
import com.zjutjh.ijh.model.WeJhUser
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.model
package com.zjutjh.ijh.data.converter

import com.zjutjh.ijh.database.model.CourseEntity
import com.zjutjh.ijh.exception.CourseParseException
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.model
package com.zjutjh.ijh.data.converter

import com.zjutjh.ijh.datastore.model.WeJhPreferenceKt
import com.zjutjh.ijh.model.toTerm
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.zjutjh.ijh.data.model
package com.zjutjh.ijh.data.converter

import com.zjutjh.ijh.datastore.model.WeJhPreference
import com.zjutjh.ijh.datastore.model.WeJhPreferenceKt
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
package com.zjutjh.ijh.data.di

import com.zjutjh.ijh.data.repository.*
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.data.WeJhInfoRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.data.impl.CourseRepositoryImpl
import com.zjutjh.ijh.data.impl.WeJhInfoRepositoryImpl
import com.zjutjh.ijh.data.impl.WeJhUserRepositoryImpl
import dagger.Binds
import dagger.Module
import dagger.hilt.InstallIn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data.impl

import com.zjutjh.ijh.data.model.asLocalModel
import com.zjutjh.ijh.data.model.equalsIgnoreId
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.data.converter.asLocalModel
import com.zjutjh.ijh.data.converter.equalsIgnoreId
import com.zjutjh.ijh.database.dao.CourseDao
import com.zjutjh.ijh.database.model.CourseEntity
import com.zjutjh.ijh.datastore.WeJhPreferenceDataSource
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data.impl

import com.zjutjh.ijh.data.WeJhInfoRepository
import com.zjutjh.ijh.datastore.WeJhPreferenceDataSource
import com.zjutjh.ijh.datastore.converter.asExternalModel
import com.zjutjh.ijh.datastore.model.infoOrNull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.zjutjh.ijh.data.repository
package com.zjutjh.ijh.data.impl

import com.zjutjh.ijh.data.model.asLocalModel
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.data.converter.asLocalModel
import com.zjutjh.ijh.datastore.WeJhPreferenceDataSource
import com.zjutjh.ijh.datastore.converter.asExternalModel
import com.zjutjh.ijh.datastore.model.sessionOrNull
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.zjutjh.ijh.data.repository.mock
package com.zjutjh.ijh.data.mock

import com.zjutjh.ijh.data.repository.CourseRepository
import com.zjutjh.ijh.data.CourseRepository
import com.zjutjh.ijh.model.Course
import com.zjutjh.ijh.model.CourseWeek
import com.zjutjh.ijh.model.Term
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.zjutjh.ijh.data.repository.mock
package com.zjutjh.ijh.data.mock

import com.zjutjh.ijh.data.repository.WeJhUserRepository
import com.zjutjh.ijh.data.WeJhUserRepository
import com.zjutjh.ijh.model.Session
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf
Expand Down

0 comments on commit 0f0ae2b

Please sign in to comment.