Skip to content
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

rename: core:feature -> core:presentation #146

Merged
merged 1 commit into from
Jun 21, 2024
Merged

rename: core:feature -> core:presentation #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions app-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ android {
}

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

implementation(projects.remote.openmajor)
implementation(projects.remote.timetable)
Expand Down
6 changes: 3 additions & 3 deletions build-logic/convention/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions ...in/java/FeatureComposeConventionPlugin.kt → ...va/PresentationComposeConventionPlugin.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -17,8 +17,8 @@ internal class FeatureComposeConventionPlugin : Plugin<Project> {
dependencies {
"implementation"(project(":core:model"))
"implementation"(project(":core:android"))
"implementation"(project(":feature:common:ui"))
"implementation"(project(":feature:common:designsystem"))
"implementation"(project(":presentation:common:ui"))
"implementation"(project(":presentation:common:designsystem"))

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

Expand Down
23 changes: 0 additions & 23 deletions feature/navigator/build.gradle.kts
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ suwiki-android-library = { id = "suwiki.android.library", version = "unspecified
suwiki-android-library-compose = { id = "suwiki.android.library.compose", version = "unspecified" }
suwiki-android-hilt = { id = "suwiki.android.hilt", version = "unspecified" }
suwiki-java-library = { id = "suwiki.java.library", version = "unspecified" }
suwiki-android-feature-compose = { id = "suwiki.android.feature.compose", version = "unspecified" }
suwiki-android-presentation-compose = { id = "suwiki.android.presentation.compose", version = "unspecified" }
suwiki-android-remote = { id = "suwiki.android.remote", version = "unspecified" }
suwiki-android-data = { id = "suwiki.android.data", version = "unspecified" }

Expand Down
0 feature/common/designsystem/.gitignore → presentation/common/designsystem/.gitignore
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions feature/common/designsystem/build.gradle.kts → ...tion/common/designsystem/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ plugins {
}

android {
namespace = "com.suwiki.feature.common.designsystem"
namespace = "com.suwiki.presentation.common.designsystem"
}

dependencies {
implementation(projects.core.model)
implementation(projects.feature.common.ui)
implementation(projects.presentation.common.ui)

implementation(libs.kotlinx.immutable)
implementation(libs.compose.rating.bar)
Expand Down
0 ...re/common/designsystem/consumer-rules.pro → ...on/common/designsystem/consumer-rules.pro
View file
Open in desktop
File renamed without changes.
0 ...re/common/designsystem/proguard-rules.pro → ...on/common/designsystem/proguard-rules.pro
View file
Open in desktop
File renamed without changes.
0 ...designsystem/src/main/AndroidManifest.xml → ...designsystem/src/main/AndroidManifest.xml
View file
Open in desktop
File renamed without changes.
14 changes: 7 additions & 7 deletions ...nent/appbar/SuwikiAppBarWithTextButton.kt → ...nent/appbar/SuwikiAppBarWithTextButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.appbar
package com.suwiki.presentation.common.designsystem.component.appbar

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -17,12 +17,12 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.R
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.R
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@Composable
fun SuwikiAppBarWithTextButton(
Expand Down
12 changes: 6 additions & 6 deletions ...component/appbar/SuwikiAppBarWithTitle.kt → ...component/appbar/SuwikiAppBarWithTitle.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.appbar
package com.suwiki.presentation.common.designsystem.component.appbar

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand All @@ -16,11 +16,11 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.R
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.R
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@Composable
fun SuwikiAppBarWithTitle(
Expand Down
12 changes: 6 additions & 6 deletions ...signsystem/component/badge/SuwikiBadge.kt → ...signsystem/component/badge/SuwikiBadge.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.badge
package com.suwiki.presentation.common.designsystem.component.badge

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -14,11 +14,11 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Gray6A
import com.suwiki.feature.common.designsystem.theme.GrayF6
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.presentation.common.designsystem.theme.Gray6A
import com.suwiki.presentation.common.designsystem.theme.GrayF6
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White

enum class BadgeColor(
val textColor: Color,
Expand Down
18 changes: 9 additions & 9 deletions ...bottomsheet/SuwikiAgreementBottomSheet.kt → ...bottomsheet/SuwikiAgreementBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.bottomsheet
package com.suwiki.presentation.common.designsystem.component.bottomsheet

import androidx.compose.foundation.Image
import androidx.compose.foundation.background
Expand All @@ -23,14 +23,14 @@ import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.R
import com.suwiki.feature.common.designsystem.component.button.SuwikiContainedLargeButton
import com.suwiki.feature.common.designsystem.theme.Black
import com.suwiki.feature.common.designsystem.theme.GrayDA
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.R
import com.suwiki.presentation.common.designsystem.component.button.SuwikiContainedLargeButton
import com.suwiki.presentation.common.designsystem.theme.Black
import com.suwiki.presentation.common.designsystem.theme.GrayDA
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
10 changes: 5 additions & 5 deletions ...omponent/bottomsheet/SuwikiBottomSheet.kt → ...omponent/bottomsheet/SuwikiBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.bottomsheet
package com.suwiki.presentation.common.designsystem.component.bottomsheet

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.ColumnScope
Expand All @@ -19,10 +19,10 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
16 changes: 8 additions & 8 deletions ...nt/bottomsheet/SuwikiSelectBottomSheet.kt → ...nt/bottomsheet/SuwikiSelectBottomSheet.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.bottomsheet
package com.suwiki.presentation.common.designsystem.component.bottomsheet

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand All @@ -16,13 +16,13 @@ import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.R
import com.suwiki.feature.common.designsystem.theme.Gray6A
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.R
import com.suwiki.presentation.common.designsystem.theme.Gray6A
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable
import kotlinx.collections.immutable.PersistentList

@OptIn(ExperimentalMaterial3Api::class)
Expand Down
4 changes: 2 additions & 2 deletions ...ignsystem/component/button/BasicButton.kt → ...ignsystem/component/button/BasicButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.button
package com.suwiki.presentation.common.designsystem.component.button

import androidx.compose.foundation.background
import androidx.compose.foundation.border
Expand All @@ -16,7 +16,7 @@ import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@Composable
fun BasicButton(
Expand Down
14 changes: 7 additions & 7 deletions ...component/button/SuwikiContainedButton.kt → ...component/button/SuwikiContainedButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.button
package com.suwiki.presentation.common.designsystem.component.button

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
Expand All @@ -10,12 +10,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Black
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.GrayF6
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.presentation.common.designsystem.theme.Black
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.GrayF6
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White

@Composable
fun SuwikiContainedLargeButton(
Expand Down
8 changes: 4 additions & 4 deletions .../component/button/SuwikiOutlinedButton.kt → .../component/button/SuwikiOutlinedButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.button
package com.suwiki.presentation.common.designsystem.component.button

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxWidth
Expand All @@ -8,9 +8,9 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White

@Composable
fun SuwikiOutlinedButton(
Expand Down
10 changes: 5 additions & 5 deletions .../component/button/TextFieldClearButton.kt → .../component/button/TextFieldClearButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.button
package com.suwiki.presentation.common.designsystem.component.button

import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material3.Icon
Expand All @@ -7,10 +7,10 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.tooling.preview.Preview
import com.suwiki.feature.common.designsystem.R
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.R
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@Composable
fun TextFieldClearButton(
Expand Down
22 changes: 11 additions & 11 deletions ...tem/component/chip/SuwikiContainedChip.kt → ...tem/component/chip/SuwikiContainedChip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.chip
package com.suwiki.presentation.common.designsystem.component.chip

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Box
Expand All @@ -16,16 +16,16 @@ import androidx.compose.ui.draw.clip
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Blue10
import com.suwiki.feature.common.designsystem.theme.Blue100
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.GrayF6
import com.suwiki.feature.common.designsystem.theme.Green10
import com.suwiki.feature.common.designsystem.theme.Green100
import com.suwiki.feature.common.designsystem.theme.Orange10
import com.suwiki.feature.common.designsystem.theme.Orange100
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.theme.Blue10
import com.suwiki.presentation.common.designsystem.theme.Blue100
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.GrayF6
import com.suwiki.presentation.common.designsystem.theme.Green10
import com.suwiki.presentation.common.designsystem.theme.Green100
import com.suwiki.presentation.common.designsystem.theme.Orange10
import com.suwiki.presentation.common.designsystem.theme.Orange100
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.ui.extension.suwikiClickable

enum class ChipColor(
val backgroundColor: Color,
Expand Down
14 changes: 7 additions & 7 deletions ...stem/component/chip/SuwikiOutlinedChip.kt → ...stem/component/chip/SuwikiOutlinedChip.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.suwiki.feature.common.designsystem.component.chip
package com.suwiki.presentation.common.designsystem.component.chip

import androidx.compose.foundation.background
import androidx.compose.foundation.border
Expand All @@ -16,12 +16,12 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.clip
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import com.suwiki.feature.common.designsystem.theme.Gray95
import com.suwiki.feature.common.designsystem.theme.GrayDA
import com.suwiki.feature.common.designsystem.theme.Primary
import com.suwiki.feature.common.designsystem.theme.SuwikiTheme
import com.suwiki.feature.common.designsystem.theme.White
import com.suwiki.feature.common.ui.extension.suwikiClickable
import com.suwiki.presentation.common.designsystem.theme.Gray95
import com.suwiki.presentation.common.designsystem.theme.GrayDA
import com.suwiki.presentation.common.designsystem.theme.Primary
import com.suwiki.presentation.common.designsystem.theme.SuwikiTheme
import com.suwiki.presentation.common.designsystem.theme.White
import com.suwiki.presentation.common.ui.extension.suwikiClickable

@Composable
fun SuwikiOutlinedChip(
Expand Down
Loading
Loading