Composable 재사용

.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,3 +1,4 @@
+import java.io.FileInputStream
 import java.util.Properties
 
 plugins {
@@ -7,7 +8,11 @@ plugins {
     kotlin("kapt")
     id("com.google.dagger.hilt.android")
     id("kotlinx-serialization")
+    id("com.google.gms.google-services")
 }
+val keystorePropertiesFile = rootProject.file("keystore.properties")
+val keystoreProperties = Properties()
+keystoreProperties.load(FileInputStream(keystorePropertiesFile))
 
 android {
     namespace = "boostcamp.and07.mindsync"
@@ -25,22 +30,31 @@ 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
     }
+    signingConfigs {
+        create("release") {
+            keyAlias = keystoreProperties["keyAlias"] as String
+            keyPassword = keystoreProperties["keyPassword"] as String
+            storeFile = file(keystoreProperties["storeFile"] as String)
+            storePassword = keystoreProperties["storePassword"] as String
+        }
+    }
     buildTypes {
-        release {
+        getByName("release") {
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            signingConfig = signingConfigs.getByName("release")
         }
     }
     buildFeatures {

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

@@ -0,0 +1,52 @@
+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,
+        )
+    }
+}