[MP-4703] popup -> alert 수정 및 커스텀 컨텐츠 슬롯 추가

dealicious-inc · Jun 7, 2024 · 1faf39b · 1faf39b
1 parent acb67c3
commit 1faf39b
Show file tree

Hide file tree

Showing 8 changed files with 1,000 additions and 145 deletions.
diff --git a/designsystem/src/main/java/net/deali/designsystem/component/Alert.kt b/designsystem/src/main/java/net/deali/designsystem/component/Alert.kt
diff --git a/designsystem/src/main/java/net/deali/designsystem/component/Popup.kt b/designsystem/src/main/java/net/deali/designsystem/component/Popup.kt
@@ -36,6 +36,20 @@ import net.deali.designsystem.theme.DealiShape
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "Alert로 변경해 주세요.",
+    replaceWith = ReplaceWith("Alert(\n" +
+            "title = title,\n" +
+            "contentText = content,\n" +
+            "leftButtonText = leftButtonText,\n" +
+            "rightButtonText = rightButtonText,\n" +
+            "onLeftButtonClick = onLeftButtonClick,\n" +
+            "onRightButtonClick = onRightButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun Popup(
     title: String,
@@ -61,9 +75,9 @@ fun Popup(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("Popup(\n" +
+    replaceWith = ReplaceWith("Alert(\n" +
             "title = title,\n" +
-            "content = content,\n" +
+            "contentText = content,\n" +
             "leftButtonText = leftButtonText,\n" +
             "rightButtonText = rightButtonText,\n" +
             "onLeftButtonClick = onLeftButtonClick,\n" +
@@ -110,6 +124,20 @@ fun Popup(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "Alert로 변경해 주세요.",
+    replaceWith = ReplaceWith("Alert(\n" +
+            "title = title,\n" +
+            "contentText = content,\n" +
+            "leftButtonText = leftButtonText,\n" +
+            "rightButtonText = rightButtonText,\n" +
+            "onLeftButtonClick = onLeftButtonClick,\n" +
+            "onRightButtonClick = onRightButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun Popup(
     title: String,
@@ -168,9 +196,9 @@ fun Popup(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("Popup(\n" +
+    replaceWith = ReplaceWith("Alert(\n" +
             "title = title,\n" +
-            "content = content,\n" +
+            "contentText = content,\n" +
             "leftButtonText = leftButtonText,\n" +
             "rightButtonText = rightButtonText,\n" +
             "onLeftButtonClick = onLeftButtonClick,\n" +
@@ -216,6 +244,19 @@ fun Popup(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "Alert로 변경해 주세요.",
+    replaceWith = ReplaceWith("Alert(\n" +
+            "contentText = content,\n" +
+            "leftButtonText = leftButtonText,\n" +
+            "rightButtonText = rightButtonText,\n" +
+            "onLeftButtonClick = onLeftButtonClick,\n" +
+            "onRightButtonClick = onRightButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun Popup(
     content: String,
@@ -239,8 +280,8 @@ fun Popup(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("Popup(\n" +
-            "content = content,\n" +
+    replaceWith = ReplaceWith("Alert(\n" +
+            "contentText = content,\n" +
             "leftButtonText = leftButtonText,\n" +
             "rightButtonText = rightButtonText,\n" +
             "onLeftButtonClick = onLeftButtonClick,\n" +
@@ -284,6 +325,19 @@ fun Popup(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "Alert로 변경해 주세요.",
+    replaceWith = ReplaceWith("Alert(\n" +
+            "contentText = content,\n" +
+            "leftButtonText = leftButtonText,\n" +
+            "rightButtonText = rightButtonText,\n" +
+            "onLeftButtonClick = onLeftButtonClick,\n" +
+            "onRightButtonClick = onRightButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun Popup(
     content: AnnotatedString,
@@ -328,8 +382,8 @@ fun Popup(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("Popup(\n" +
-            "content = content,\n" +
+    replaceWith = ReplaceWith("Alert(\n" +
+            "contentText = content,\n" +
             "leftButtonText = leftButtonText,\n" +
             "rightButtonText = rightButtonText,\n" +
             "onLeftButtonClick = onLeftButtonClick,\n" +
@@ -371,6 +425,18 @@ fun Popup(
  * @param onDismissRequest 버튼 외의 방법으로 팝업을 닫으려 할 때의 이벤트 콜백.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "AlertSingleButton으로 변경해 주세요.",
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "title = title,\n" +
+            "contentText = content,\n" +
+            "buttonText = buttonText,\n" +
+            "onButtonClick = onButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun PopupSingleButton(
     title: String,
@@ -392,9 +458,9 @@ fun PopupSingleButton(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("PopupSingleButton(\n" +
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
             "title = title,\n" +
-            "content = content,\n" +
+            "contentText = content,\n" +
             "buttonText = buttonText,\n" +
             "onButtonClick = onButtonClick,\n" +
             "onDismissRequest = onDismiss,\n" +
@@ -433,6 +499,18 @@ fun PopupSingleButton(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "AlertSingleButton으로 변경해 주세요.",
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "title = title,\n" +
+            "contentText = content,\n" +
+            "buttonText = buttonText,\n" +
+            "onButtonClick = onButtonClick,\n" +
+            "onDismissRequest = onDismiss,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun PopupSingleButton(
     title: String,
@@ -478,9 +556,9 @@ fun PopupSingleButton(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("PopupSingleButton(\n" +
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
             "title = title,\n" +
-            "content = content,\n" +
+            "contentText = content,\n" +
             "buttonText = buttonText,\n" +
             "onButtonClick = onButtonClick,\n" +
             "onDismissRequest = onDismiss,\n" +
@@ -518,6 +596,17 @@ fun PopupSingleButton(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "AlertSingleButton으로 변경해 주세요.",
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "contentText = content,\n" +
+            "buttonText = buttonText,\n" +
+            "onButtonClick = onButtonClick,\n" +
+            "onDismissRequest = onDismissRequest,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun PopupSingleButton(
     content: String,
@@ -537,8 +626,8 @@ fun PopupSingleButton(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("PopupSingleButton(\n" +
-            "content = content,\n" +
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "contentText = content,\n" +
             "buttonText = buttonText,\n" +
             "onButtonClick = onButtonClick,\n" +
             "onDismissRequest = onDismiss,\n" +
@@ -574,6 +663,17 @@ fun PopupSingleButton(
  * [DialogProperties]에서 닫기가 비활성화 된 경우 호출하지 않습니다.
  * @param properties 팝업 다이얼로그의 동작을 정의하는 속성 객체.
  */
+@Deprecated(
+    message = "AlertSingleButton으로 변경해 주세요.",
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "contentText = content,\n" +
+            "buttonText = buttonText,\n" +
+            "onButtonClick = onButtonClick,\n" +
+            "onDismissRequest = onDismiss,\n" +
+            "properties = properties\n" +
+            ")"
+    ),
+)
 @Composable
 fun PopupSingleButton(
     content: AnnotatedString,
@@ -605,8 +705,8 @@ fun PopupSingleButton(
 
 @Deprecated(
     message = "onDismiss 콜백을 onDismissRequest로 변경해 주세요.",
-    replaceWith = ReplaceWith("PopupSingleButton(\n" +
-            "content = content,\n" +
+    replaceWith = ReplaceWith("AlertSingleButton(\n" +
+            "contentText = content,\n" +
             "buttonText = buttonText,\n" +
             "onButtonClick = onButtonClick,\n" +
             "onDismissRequest = onDismiss,\n" +

diff --git a/sample/src/main/java/net/deali/designsystem/sample/data/model/Screen.kt b/sample/src/main/java/net/deali/designsystem/sample/data/model/Screen.kt
@@ -46,7 +46,7 @@ sealed class Screen(
     object TextInputWithButton : Screen("textInputWithButton")
     object TextAreaButton : Screen("textAreaButton")
     object SearchInputWithTag : Screen("searchInputWithTag")
-    object Popup : Screen("popup")
+    object Alert : Screen("alert")
     object Slider : Screen("slider")
 
     /** Undefined */

diff --git a/sample/src/main/java/net/deali/designsystem/sample/ui/Nav.kt b/sample/src/main/java/net/deali/designsystem/sample/ui/Nav.kt
@@ -11,9 +11,10 @@ import androidx.navigation.NavGraphBuilder
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
-import net.deali.designsystem.sample.data.model.Screen
 import net.deali.designsystem.sample.data.datastore.DataStoreUtil
+import net.deali.designsystem.sample.data.model.Screen
 import net.deali.designsystem.sample.ui.main.MainScreen
+import net.deali.designsystem.sample.ui.screen.AlertScreen
 import net.deali.designsystem.sample.ui.screen.BottomSheetScreen
 import net.deali.designsystem.sample.ui.screen.ButtonsScreen
 import net.deali.designsystem.sample.ui.screen.CheckBoxScreen
@@ -27,7 +28,6 @@ import net.deali.designsystem.sample.ui.screen.DropdownScreen
 import net.deali.designsystem.sample.ui.screen.IconsScreen
 import net.deali.designsystem.sample.ui.screen.IndentationsScreen
 import net.deali.designsystem.sample.ui.screen.IndicatorScreen
-import net.deali.designsystem.sample.ui.screen.PopupScreen
 import net.deali.designsystem.sample.ui.screen.RadioButtonScreen
 import net.deali.designsystem.sample.ui.screen.RatingScreen
 import net.deali.designsystem.sample.ui.screen.SearchInputScreen
@@ -253,8 +253,8 @@ private fun NavGraphBuilder.moleculesGraph(
     composable(Screen.SearchInputWithTag.route) {
         SearchInputWithTagScreen(onBackPress = navController::popBackStack)
     }
-    composable(Screen.Popup.route) {
-        PopupScreen(onBackPress = navController::popBackStack)
+    composable(Screen.Alert.route) {
+        AlertScreen(onBackPress = navController::popBackStack)
     }
     composable(Screen.Slider.route) {
         SliderScreen(onBackPress = navController::popBackStack)

diff --git a/sample/src/main/java/net/deali/designsystem/sample/ui/main/MainActivity.kt b/sample/src/main/java/net/deali/designsystem/sample/ui/main/MainActivity.kt
@@ -76,7 +76,7 @@ class MainActivity : ComponentActivity() {
         Screen.TextInputWithButton,
         Screen.TextAreaButton,
         Screen.SearchInputWithTag,
-        Screen.Popup,
+        Screen.Alert,
         Screen.Slider,
     )
 

diff --git a/sample/src/main/java/net/deali/designsystem/sample/ui/main/MainScreen.kt b/sample/src/main/java/net/deali/designsystem/sample/ui/main/MainScreen.kt
@@ -184,7 +184,7 @@ private fun MainScreenPreview() {
             Screen.TextInputWithButton,
             Screen.TextAreaButton,
             Screen.SearchInputWithTag,
-            Screen.Popup,
+            Screen.Alert,
             Screen.Slider,
         ),
         others = listOf(