Merge branch 'develop' of https://github.com/sopt-makers/sopt-android …

…into feature/869
sopt-makers · Sep 26, 2024 · 340c78e · 340c78e
2 parents 8d86bcb + 7dfedec
commit 340c78e
Show file tree

Hide file tree

Showing 41 changed files with 984 additions and 2,961 deletions.
diff --git a/app/src/main/java/org/sopt/official/feature/home/HomeActivity.kt b/app/src/main/java/org/sopt/official/feature/home/HomeActivity.kt
@@ -152,7 +152,7 @@ class HomeActivity : AppCompatActivity() {
             tracker.track(type = EventType.CLICK, name = "mypage", properties = mapOf("view_type" to args?.userStatus?.value))
             lifecycleScope.launch {
                 startActivity(
-                    MyPageActivity.getIntent(this@HomeActivity, MyPageActivity.Argument(viewModel.userActiveState.value))
+                    MyPageActivity.getIntent(this@HomeActivity, MyPageActivity.StartArgs(viewModel.userActiveState.value))
                 )
             }
         }

diff --git a/app/src/main/java/org/sopt/official/feature/navigator/NavigatorProviderIntent.kt b/app/src/main/java/org/sopt/official/feature/navigator/NavigatorProviderIntent.kt
@@ -54,7 +54,7 @@ class NavigatorProviderIntent @Inject constructor(
 
   override fun getMyPageActivityIntent(name: String) = MyPageActivity.getIntent(
     context,
-    MyPageActivity.Argument(UserActiveState.valueOf(name))
+    MyPageActivity.StartArgs(UserActiveState.valueOf(name))
   )
 
   override fun getAttendanceActivityIntent() = AttendanceActivity.newInstance(context)

diff --git a/app/src/release/generated/baselineProfiles/baseline-prof.txt b/app/src/release/generated/baselineProfiles/baseline-prof.txt
diff --git a/app/src/release/generated/baselineProfiles/startup-prof.txt b/app/src/release/generated/baselineProfiles/startup-prof.txt
diff --git a/core/common/src/main/java/org/sopt/official/common/navigator/DeepLinkType.kt b/core/common/src/main/java/org/sopt/official/common/navigator/DeepLinkType.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2023-2024 SOPT - Shout Our Passion Together
+ * Copyright 2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...src/main/java/org/sopt/official/data/notification/model/request/UpdatePushTokenRequest.kt b/...src/main/java/org/sopt/official/data/notification/model/request/UpdatePushTokenRequest.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...va/org/sopt/official/data/notification/model/response/NotificationReadingStateResponse.kt b/...va/org/sopt/official/data/notification/model/response/NotificationReadingStateResponse.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...c/main/java/org/sopt/official/data/notification/model/response/UpdatePushTokenResponse.kt b/...c/main/java/org/sopt/official/data/notification/model/response/UpdatePushTokenResponse.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/domain/notification/build.gradle.kts b/domain/notification/build.gradle.kts
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...rc/main/kotlin/org/sopt/official/domain/notification/repository/NotificationRepository.kt b/...rc/main/kotlin/org/sopt/official/domain/notification/repository/NotificationRepository.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...n/src/main/kotlin/org/sopt/official/domain/notification/usecase/DeletePushTokenUseCase.kt b/...n/src/main/kotlin/org/sopt/official/domain/notification/usecase/DeletePushTokenUseCase.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...main/kotlin/org/sopt/official/domain/notification/usecase/GetNotificationDetailUseCase.kt b/...main/kotlin/org/sopt/official/domain/notification/usecase/GetNotificationDetailUseCase.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...src/main/kotlin/org/sopt/official/domain/notification/usecase/RegisterPushTokenUseCase.kt b/...src/main/kotlin/org/sopt/official/domain/notification/usecase/RegisterPushTokenUseCase.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...in/org/sopt/official/domain/notification/usecase/UpdateNotificationReadingStateUseCase.kt b/...in/org/sopt/official/domain/notification/usecase/UpdateNotificationReadingStateUseCase.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/feature/fortune/build.gradle.kts b/feature/fortune/build.gradle.kts
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/...fortune/src/androidTest/java/org/sopt/official/feature/fortune/ExampleInstrumentedTest.kt b/...fortune/src/androidTest/java/org/sopt/official/feature/fortune/ExampleInstrumentedTest.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/UrlImage.kt b/feature/fortune/src/main/java/org/sopt/official/feature/fortune/component/UrlImage.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/.../main/java/org/sopt/official/feature/fortune/feature/fortuneDetail/FortuneDetailScreen.kt b/.../main/java/org/sopt/official/feature/fortune/feature/fortuneDetail/FortuneDetailScreen.kt
@@ -1,6 +1,6 @@
 /*
  * MIT License
- * Copyright 2024 SOPT - Shout Our Passion Together
+ * Copyright 2023-2024 SOPT - Shout Our Passion Together
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal

diff --git a/feature/mypage/build.gradle.kts b/feature/mypage/build.gradle.kts
@@ -25,6 +25,7 @@
 
 plugins {
     sopt("feature")
+    sopt("compose")
 }
 
 android {
@@ -41,4 +42,5 @@ dependencies {
     implementation(platform(libs.firebase))
     implementation(libs.bundles.firebase)
     implementation(libs.process.phoenix)
+    implementation(libs.kotlin.collections.immutable)
 }
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/AlertDialogPositiveNegative.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/AlertDialogPositiveNegative.kt
diff --git a/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageButton.kt b/feature/mypage/src/main/java/org/sopt/official/feature/mypage/component/MyPageButton.kt
@@ -0,0 +1,69 @@
+/*
+ * MIT License
+ * Copyright 2024 SOPT - Shout Our Passion Together
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ *     https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.sopt.official.feature.mypage.component
+
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Button
+import androidx.compose.material3.ButtonDefaults
+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 org.sopt.official.designsystem.Black
+import org.sopt.official.designsystem.Gray300
+import org.sopt.official.designsystem.Gray600
+import org.sopt.official.designsystem.White
+
+@Composable
+fun MyPageButton(
+    paddingVertical: Dp,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier.fillMaxWidth(),
+    shape: Shape = RoundedCornerShape(10.dp),
+    isEnabled: Boolean = true,
+    containerColor: Color = White,
+    contentColor: Color = Black,
+    content: @Composable () -> Unit,
+) {
+    Button(
+        contentPadding = PaddingValues(vertical = paddingVertical),
+        modifier = modifier,
+        enabled = isEnabled,
+        colors = ButtonDefaults.buttonColors(
+            containerColor = containerColor,
+            contentColor = contentColor,
+            disabledContainerColor = Gray600,
+            disabledContentColor = Gray300
+        ),
+        shape = shape,
+        onClick = onClick
+    ) {
+        content()
+    }
+}