diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eed75ff06..0c6052d13 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -36,14 +36,8 @@ jobs: - name: Create google-services.json run: | - mkdir -p ${{ github.workspace }}/app - echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > ${{ github.workspace }}/app/google-services.json - - - name: Build with Gradle - run: ./gradlew assembleDebug --parallel - - - name: Run test - run: ./gradlew test + mkdir -p ${{ github.workspace }}/app + echo '${{ secrets.GOOGLE_SERVICES_JSON }}' | base64 --decode > ${{ github.workspace }}/app/google-services.json - name: Check Ktlint run: ./gradlew ktlintCheck diff --git a/core/database/src/main/java/team/aliens/dms/android/core/database/converter/DateTypeConverter.kt b/core/database/src/main/java/team/aliens/dms/android/core/database/converter/DateTypeConverter.kt index fe807942d..8458364fd 100644 --- a/core/database/src/main/java/team/aliens/dms/android/core/database/converter/DateTypeConverter.kt +++ b/core/database/src/main/java/team/aliens/dms/android/core/database/converter/DateTypeConverter.kt @@ -2,11 +2,11 @@ package team.aliens.dms.android.core.database.converter import androidx.room.ProvidedTypeConverter import androidx.room.TypeConverter +import team.aliens.dms.android.shared.date.toLocalDate +import team.aliens.dms.android.shared.date.toLocalDateTime import java.time.LocalDate import java.time.LocalDateTime import java.time.ZoneOffset -import team.aliens.dms.android.shared.date.toLocalDate -import team.aliens.dms.android.shared.date.toLocalDateTime import javax.inject.Inject @ProvidedTypeConverter diff --git a/core/database/src/main/java/team/aliens/dms/android/core/database/dao/MealDao.kt b/core/database/src/main/java/team/aliens/dms/android/core/database/dao/MealDao.kt index a8ecd9597..c01bb04ff 100644 --- a/core/database/src/main/java/team/aliens/dms/android/core/database/dao/MealDao.kt +++ b/core/database/src/main/java/team/aliens/dms/android/core/database/dao/MealDao.kt @@ -4,8 +4,8 @@ import androidx.room.Dao import androidx.room.Insert import androidx.room.OnConflictStrategy import androidx.room.Query -import java.time.LocalDate import team.aliens.dms.android.core.database.entity.MealEntity +import java.time.LocalDate @Dao abstract class MealDao { diff --git a/core/database/src/main/java/team/aliens/dms/android/core/database/di/DatabaseModule.kt b/core/database/src/main/java/team/aliens/dms/android/core/database/di/DatabaseModule.kt index 41fdc0881..6fa88dbcf 100644 --- a/core/database/src/main/java/team/aliens/dms/android/core/database/di/DatabaseModule.kt +++ b/core/database/src/main/java/team/aliens/dms/android/core/database/di/DatabaseModule.kt @@ -8,7 +8,6 @@ import dagger.Provides import dagger.hilt.InstallIn import dagger.hilt.android.qualifiers.ApplicationContext import dagger.hilt.components.SingletonComponent -import java.time.ZoneOffset import team.aliens.dms.android.core.database.DmsDatabase import team.aliens.dms.android.core.database.converter.DateTypeConverter import team.aliens.dms.android.core.database.converter.StringListTypeConverter @@ -16,6 +15,7 @@ import team.aliens.dms.android.core.database.converter.UuidTypeConverter import team.aliens.dms.android.core.database.dao.MealDao import team.aliens.dms.android.core.database.dao.NoticeDao import team.aliens.dms.android.core.database.util.addTypeConverters +import java.time.ZoneOffset import javax.inject.Singleton @Module diff --git a/core/design-system/build.gradle.kts b/core/design-system/build.gradle.kts index 83c8ac94c..fb7081656 100644 --- a/core/design-system/build.gradle.kts +++ b/core/design-system/build.gradle.kts @@ -43,7 +43,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/Colors.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsColor.kt similarity index 100% rename from core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/Colors.kt rename to core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/DmsColor.kt diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/button/Button.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/button/Button.kt index 9000364e6..d6dec4c23 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/button/Button.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/button/Button.kt @@ -29,9 +29,9 @@ import team.aliens.dms.android.core.designsystem.bodyM import team.aliens.dms.android.core.designsystem.indicator.DmsDotsLoadingIndicator import team.aliens.dms.android.core.designsystem.labelM import team.aliens.dms.android.core.designsystem.util.DEFAULT_PRESS_DEPTH +import team.aliens.dms.android.core.designsystem.util.KeyboardAsState import team.aliens.dms.android.core.designsystem.util.MIN_PRESS_DEPTH import team.aliens.dms.android.core.designsystem.util.clickable -import team.aliens.dms.android.core.designsystem.util.keyboardAsState import team.aliens.dms.android.core.designsystem.util.modifyIf data class ButtonState( @@ -211,7 +211,7 @@ private fun BasicButton( content = content, )*/ - val keyboardShow by keyboardAsState() + val keyboardShow by KeyboardAsState() val isKeyboardHideButton = keyboardShow && keyboardInteractionEnabled val (shapeByKeyboardShow, pressDepth) = if (isKeyboardHideButton) { RoundedCornerShape(0.dp) to MIN_PRESS_DEPTH diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/calendar/DmsCalendar.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/calendar/DmsCalendar.kt index f8dd79800..400ae4ceb 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/calendar/DmsCalendar.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/calendar/DmsCalendar.kt @@ -29,12 +29,11 @@ import team.aliens.dms.android.core.designsystem.bodyM import team.aliens.dms.android.core.designsystem.button.ButtonColor import team.aliens.dms.android.core.designsystem.button.ButtonType import team.aliens.dms.android.core.designsystem.button.DmsButton -import team.aliens.dms.android.core.designsystem.util.clickable import team.aliens.dms.android.core.designsystem.horizontalPadding +import team.aliens.dms.android.core.designsystem.util.clickable import team.aliens.dms.android.core.designsystem.verticalPadding import java.time.LocalDate import java.time.YearMonth -import kotlin.time.Duration.Companion.days import kotlin.time.ExperimentalTime @OptIn(ExperimentalTime::class) diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/dialog/AlertDialog.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/dialog/AlertDialog.kt index 8538d555b..d6ac88f20 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/dialog/AlertDialog.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/dialog/AlertDialog.kt @@ -5,7 +5,6 @@ import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.Shape -import androidx.compose.ui.unit.Dp import androidx.compose.ui.unit.dp import androidx.compose.ui.window.DialogProperties import team.aliens.dms.android.core.designsystem.DmsTheme diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/foundation/DmsSymbol.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/foundation/DmsSymbol.kt index 508ed85c8..bfbac64d2 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/foundation/DmsSymbol.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/foundation/DmsSymbol.kt @@ -3,7 +3,6 @@ package team.aliens.dms.android.core.designsystem.foundation import androidx.compose.foundation.Image import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.padding import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.ui.Modifier @@ -29,7 +28,7 @@ fun DmsSymbolContent( Column( modifier = Modifier - .horizontalPadding(24.dp) + .horizontalPadding(24.dp), ) { Image( modifier = modifier, @@ -46,7 +45,7 @@ fun DmsSymbolContent( modifier = Modifier.topPadding(12.dp), text = description, style = DmsTheme.typography.bodyM, - color = DmsTheme.colorScheme.inverseSurface + color = DmsTheme.colorScheme.inverseSurface, ) } } diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/composeExt.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/ComposeExt.kt similarity index 100% rename from core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/composeExt.kt rename to core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/ComposeExt.kt diff --git a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/keyboardAsState.kt b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/KeyboardAsState.kt similarity index 92% rename from core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/keyboardAsState.kt rename to core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/KeyboardAsState.kt index 40eee005c..97b4e5502 100644 --- a/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/keyboardAsState.kt +++ b/core/design-system/src/main/java/team/aliens/dms/android/core/designsystem/util/KeyboardAsState.kt @@ -8,7 +8,7 @@ import androidx.compose.runtime.rememberUpdatedState import androidx.compose.ui.platform.LocalDensity @Composable -fun keyboardAsState(): State { +fun KeyboardAsState(): State { val isImeVisible = WindowInsets.ime.getBottom(LocalDensity.current) > 0 return rememberUpdatedState(newValue = isImeVisible) } diff --git a/core/device/build.gradle.kts b/core/device/build.gradle.kts index 486312550..137dd4116 100644 --- a/core/device/build.gradle.kts +++ b/core/device/build.gradle.kts @@ -35,7 +35,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/jwt/build.gradle.kts b/core/jwt/build.gradle.kts index 4e4257e79..f394c3a3e 100644 --- a/core/jwt/build.gradle.kts +++ b/core/jwt/build.gradle.kts @@ -39,7 +39,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/network/build.gradle.kts b/core/network/build.gradle.kts index 847a0c6ab..04cf4e52c 100644 --- a/core/network/build.gradle.kts +++ b/core/network/build.gradle.kts @@ -43,7 +43,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/notification/build.gradle.kts b/core/notification/build.gradle.kts index 674f27bab..ca3cf5140 100644 --- a/core/notification/build.gradle.kts +++ b/core/notification/build.gradle.kts @@ -39,7 +39,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/school/build.gradle.kts b/core/school/build.gradle.kts index 086a359c9..c320e9488 100644 --- a/core/school/build.gradle.kts +++ b/core/school/build.gradle.kts @@ -39,7 +39,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/ui/build.gradle.kts b/core/ui/build.gradle.kts index e5cf2d844..0b636b4e8 100644 --- a/core/ui/build.gradle.kts +++ b/core/ui/build.gradle.kts @@ -42,7 +42,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/core/ui/src/main/java/team/aliens/dms/android/core/ui/navigation/ResultStore.kt b/core/ui/src/main/java/team/aliens/dms/android/core/ui/navigation/ResultStore.kt index b0be3e454..c12fe3fe2 100644 --- a/core/ui/src/main/java/team/aliens/dms/android/core/ui/navigation/ResultStore.kt +++ b/core/ui/src/main/java/team/aliens/dms/android/core/ui/navigation/ResultStore.kt @@ -18,7 +18,7 @@ object LocalResultStore { get() = LocalResultStore.current ?: error("No ResultStore has been provided") infix fun provides( - store: ResultStore + store: ResultStore, ): ProvidedValue { return LocalResultStore.provides(store) } diff --git a/core/widget/build.gradle.kts b/core/widget/build.gradle.kts index 69da582da..faf647711 100644 --- a/core/widget/build.gradle.kts +++ b/core/widget/build.gradle.kts @@ -41,7 +41,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/data/build.gradle.kts b/data/build.gradle.kts index e849f6b37..9c3d79953 100644 --- a/data/build.gradle.kts +++ b/data/build.gradle.kts @@ -39,7 +39,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSource.kt b/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSource.kt index 328c16da5..2ecaa02bd 100644 --- a/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSource.kt +++ b/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSource.kt @@ -1,7 +1,7 @@ package team.aliens.dms.android.database.meal.datasource -import java.time.LocalDate import team.aliens.dms.android.core.database.entity.MealEntity +import java.time.LocalDate abstract class DatabaseMealDataSource { abstract suspend fun queryMeal(date: LocalDate): MealEntity diff --git a/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSourceImpl.kt b/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSourceImpl.kt index af65e7da0..ce46197eb 100644 --- a/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSourceImpl.kt +++ b/database/src/main/java/team/aliens/dms/android/database/meal/datasource/DatabaseMealDataSourceImpl.kt @@ -1,8 +1,8 @@ package team.aliens.dms.android.database.meal.datasource -import java.time.LocalDate import team.aliens.dms.android.core.database.dao.MealDao import team.aliens.dms.android.core.database.entity.MealEntity +import java.time.LocalDate import javax.inject.Inject internal class DatabaseMealDataSourceImpl @Inject constructor( diff --git a/feature/build.gradle.kts b/feature/build.gradle.kts index 83957b9d8..d1a8fb263 100644 --- a/feature/build.gradle.kts +++ b/feature/build.gradle.kts @@ -44,7 +44,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { @@ -63,7 +62,6 @@ dependencies { implementation(project(ProjectPaths.Core.NETWORK)) implementation(project(ProjectPaths.Core.DEVICE)) - implementation(project(ProjectPaths.NETWORK)) implementation(project(ProjectPaths.DATA)) @@ -96,7 +94,6 @@ dependencies { implementation(libs.threetenbp) - testImplementation(libs.androidx.junit) androidTestImplementation(libs.androidx.junit) } diff --git a/network/build.gradle.kts b/network/build.gradle.kts index cf181122c..4f677362c 100644 --- a/network/build.gradle.kts +++ b/network/build.gradle.kts @@ -69,7 +69,6 @@ android { kotlinOptions { jvmTarget = Versions.java.toString() } - } dependencies { diff --git a/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/DateUtilsTest.kt b/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/DateUtilsTest.kt index 10b1f2eeb..d8749bb47 100644 --- a/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/DateUtilsTest.kt +++ b/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/DateUtilsTest.kt @@ -1,9 +1,9 @@ package team.aliens.dms.android.shared.date.junit import org.junit.Test -import java.time.LocalDate import team.aliens.dms.android.shared.date.util.now import team.aliens.dms.android.shared.date.util.today +import java.time.LocalDate class DateUtilsTest { diff --git a/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/ExtensionsTest.kt b/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/ExtensionsTest.kt index a02482326..b4e6e4fdc 100644 --- a/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/ExtensionsTest.kt +++ b/shared/date/src/test/java/team/aliens/dms/android/shared/date/junit/ExtensionsTest.kt @@ -2,13 +2,13 @@ package team.aliens.dms.android.shared.date.junit import org.junit.Before import org.junit.Test -import java.time.LocalDate -import java.time.LocalDateTime -import java.time.ZoneOffset import team.aliens.dms.android.shared.date.toDate import team.aliens.dms.android.shared.date.toEpochMilli import team.aliens.dms.android.shared.date.toLocalDate import team.aliens.dms.android.shared.date.toLocalDateTime +import java.time.LocalDate +import java.time.LocalDateTime +import java.time.ZoneOffset import java.util.Date class ExtensionsTest {