Feature/#140 api connection

app/src/main/AndroidManifest.xml

@@ -20,10 +20,10 @@
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_yoo0"
+        android:icon="@mipmap/ic_viskit_icon"
         android:label="@string/app_name"
         android:largeHeap="true"
-        android:roundIcon="@mipmap/ic_yoo0_round"
+        android:roundIcon="@mipmap/ic_viskit_icon_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.Recordy"
         android:usesCleartextTraffic="true"

core/common/src/main/java/com/record/common/util/EncodingUtil.kt

@@ -20,3 +20,26 @@ fun encodingString(contentValue: String): String {
     val encodedString = android.util.Base64.encodeToString(bytes, android.util.Base64.DEFAULT)
     return encodedString
 }
+
+fun decodeHtmlEntities(encodedText: String): String {
+    val entitiesMap = mapOf(
+        "&lt;" to "<", "&#60;" to "<",
+        "&gt;" to ">", "&#62;" to ">",
+        "&amp;" to "&", "&#38;" to "&",
+        "&quot;" to "\"", "&#34;" to "\"",
+        "&apos;" to "'", "&#39;" to "'",
+        "&nbsp;" to " ", "&#160;" to " ",
+        "&cent;" to "¢", "&#162;" to "¢",
+        "&pound;" to "£", "&#163;" to "£",
+        "&yen;" to "¥", "&#165;" to "¥",
+        "&euro;" to "€", "&#8364;" to "€",
+        "&copy;" to "©", "&#169;" to "©",
+        "&reg;" to "®", "&#174;" to "®",
+    )
+
+    var decodedText = encodedText
+    for ((entity, replacement) in entitiesMap) {
+        decodedText = decodedText.replace(entity, replacement)
+    }
+    return decodedText
+}

core/designsystem/src/main/java/com/record/designsystem/component/container/UserDataContainer.kt

@@ -47,7 +47,7 @@ fun UserDataContainer(
         )
         Spacer(modifier = Modifier.weight(1f))
 
