Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: team-suwiki/suwiki-android
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v2.3.7
Choose a base ref
...
head repository: team-suwiki/suwiki-android
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: develop
Choose a head ref
  • 11 commits
  • 661 files changed
  • 1 contributor

Commits on Jun 19, 2024

  1. Copy the full SHA
    ce2466c View commit details
  2. Copy the full SHA
    6247a17 View commit details
  3. Merge pull request #135 from uswLectureEvaluation/refactor/#134-local…

    …-common
    
    Refactor/#134 local common
    jinukeu authored Jun 19, 2024
    Copy the full SHA
    9b04af9 View commit details
  4. Copy the full SHA
    60ff079 View commit details
  5. Merge pull request #137 from uswLectureEvaluation/refactor/#136

    refactor: core:network -> remote:common
    jinukeu authored Jun 19, 2024
    Copy the full SHA
    46aff95 View commit details

Commits on Jun 20, 2024

  1. Copy the full SHA
    dce63fe View commit details

Commits on Jun 21, 2024

  1. core:designsystem, ui -> feature:common (#142)

    * fix: 잘못된 import 수정
    
    * refactor: core:ui -> feature:common:ui
    
    * refactor: core:designsystem -> feature:common:designsystem
    jinukeu authored Jun 21, 2024
    Copy the full SHA
    59b40b4 View commit details
  2. Copy the full SHA
    0a97d7a View commit details
  3. Copy the full SHA
    b58b7dc View commit details

Commits on Jul 20, 2024

  1. Refactor/#147 lecture evaluation (#148)

    * refactor: remote:lectureevaluation 하위 모듈 통합
    
    * refactor: data:lectureevaluation 하위 모듈 통합
    
    * refactor: presentation:lectureevaluation 하위 모듈 통합
    
    * refactor: domain:lectureevaluation 하위 모듈 통합
    jinukeu authored Jul 20, 2024
    Copy the full SHA
    efcce06 View commit details

Commits on Jul 27, 2024

  1. Copy the full SHA
    89c1392 View commit details
Showing 661 changed files with 1,949 additions and 3,575 deletions.
12 changes: 4 additions & 8 deletions app-compose/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -19,14 +19,12 @@ android {
}

dependencies {
implementation(projects.core.designsystem)
implementation(projects.feature.navigator)
implementation(projects.presentation.common.designsystem)
implementation(projects.presentation.navigator)

implementation(projects.remote.openmajor)
implementation(projects.remote.timetable)
implementation(projects.remote.lectureevaluation.viewerreporter)
implementation(projects.remote.lectureevaluation.my)
implementation(projects.remote.lectureevaluation.editor)
implementation(projects.remote.lectureevaluation)
implementation(projects.remote.signup)
implementation(projects.remote.notice)
implementation(projects.remote.user)
@@ -39,9 +37,7 @@ dependencies {

implementation(projects.data.openmajor)
implementation(projects.data.timetable)
implementation(projects.data.lectureevaluation.viewerreporter)
implementation(projects.data.lectureevaluation.editor)
implementation(projects.data.lectureevaluation.my)
implementation(projects.data.lectureevaluation)
implementation(projects.data.user)
implementation(projects.data.notice)
implementation(projects.data.signup)

This file was deleted.

This file was deleted.

6 changes: 3 additions & 3 deletions build-logic/convention/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -41,9 +41,9 @@ gradlePlugin {
id = "suwiki.java.library"
implementationClass = "JavaLibraryConventionPlugin"
}
register("featureCompose") {
id = "suwiki.android.feature.compose"
implementationClass = "FeatureComposeConventionPlugin"
register("presentationCompose") {
id = "suwiki.android.presentation.compose"
implementationClass = "PresentationComposeConventionPlugin"
}
register("remote") {
id = "suwiki.android.remote"
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ internal class DataConventionPlugin : Plugin<Project> {
}

dependencies {
"implementation"(project(":core:model"))
"implementation"(project(":common:model"))

"implementation"(libs.findBundle("coroutine").get())

Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@ import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies
import org.gradle.kotlin.dsl.project

internal class FeatureComposeConventionPlugin : Plugin<Project> {
internal class PresentationComposeConventionPlugin : Plugin<Project> {

override fun apply(target: Project) {
with(target) {
@@ -15,10 +15,10 @@ internal class FeatureComposeConventionPlugin : Plugin<Project> {
}

dependencies {
"implementation"(project(":core:model"))
"implementation"(project(":core:android"))
"implementation"(project(":core:ui"))
"implementation"(project(":core:designsystem"))
"implementation"(project(":common:model"))
"implementation"(project(":common:android"))
"implementation"(project(":presentation:common:ui"))
"implementation"(project(":presentation:common:designsystem"))

"implementation"(libs.findBundle("orbit").get())

Original file line number Diff line number Diff line change
@@ -14,8 +14,8 @@ internal class RemoteConventionPlugin : Plugin<Project> {
}

dependencies {
"implementation"(project(":core:model"))
"implementation"(project(":core:network"))
"implementation"(project(":common:model"))
"implementation"(project(":remote:common"))

"implementation"(libs.findBundle("coroutine").get())

Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ import org.gradle.api.Project
import org.gradle.kotlin.dsl.dependencies

internal fun Project.configureAndroidCompose(
commonExtension: CommonExtension<*, *, *, *, *>,
commonExtension: CommonExtension<*, *, *, *, *, *>,
) {
commonExtension.apply {
buildFeatures {
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ import org.gradle.api.plugins.ExtensionAware
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions

internal fun Project.configureKotlinAndroid(
commonExtension: CommonExtension<*, *, *, *, *>,
commonExtension: CommonExtension<*, *, *, *, *, *>,
) {
commonExtension.apply {
compileSdk = Const.compileSdk
@@ -48,7 +48,7 @@ internal fun Project.configureKotlinAndroid(
}
}

internal fun CommonExtension<*, *, *, *, *>.kotlinOptions(
internal fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(
block: KotlinJvmOptions.() -> Unit,
) {
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -5,11 +5,11 @@ plugins {
}

android {
namespace = "com.suwiki.core.android"
namespace = "com.suwiki.common.android"
}

dependencies {
implementation(projects.core.model)
implementation(projects.common.model)

implementation(platform(libs.firebase.bom))
implementation(libs.firebase.crashlytics)
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.android
package com.suwiki.common.android

import javax.inject.Qualifier

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.android
package com.suwiki.common.android

import dagger.Module
import dagger.Provides
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.android
package com.suwiki.common.android

import com.google.firebase.crashlytics.ktx.crashlytics
import com.google.firebase.ktx.Firebase
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.enums
package com.suwiki.common.model.enums

import androidx.compose.runtime.Stable

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.enums
package com.suwiki.common.model.enums

import androidx.compose.runtime.Stable

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.exception
package com.suwiki.common.model.exception

class RequestFailException(
override val message: String = "요청을 처리하지 못했어요.",
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.exception
package com.suwiki.common.model.exception

enum class SuwikiServerError(val exception: Exception) {
USER003(IncorrectEmailFormException()),
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.exception
package com.suwiki.common.model.exception

class TimetableCellOverlapException(
val name: String,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation
package com.suwiki.common.model.lectureevaluation

import java.time.LocalDateTime

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.exam
package com.suwiki.common.model.lectureevaluation.exam

import androidx.compose.runtime.Stable

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.exam
package com.suwiki.common.model.lectureevaluation.exam

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.lecture
package com.suwiki.common.model.lectureevaluation.lecture

data class LectureEvaluationAverage(
val id: Long,
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.suwiki.core.model.lectureevaluation.lecture
package com.suwiki.common.model.lectureevaluation.lecture

import androidx.compose.runtime.Stable
import com.suwiki.core.model.enums.GradeLevel
import com.suwiki.core.model.enums.HomeworkLevel
import com.suwiki.core.model.enums.TeamLevel
import com.suwiki.common.model.enums.GradeLevel
import com.suwiki.common.model.enums.HomeworkLevel
import com.suwiki.common.model.enums.TeamLevel

@Stable
data class LectureEvaluationExtraAverage(
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.lecture
package com.suwiki.common.model.lectureevaluation.lecture

import androidx.compose.runtime.Stable

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.lecture
package com.suwiki.common.model.lectureevaluation.lecture

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.lectureevaluation.lecture
package com.suwiki.common.model.lectureevaluation.lecture

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.notice
package com.suwiki.common.model.notice

import java.time.LocalDateTime

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.notice
package com.suwiki.common.model.notice

import androidx.compose.runtime.Stable
import java.time.LocalDateTime
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.openmajor
package com.suwiki.common.model.openmajor

data class OpenMajor(
val id: Int,
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.suwiki.core.model.openmajor
package com.suwiki.common.model.openmajor

data class OpenMajorVersion(val version: Float)
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.timetable
package com.suwiki.common.model.timetable

enum class TimetableCellColor {
BROWN,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.timetable
package com.suwiki.common.model.timetable

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.timetable
package com.suwiki.common.model.timetable

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.timetable
package com.suwiki.common.model.timetable

import androidx.compose.runtime.Stable
import kotlinx.serialization.Serializable
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.user
package com.suwiki.common.model.user

import java.time.LocalDateTime

Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.user
package com.suwiki.common.model.user

data class Token(
val accessToken: String,
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.model.user
package com.suwiki.common.model.user

const val DEFAULT_USER_ID = ""
const val DEFAULT_USER_EMAIL = ""
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -7,11 +7,11 @@ plugins {
}

android {
namespace = "com.suwiki.core.security"
namespace = "com.suwiki.common.security"
}

dependencies {
implementation(projects.core.model)
implementation(projects.common.model)

implementation(libs.bundles.coroutine)

File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.security
package com.suwiki.common.security

import kotlinx.coroutines.flow.Flow
import tech.thdev.useful.encrypted.data.store.preferences.ksp.annotations.UsefulPreferences
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.security.di
package com.suwiki.common.security.di

import android.content.Context
import androidx.datastore.core.DataStore
@@ -7,8 +7,8 @@ import androidx.datastore.preferences.core.PreferenceDataStoreFactory
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.emptyPreferences
import androidx.datastore.preferences.preferencesDataStoreFile
import com.suwiki.core.security.SecurityPreferences
import com.suwiki.core.security.generateSecurityPreferences
import com.suwiki.common.security.SecurityPreferences
import com.suwiki.common.security.generateSecurityPreferences
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.core.security.di
package com.suwiki.common.security.di

import javax.inject.Qualifier

16 changes: 0 additions & 16 deletions core/database/src/test/java/com/suwiki/database/ExampleUnitTest.kt

This file was deleted.

Binary file removed core/designsystem/src/main/ic_logo-playstore.png
Binary file not shown.
Loading