노드를 이동시킬 때 구조 유지

.github/workflows/AOS-distribute.yml

@@ -0,0 +1,77 @@
+name: AOS-distribute
+on:
+  push:
+    branches:
+      - distribute
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4 
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'corretto'
+          java-version: 17
+
+      - name: Create Properties File
+        env:
+          RELEASE_KEYSTORE: ${{ secrets.KEY_STORE_BASE_64 }}
+          KEYSTORE_PROPERTIES: ${{ secrets.KEYSTORE_PROPERTIES }}
+          LOCAL_PROPERTIES: ${{ secrets.LOCAL_PROPERTIES }}
+        run: |
+            echo "$RELEASE_KEYSTORE" | base64 -d > AOS/app/release.keystore
+            echo "$KEYSTORE_PROPERTIES" > AOS/keystore.properties
+            echo "$LOCAL_PROPERTIES" > AOS/local.properties
+
+      - name: Create google-services.json
+        run: echo '${{ secrets.GOOGLE_SERVICES_JSON }}' > AOS/app/google-services.json
+
+      - name: Build Release AAB
+        run: ./gradlew bundleRelease
+        working-directory: ./AOS
+
+      - name: Upload AAB
+        uses: actions/upload-artifact@v2
+        with:
+          name: app-release.aab
+          path: AOS/app/build/outputs/bundle/release/app-release.aab
+
+  deploy:
+    needs: build
+    runs-on: ubuntu-latest
+    steps:
+      - name: Download AAB
+        uses: actions/download-artifact@v2
+        with:
+          name: app-release.aab
+          path: AOS/app/build/outputs/bundle/release/
+
+      - name: Create service_account.json
+        run: echo '${{ secrets.GOOGLE_PLAY_STORE_SERVICE_ACCOUT }}' > service_account.json
+
+      - name: Extract Release Version
+        run: echo "##[set-output name=version;]$(echo '${{ github.event.head_commit.message }}' | egrep -o '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')"
+        id: extract_version_name
+
+      - name: Create GitHub Release
+        uses: actions/create-release@v1
+        env: 
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with: 
+          tag_name: ${{ steps.extract_version_name.outputs.version }} 
+          release_name: ${{ steps.extract_version_name.outputs.version }}     
+          files: |
+              AOS/app/build/outputs/bundle/release/app-release.aab
+
+      - name: Deploy to Google Play Store
+        uses: r0adkll/upload-google-play@v1
+        with:
+          serviceAccountJson: service_account.json
+          packageName: boostcamp.and07.mindsync
+          releaseName: ${{ steps.extract_version_name.outputs.version }}    
+          releaseFiles: AOS/app/build/outputs/bundle/release/app-release.aab
+          track: production
+          whatsNewDirectory: AOS/whatsNewDirectory

AOS/app/build.gradle.kts

@@ -1,20 +1,17 @@
-import java.util.Properties
-
 plugins {
     id("com.android.application")
     id("org.jetbrains.kotlin.android")
     id("androidx.navigation.safeargs.kotlin")
     kotlin("kapt")
     id("com.google.dagger.hilt.android")
     id("kotlinx-serialization")
+    id("com.google.gms.google-services")
 }
 
 android {
     namespace = "boostcamp.and07.mindsync"
     compileSdk = 34
 
-    val properties = Properties()
-    properties.load(project.rootProject.file("local.properties").inputStream())
     val url = properties["BASE_URL"] ?: ""
     val googleServerClientId = properties["GOOGLE_SERVER_CLIENT_ID"] ?: ""
     val kakaoClientId = properties["KAKAO_CLIENT_ID"] ?: ""
@@ -25,24 +22,16 @@ android {
         applicationId = "boostcamp.and07.mindsync"
         minSdk = 26
         targetSdk = 34
-        versionCode = 1
-        versionName = "1.0"
+        versionCode = 8
+        versionName = "1.0.1"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "BASE_URL", "$url")
         buildConfigField("String", "GOOGLE_SERVER_CLIENT_ID", "$googleServerClientId")
         buildConfigField("String", "KAKAO_CLIENT_ID", "$kakaoClientId")
         manifestPlaceholders["KAKAO_CLIENT_ID"] = removeQuotationKakaoClientId
     }