-        if (user.nickname != "유영") {
+        if (user.nickname != "건우") {
             FollowButton(
                 isFollowing = user.isFollowing,
                 onClick = { onClick(user) },

core/designsystem/src/main/java/com/record/designsystem/component/navbar/TopNavigationBar.kt

@@ -30,7 +30,7 @@ fun TopNavigationBar(
 ) {
     Box(
         modifier = modifier
-            .background(RecordyTheme.colors.black)
+            .background(RecordyTheme.colors.background)
             .fillMaxWidth()
             .padding(
                 top = 45.dp,

core/designsystem/src/main/java/com/record/designsystem/component/searchcomponent/SearchBox.kt

@@ -11,7 +11,6 @@ import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.foundation.text.BasicTextField
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -25,7 +24,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.record.designsystem.R
 import com.record.designsystem.theme.RecordyTheme
-import kotlinx.coroutines.delay
 
 @Composable
 fun SearchBox(
@@ -37,12 +35,6 @@ fun SearchBox(
     val keyboardController = LocalSoftwareKeyboardController.current
     val focusRequester = remember { FocusRequester() }
 
-    LaunchedEffect(Unit) {
-        delay(300)
-        focusRequester.requestFocus()
-        keyboardController?.show()
-    }
-
     Row(
         modifier = modifier
             .clip(RoundedCornerShape(8.dp))

core/designsystem/src/main/java/com/record/designsystem/component/searchcomponent/SearchedContainerBtn.kt

@@ -9,13 +9,13 @@ import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.record.designsystem.R
@@ -31,8 +31,8 @@ fun SearchedContainerBtn(
     Box(
         modifier = modifier
             .fillMaxWidth()
-            .wrapContentHeight()
-            .background(color = RecordyTheme.colors.black),
+            .height(68.dp)
+            .background(color = RecordyTheme.colors.background),
     ) {
         Column {
             Row(
@@ -48,20 +48,23 @@ fun SearchedContainerBtn(
                     Row(
                         modifier = Modifier
                             .fillMaxWidth()
-                            .padding(bottom = 2.dp),
+                            .padding(bottom = 6.dp),
                     ) {
-                        Text(text = venue, style = RecordyTheme.typography.caption1M, color = RecordyTheme.colors.gray05)
-                        Image(
-                            painter = painterResource(id = R.drawable.ic_eclipse_16),
-                            contentDescription = "Circle Icon",
-                            modifier = Modifier
-                                .wrapContentSize()
-                                .align(Alignment.CenterVertically)
-                                .padding(horizontal = 4.dp),
+                        Text(
+                            text = "$venue • $location",
+                            style = RecordyTheme.typography.caption1M,
+                            color = RecordyTheme.colors.gray05,
+                            maxLines = 1,
+                            overflow = TextOverflow.Ellipsis,
                         )
-                        Text(text = location, style = RecordyTheme.typography.caption1M, color = RecordyTheme.colors.gray05)
                     }
-                    Text(text = exhibitionName, style = RecordyTheme.typography.subtitle, color = RecordyTheme.colors.gray01)
+                    Text(
+                        text = exhibitionName,
+                        style = RecordyTheme.typography.subtitle,
+                        color = RecordyTheme.colors.gray01,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
+                    )
                 }
 
                 Image(

core/designsystem/src/main/java/com/record/designsystem/component/searchcomponent/SearchingContainerBtn.kt

@@ -6,14 +6,15 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.layout.wrapContentSize
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.record.designsystem.R
@@ -29,35 +30,37 @@ fun SearchingContainerBtn(
     Box(
         modifier = modifier
             .fillMaxWidth()
-            .wrapContentHeight()
-            .background(color = RecordyTheme.colors.black),
+            .height(68.dp)
+            .background(color = RecordyTheme.colors.background),
     ) {
         Row(
             modifier = Modifier
                 .fillMaxWidth()
-                .wrapContentHeight()
-                .padding(top = 20.dp),
+                .align(Alignment.Center),
         ) {
             Column(
                 modifier = Modifier.weight(1f),
             ) {
                 Row(
                     modifier = Modifier
                         .fillMaxWidth()
-                        .padding(bottom = 2.dp),
+                        .padding(bottom = 6.dp),
                 ) {
-                    Text(text = venue, style = RecordyTheme.typography.caption1M, color = RecordyTheme.colors.gray05)
-                    Image(
-                        painter = painterResource(id = R.drawable.ic_eclipse_16),
-                        contentDescription = "Circle Icon",
-                        modifier = Modifier
-                            .wrapContentSize()
-                            .align(Alignment.CenterVertically)
-                            .padding(horizontal = 4.dp),
+                    Text(
+                        text = "$venue • $location",
+                        style = RecordyTheme.typography.caption1M,
+                        color = RecordyTheme.colors.gray05,
+                        maxLines = 1,
+                        overflow = TextOverflow.Ellipsis,
                     )
-                    Text(text = location, style = RecordyTheme.typography.caption1M, color = RecordyTheme.colors.gray05)
                 }
-                Text(text = exhibitionName, style = RecordyTheme.typography.subtitle, color = RecordyTheme.colors.gray01)
+                Text(
+                    text = exhibitionName,
+                    style = RecordyTheme.typography.subtitle,
+                    color = RecordyTheme.colors.gray01,
+                    maxLines = 1,
+                    overflow = TextOverflow.Ellipsis,
+                )
             }
 
             Image(

core/designsystem/src/main/java/com/record/designsystem/component/snackbar/RecordySnackBar.kt

@@ -70,7 +70,7 @@ fun RecordySnackBarContent(
                 bottom = 16.dp,
             )
             .background(
-                color = RecordyTheme.colors.background,
+                color = RecordyTheme.colors.gray07,
                 shape = RoundedCornerShape(8.dp),
             ),
         verticalAlignment = Alignment.CenterVertically,

core/designsystem/src/main/java/com/record/designsystem/component/textfield/RecordyValidateTextfield.kt

@@ -66,7 +66,7 @@ fun RecordyValidateTextfield(
             modifier = Modifier
                 .fillMaxWidth()
                 .height(52.dp)
-                .background(color = RecordyTheme.colors.gray08, shape = shape)
+                .background(color = RecordyTheme.colors.gray10, shape = shape)
                 .border(
                     width = 1.dp,
                     color = if (isFocused) {

core/designsystem/src/main/java/com/record/designsystem/component/videoplayer/BottomSheetNavigation.kt

@@ -0,0 +1,7 @@
+package com.record.designsystem.component.videoplayer
+
+enum class BottomSheetNavigation {
+    DEFAULT,
+    REPORT,
+    ELSE,
+}

core/designsystem/src/main/java/com/record/designsystem/component/videoplayer/RecordyVideoText.kt

@@ -41,10 +41,8 @@ fun RecordyVideoText(
     content: String = "",
     isBookmark: Boolean = false,
     bookmarkCount: Int = 0,
-    isMyVideo: Boolean = false,
     onNicknameClick: () -> Unit = {},
     onBookmarkClick: () -> Unit = {},
-    onDeleteClick: () -> Unit = {},
     onMoreClick: () -> Unit = {},
 ) {
     var boxSize by remember { mutableStateOf(IntSize.Zero) }
@@ -137,19 +135,7 @@ fun RecordyVideoText(
                 contentDescription = "see more",
                 tint = RecordyTheme.colors.gray01,
             )
-            Spacer(modifier = Modifier.height(if (isMyVideo) 16.dp else 20.dp))
-            if (isMyVideo) {
-                Icon(
-                    modifier = Modifier
-                        .customClickable(rippleEnabled = false) { onDeleteClick() },
-                    painter = painterResource(
-                        id = R.drawable.ic_cursor_delete_40,
-                    ),
-                    contentDescription = "delete",
-                    tint = RecordyTheme.colors.gray01,
-                )
-                Spacer(modifier = Modifier.height(16.dp))
-            }
+            Spacer(modifier = Modifier.height(20.dp))
         }
     }
 }

core/designsystem/src/main/res/drawable/ic_error_24.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <group>
+    <clip-path
+        android:pathData="M0,0h24v24h-24z"/>
+    <path
+        android:pathData="M12,16.5C12.255,16.5 12.469,16.414 12.641,16.241C12.814,16.069 12.9,15.855 12.9,15.6C12.9,15.345 12.814,15.131 12.641,14.959C12.469,14.786 12.255,14.7 12,14.7C11.745,14.7 11.531,14.786 11.359,14.959C11.186,15.131 11.1,15.345 11.1,15.6C11.1,15.855 11.186,16.069 11.359,16.241C11.531,16.414 11.745,16.5 12,16.5ZM11.1,12C11.1,12.497 11.503,12.9 12,12.9C12.497,12.9 12.9,12.497 12.9,12V8.4C12.9,7.903 12.497,7.5 12,7.5C11.503,7.5 11.1,7.903 11.1,8.4V12ZM12,21C10.755,21 9.585,20.764 8.49,20.291C7.395,19.819 6.443,19.177 5.633,18.368C4.823,17.558 4.181,16.605 3.709,15.51C3.236,14.415 3,13.245 3,12C3,10.755 3.236,9.585 3.709,8.49C4.181,7.395 4.823,6.443 5.633,5.633C6.443,4.823 7.395,4.181 8.49,3.709C9.585,3.236 10.755,3 12,3C13.245,3 14.415,3.236 15.51,3.709C16.605,4.181 17.558,4.823 18.368,5.633C19.177,6.443 19.819,7.395 20.291,8.49C20.764,9.585 21,10.755 21,12C21,13.245 20.764,14.415 20.291,15.51C19.819,16.605 19.177,17.558 18.368,18.368C17.558,19.177 16.605,19.819 15.51,20.291C14.415,20.764 13.245,21 12,21ZM12,19.758C14.01,19.758 16.082,18.903 17.477,17.508C18.872,16.113 19.727,14.118 19.727,12.108C19.727,10.098 18.872,8.103 17.477,6.708C16.082,5.313 14.01,4.458 12,4.458C9.99,4.458 8.072,5.313 6.677,6.708C5.282,8.103 4.427,9.99 4.427,12C4.427,14.01 5.282,16.113 6.677,17.508C8.072,18.903 9.99,19.758 12,19.758Z"
+        android:fillColor="#FF374F"/>
+  </group>
+</vector>

core/designsystem/src/main/res/drawable/ic_link_24.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M10.984,13.679V13.679C12.554,14.586 14.563,14.048 15.469,12.477L18.096,7.927C19.003,6.357 18.465,4.348 16.895,3.442V3.442C15.324,2.535 13.316,3.073 12.409,4.644L11.095,6.919"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#EEEEEE"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M12.955,10.267V10.267C11.384,9.36 9.376,9.898 8.469,11.469L5.842,16.018C4.935,17.589 5.473,19.597 7.044,20.504V20.504C8.615,21.411 10.623,20.873 11.53,19.302L12.843,17.027"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#EEEEEE"
+      android:strokeLineCap="round"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_trashcan_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9.844,4.662C9.615,4.662 9.412,4.809 9.34,5.025L9.018,5.99H14.635L14.185,4.978C14.099,4.786 13.909,4.662 13.699,4.662H9.844ZM8.289,7.053H8.274H6.748L7.892,17.788C7.95,18.328 8.405,18.738 8.948,18.738H15.051C15.594,18.738 16.05,18.328 16.107,17.788L17.252,7.053H15.459H15.446H8.289ZM17.842,5.99H15.797L15.156,4.546C14.9,3.971 14.329,3.6 13.699,3.6H9.844C9.158,3.6 8.549,4.039 8.332,4.69L7.899,5.99H6.158H5.095C4.801,5.99 4.563,6.228 4.563,6.521C4.563,6.815 4.801,7.053 5.095,7.053H5.68L6.836,17.901C6.951,18.981 7.862,19.8 8.948,19.8H15.051C16.137,19.8 17.049,18.981 17.164,17.901L18.32,7.053H18.904C19.198,7.053 19.436,6.815 19.436,6.521C19.436,6.228 19.198,5.99 18.904,5.99H17.842Z"
+      android:fillColor="#EEEEEE"
+      android:fillType="evenOdd"/>
+</vector>

core/designsystem/src/main/res/drawable/ic_viskit_check.xml

@@ -0,0 +1,43 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="40dp"
+    android:height="40dp"
+    android:viewportWidth="40"
+    android:viewportHeight="40">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M30.792,8.834C30.038,9.087 29.24,9.223 28.415,9.223C23.974,9.223 20.423,5.341 19.983,0.5C17.886,0.504 15.781,1.342 14.062,3.035L13.9,3.193L13.675,3.177L12.631,3.101C12.631,3.101 12.631,3.101 12.631,3.101C8.65,2.814 5.06,6.189 4.573,10.96L4.55,11.18L4.372,11.311L3.334,12.077C0.317,14.304 -0.436,19.111 1.777,22.445L2.306,23.242L2.428,23.425L2.375,23.638L2.19,24.392L2.19,24.392C1.179,28.504 3.324,32.676 6.771,33.679L8.32,34.129L8.535,34.192L8.631,34.393C10.725,38.772 15.234,40.604 19.159,38.822L19.793,38.533L20,38.439L20.207,38.533L20.84,38.822L30.792,8.834ZM30.792,8.834C31.781,11.469 34.071,13.372 36.803,13.372C37.175,13.372 37.539,13.335 37.891,13.267C39.85,15.747 40.091,19.63 38.222,22.445C38.222,22.445 38.222,22.445 38.222,22.445L37.693,23.242L37.572,23.425L37.625,23.638L37.81,24.392L38.295,24.273L37.81,24.392C38.82,28.504 36.675,32.676 33.229,33.679L31.68,34.129L31.465,34.192L31.368,34.394C29.276,38.772 24.765,40.605 20.841,38.822L30.792,8.834Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="20"
+          android:startY="-0"
+          android:endX="5.098"
+          android:endY="54.118"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFF1E150"/>
+        <item android:offset="0.941" android:color="#FFFFD428"/>
+      </gradient>
+    </aapt:attr>
+    <aapt:attr name="android:strokeColor">
+      <gradient 
+          android:startX="20"
+          android:startY="0"
+          android:endX="9.608"
+          android:endY="48.627"
+          android:type="linear">
+        <item android:offset="0.069" android:color="#FFFFFAD5"/>
+        <item android:offset="0.958" android:color="#FFE3B644"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M19.123,28.504C18.83,28.787 18.499,28.936 18.132,28.953C17.766,28.969 17.458,28.848 17.21,28.59L11.074,22.209C10.826,21.951 10.717,21.638 10.748,21.273C10.779,20.907 10.941,20.583 11.235,20.3C11.529,20.017 11.859,19.868 12.226,19.852C12.593,19.835 12.9,19.956 13.149,20.215L19.284,26.596C19.532,26.854 19.641,27.166 19.61,27.532C19.58,27.897 19.417,28.222 19.123,28.504Z"
+      android:fillColor="#FF690B"
+      android:strokeColor="#FF690B"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M17.142,28.509C16.85,28.224 16.731,27.856 16.786,27.405C16.841,26.953 17.055,26.536 17.428,26.153L26.645,16.686C27.018,16.303 27.43,16.077 27.88,16.011C28.33,15.944 28.701,16.053 28.993,16.337C29.285,16.621 29.404,16.989 29.349,17.441C29.294,17.892 29.08,18.31 28.707,18.693L19.49,28.16C19.116,28.543 18.705,28.768 18.255,28.835C17.805,28.902 17.434,28.793 17.142,28.509Z"
+      android:fillColor="#FF690B"
+      android:strokeColor="#FF690B"/>
+</vector>