-    buildTypes {
-        release {
-            isMinifyEnabled = false
-            proguardFiles(
-                getDefaultProguardFile("proguard-android-optimize.txt"),
-                "proguard-rules.pro",
-            )
-        }
-    }
+
     buildFeatures {
         viewBinding = true
         dataBinding = true

AOS/app/src/main/java/boostcamp/and07/mindsync/data/model/Node.kt

@@ -10,20 +10,39 @@ sealed class Node(
     open val path: NodePath,
     open val description: String,
     open val children: List<String>,
-) : java.io.Serializable
+) : java.io.Serializable {
+    abstract fun adjustPosition(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): Node
+}
 
 data class CircleNode(
     override val id: String,
     override val parentId: String?,
     override val path: CirclePath = CirclePath(Dp(0f), Dp(0f), Dp(0f)),
     override val description: String,
     override val children: List<String>,
-) : Node(id, parentId, path, description, children)
+) : Node(id, parentId, path, description, children) {
+    override fun adjustPosition(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): Node {
+        return this.copy(path = path.adjustPath(horizontalSpacing, totalHeight))
+    }
+}
 
 data class RectangleNode(
     override val id: String,
     override val parentId: String,
     override val path: RectanglePath = RectanglePath(Dp(0f), Dp(0f), Dp(0f), Dp(0f)),
     override val description: String,
     override val children: List<String>,
-) : Node(id, parentId, path, description, children)
+) : Node(id, parentId, path, description, children) {
+    override fun adjustPosition(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): Node {
+        return this.copy(path = path.adjustPath(horizontalSpacing, totalHeight))
+    }
+}

AOS/app/src/main/java/boostcamp/and07/mindsync/data/model/NodePath.kt

@@ -4,7 +4,19 @@ import boostcamp.and07.mindsync.ui.util.Dp
 import kotlinx.serialization.Serializable
 
 @Serializable
-sealed class NodePath(open val centerX: Dp, open val centerY: Dp)
+sealed class NodePath(open val centerX: Dp, open val centerY: Dp) {
+    abstract fun adjustPath(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): NodePath
+
+    protected fun calculateNewCenterY(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): Dp {
+        return centerY + totalHeight / 2 + horizontalSpacing
+    }
+}
 
 data class RectanglePath(
     override val centerX: Dp,
@@ -19,10 +31,24 @@ data class RectanglePath(
     fun rightX() = centerX + (width / (Dp(2f)))
 
     fun bottomY() = centerY + (height / (Dp(2f)))
+
+    override fun adjustPath(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): RectanglePath {
+        return this.copy(centerY = calculateNewCenterY(horizontalSpacing, totalHeight))
+    }
 }
 
 data class CirclePath(
     override val centerX: Dp,
     override val centerY: Dp,
     val radius: Dp,
-) : NodePath(centerX, centerY)
+) : NodePath(centerX, centerY) {
+    override fun adjustPath(
+        horizontalSpacing: Dp,
+        totalHeight: Dp,
+    ): CirclePath {
+        return this.copy(centerY = calculateNewCenterY(horizontalSpacing, totalHeight))
+    }
+}

AOS/app/src/main/java/boostcamp/and07/mindsync/ui/base/BaseComposeActivity.kt

@@ -6,7 +6,6 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 
 abstract class BaseComposeActivity : ComponentActivity() {
-
     @Composable
     abstract fun Content()
 

AOS/app/src/main/java/boostcamp/and07/mindsync/ui/components/MSButton.kt

@@ -0,0 +1,54 @@
+package boostcamp.and07.mindsync.ui.components
+
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Text
+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.text.TextStyle
+import androidx.compose.ui.tooling.preview.Preview
+import boostcamp.and07.mindsync.ui.theme.Gray3
+
+@Composable
+fun MSButton(
+    modifier: Modifier = Modifier,
+    text: String = "",
+    onClick: () -> Unit,
+    textStyle: TextStyle = TextStyle.Default,
+    backgroundColor: Color = MaterialTheme.colorScheme.primary,
+    fontColor: Color = Color.Unspecified,
+    shape: Shape = CircleShape,
+    disableColor: Color = Gray3,
+    isEnabled: Boolean = false,
+) {
+    Button(
+        modifier = modifier,
+        onClick = onClick,
+        shape = shape,
+        colors =
+            ButtonDefaults.buttonColors(
+                containerColor = backgroundColor,
+                disabledContainerColor = disableColor,
+            ),
+        enabled = isEnabled,
+    ) {
+        Text(
+            text = text,
+            style = textStyle,
+            color = fontColor,
+        )
+    }
+}
+
+@Preview
+@Composable
+fun ButtonPreview() =
+    MSPreview {
+        MSButton(
+            onClick = { },
+        )
+    }

AOS/app/src/main/java/boostcamp/and07/mindsync/ui/components/MSFloatingButton.kt

@@ -0,0 +1,45 @@
+package boostcamp.and07.mindsync.ui.components
+
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.painterResource
+import boostcamp.and07.mindsync.R
+
+@Composable
+fun RecycleBinRestoreFloatingButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    backgroundColor: Color = Color(0xFFD4BFF9),
+) {
+    FloatingActionButton(
+        modifier = modifier,
+        onClick = onClick,
+        containerColor = backgroundColor,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_restore_board),
+            contentDescription = null,
+        )
+    }
+}
+
+@Composable
+fun RefreshFloatingButton(
+    modifier: Modifier = Modifier,
+    onClick: () -> Unit,
+    backgroundColor: Color = Color(0xFFD4BFF9),
+) {
+    FloatingActionButton(
+        modifier = modifier,
+        onClick = onClick,
+        containerColor = backgroundColor,
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_restore_board),
+            contentDescription = null,
+        )
+    }
+}