-New Resource Impl & Platform Enhancement (#217)

KhubaibKhan4 · Mar 28, 2024 · 8f8ea20 · 8f8ea20
1 parent a224afb
commit 8f8ea20
Show file tree

Hide file tree

Showing 31 changed files with 151 additions and 78 deletions.
diff --git a/...src/commonMain/resources/compass_icon.xml → ...omposeResources/drawable/compass_icon.xml b/...src/commonMain/resources/compass_icon.xml → ...omposeResources/drawable/compass_icon.xml
diff --git a/...nMain/resources/do_more_with_youtube.webp → ...ources/drawable/do_more_with_youtube.webp b/...nMain/resources/do_more_with_youtube.webp → ...ources/drawable/do_more_with_youtube.webp
diff --git a/.../commonMain/resources/livestream_icon.png → ...oseResources/drawable/livestream_icon.png b/.../commonMain/resources/livestream_icon.png → ...oseResources/drawable/livestream_icon.png
diff --git a/...oseApp/src/commonMain/resources/logo.webp → ...nMain/composeResources/drawable/logo.webp b/...oseApp/src/commonMain/resources/logo.webp → ...nMain/composeResources/drawable/logo.webp
diff --git a/...src/commonMain/resources/no_internet.webp → ...omposeResources/drawable/no_internet.webp b/...src/commonMain/resources/no_internet.webp → ...omposeResources/drawable/no_internet.webp
diff --git a/...App/src/commonMain/resources/trending.png → ...in/composeResources/drawable/trending.png b/...App/src/commonMain/resources/trending.png → ...in/composeResources/drawable/trending.png
diff --git a/...src/commonMain/resources/youtube_kids.png → ...omposeResources/drawable/youtube_kids.png b/...src/commonMain/resources/youtube_kids.png → ...omposeResources/drawable/youtube_kids.png
diff --git a/...mmonMain/resources/youtube_logo_dark.webp → ...Resources/drawable/youtube_logo_dark.webp b/...mmonMain/resources/youtube_logo_dark.webp → ...Resources/drawable/youtube_logo_dark.webp
diff --git a/...monMain/resources/youtube_logo_light.webp → ...esources/drawable/youtube_logo_light.webp b/...monMain/resources/youtube_logo_light.webp → ...esources/drawable/youtube_logo_light.webp
diff --git a/...rc/commonMain/resources/youtube_music.png → ...mposeResources/drawable/youtube_music.png b/...rc/commonMain/resources/youtube_music.png → ...mposeResources/drawable/youtube_music.png
diff --git a/...p/src/commonMain/kotlin/org/company/app/ui/components/channel/channel_item/ChannelItem.kt b/...p/src/commonMain/kotlin/org/company/app/ui/components/channel/channel_item/ChannelItem.kt
@@ -20,6 +20,7 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.CircularProgressIndicator
 import androidx.compose.material3.Divider
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
@@ -81,7 +82,9 @@ fun SearchChannelItem(
                 .size(75.dp)
                 .clip(shape = CircleShape),
             onLoading = {
-                CircularProgressIndicator(it)
+                CircularProgressIndicator(
+                    progress = { it },
+                )
             },
             onFailure = {
                 Text(text = "Failed to Load Image")
@@ -146,7 +149,7 @@ fun SearchChannelItem(
             Icon(imageVector = Icons.Default.MoreVert, contentDescription = null)
         }
     }
-    Divider(
+    HorizontalDivider(
         modifier = Modifier.fillMaxWidth(),
         thickness = 1.dp,
         color = Color.LightGray

diff --git a/...src/commonMain/kotlin/org/company/app/ui/components/channel/community/ChannelCommunity.kt b/...src/commonMain/kotlin/org/company/app/ui/components/channel/community/ChannelCommunity.kt
@@ -17,6 +17,7 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Comment
 import androidx.compose.material.icons.filled.Comment
 import androidx.compose.material.icons.filled.IosShare
 import androidx.compose.material.icons.filled.MoreVert
@@ -176,7 +177,7 @@ fun ChannelCommunityItems(videos: Item, channelImage: String) {
             )
             Spacer(modifier = Modifier.width(8.dp))
             Icon(
-                imageVector = Icons.Default.Comment,
+                imageVector = Icons.AutoMirrored.Filled.Comment,
                 contentDescription = "Comments",
                 modifier = Modifier.size(20.dp),
                 tint = if (isDark) Color.White else Color.Gray

diff --git a/...onMain/kotlin/org/company/app/ui/components/channel/featured_channels/FeaturedChannels.kt b/...onMain/kotlin/org/company/app/ui/components/channel/featured_channels/FeaturedChannels.kt
@@ -73,7 +73,10 @@ fun FeatureChannelItems(channel: org.company.app.domain.model.channel.Item) {
                 Text(text = "Failed to Load Image")
             },
             onLoading = {
-                CircularProgressIndicator(progress = it, modifier = Modifier.size(200.dp))
+                CircularProgressIndicator(
+                    progress = { it },
+                    modifier = Modifier.size(200.dp),
+                )
             },
             animationSpec = tween()
         )

diff --git a/composeApp/src/commonMain/kotlin/org/company/app/ui/components/channel/home/ChannelHome.kt b/composeApp/src/commonMain/kotlin/org/company/app/ui/components/channel/home/ChannelHome.kt
@@ -18,6 +18,8 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAdd
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAddCheck
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material.icons.filled.MoreVert
@@ -135,7 +137,9 @@ fun ChannelHomeItems(videos: org.company.app.domain.model.videos.Item) {
                 Text("Failed to Load Image")
             },
             onLoading = {
-                CircularProgressIndicator(progress = it)
+                CircularProgressIndicator(
+                    progress = { it },
+                )
             },
             animationSpec = tween()
         )
@@ -208,7 +212,7 @@ fun ChannelHomeItems(videos: org.company.app.domain.model.videos.Item) {
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             androidx.compose.material3.Icon(
-                                imageVector = Icons.Outlined.PlaylistAdd,
+                                imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                                 contentDescription = "Time",
                                 tint = if (isDark) Color.White else Color.Black
                             )
@@ -220,7 +224,7 @@ fun ChannelHomeItems(videos: org.company.app.domain.model.videos.Item) {
                                 color = if (isDark) Color.White else Color.Black
                             )
                             androidx.compose.material3.Icon(
-                                imageVector = Icons.Outlined.PlaylistAddCheck,
+                                imageVector = Icons.AutoMirrored.Outlined.PlaylistAddCheck,
                                 contentDescription = "Time",
                                 tint = if (isDark) Color.White else Color.Black
                             )
@@ -251,7 +255,7 @@ fun ChannelHomeItems(videos: org.company.app.domain.model.videos.Item) {
                             verticalAlignment = Alignment.CenterVertically
                         ) {
                             androidx.compose.material3.Icon(
-                                imageVector = Icons.Outlined.PlaylistAdd,
+                                imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                                 contentDescription = "Time",
                                 tint = if (isDark) Color.White else Color.Black
                             )

diff --git a/...c/commonMain/kotlin/org/company/app/ui/components/channel/livestream/ChannelLIveStream.kt b/...c/commonMain/kotlin/org/company/app/ui/components/channel/livestream/ChannelLIveStream.kt
@@ -20,6 +20,8 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAdd
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAddCheck
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.PlaylistAdd
@@ -99,7 +101,7 @@ fun ChannelLiveStreamItems(videos: Item) {
             contentAlignment = Alignment.BottomEnd
         ) {
             val image: Resource<Painter> =
-                asyncPainterResource(data = videos.snippet?.thumbnails?.high?.url.toString())
+                asyncPainterResource(data = videos.snippet.thumbnails.high.url)
             KamelImage(
                 resource = image,
                 contentDescription = "Thumbnail",
@@ -116,7 +118,9 @@ fun ChannelLiveStreamItems(videos: Item) {
                     Text("Failed to Load Image")
                 },
                 onLoading = {
-                    CircularProgressIndicator(progress = it)
+                    CircularProgressIndicator(
+                        progress = { it },
+                    )
                 },
                 animationSpec = tween()
             )
@@ -192,7 +196,7 @@ fun ChannelLiveStreamItems(videos: Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -204,7 +208,7 @@ fun ChannelLiveStreamItems(videos: Item) {
                             color = if (isDark) Color.White else Color.Black
                         )
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAddCheck,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAddCheck,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -235,7 +239,7 @@ fun ChannelLiveStreamItems(videos: Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )

diff --git a/.../src/commonMain/kotlin/org/company/app/ui/components/channel/playlist/ChannelPlaylists.kt b/.../src/commonMain/kotlin/org/company/app/ui/components/channel/playlist/ChannelPlaylists.kt
@@ -21,6 +21,10 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.FeaturedPlayList
+import androidx.compose.material.icons.automirrored.filled.Sort
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAdd
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAddCheck
 import androidx.compose.material.icons.filled.FeaturedPlayList
 import androidx.compose.material.icons.filled.KeyboardArrowDown
 import androidx.compose.material.icons.filled.MoreVert
@@ -71,7 +75,7 @@ fun ChannelPlaylists(
         item {
             Row {
                 Icon(
-                    imageVector = Icons.Default.Sort, contentDescription = null,
+                    imageVector = Icons.AutoMirrored.Filled.Sort, contentDescription = null,
                     tint = if (isDark) Color.White else Color.Black
                 )
                 Text(
@@ -129,7 +133,9 @@ fun ChannelPlaylistsItems(videos: org.company.app.domain.model.videos.Item) {
                     Text("Failed to Load Image")
                 },
                 onLoading = {
-                    CircularProgressIndicator(progress = it)
+                    CircularProgressIndicator(
+                        progress = { it },
+                    )
                 },
                 animationSpec = tween()
             )
@@ -152,7 +158,7 @@ fun ChannelPlaylistsItems(videos: org.company.app.domain.model.videos.Item) {
                     horizontalArrangement = Arrangement.Center
                 ) {
                     Icon(
-                        imageVector = Icons.Default.FeaturedPlayList,
+                        imageVector = Icons.AutoMirrored.Filled.FeaturedPlayList,
                         contentDescription = "Playlists",
                         tint = if (isDark) Color.White else Color.Black
                     )
@@ -235,7 +241,7 @@ fun ChannelPlaylistsItems(videos: org.company.app.domain.model.videos.Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -247,7 +253,7 @@ fun ChannelPlaylistsItems(videos: org.company.app.domain.model.videos.Item) {
                             color =if (isDark) Color.White else Color.Black
                         )
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAddCheck,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAddCheck,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -278,7 +284,7 @@ fun ChannelPlaylistsItems(videos: org.company.app.domain.model.videos.Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )

diff --git a/...seApp/src/commonMain/kotlin/org/company/app/ui/components/channel/videos/ChannelVideos.kt b/...seApp/src/commonMain/kotlin/org/company/app/ui/components/channel/videos/ChannelVideos.kt
@@ -21,6 +21,8 @@ import androidx.compose.material.Icon
 import androidx.compose.material.IconButton
 import androidx.compose.material.Text
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAdd
+import androidx.compose.material.icons.automirrored.outlined.PlaylistAddCheck
 import androidx.compose.material.icons.filled.MoreVert
 import androidx.compose.material.icons.outlined.Download
 import androidx.compose.material.icons.outlined.PlaylistAdd
@@ -124,7 +126,9 @@ fun ChannelVideosItems(videos: Item) {
                     Text("Failed to Load Image")
                 },
                 onLoading = {
-                    CircularProgressIndicator(progress = it)
+                    CircularProgressIndicator(
+                        progress = { it },
+                    )
                 },
                 animationSpec = tween()
             )
@@ -214,7 +218,7 @@ fun ChannelVideosItems(videos: Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -226,7 +230,7 @@ fun ChannelVideosItems(videos: Item) {
                             color = if (isDark) Color.White else Color.Black
                         )
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAddCheck,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAddCheck,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )
@@ -257,7 +261,7 @@ fun ChannelVideosItems(videos: Item) {
                         verticalAlignment = Alignment.CenterVertically
                     ) {
                         androidx.compose.material3.Icon(
-                            imageVector = Icons.Outlined.PlaylistAdd,
+                            imageVector = Icons.AutoMirrored.Outlined.PlaylistAdd,
                             contentDescription = "Time",
                             tint = if (isDark) Color.White else Color.Black
                         )

diff --git a/composeApp/src/commonMain/kotlin/org/company/app/ui/components/comments/CommentsList.kt b/composeApp/src/commonMain/kotlin/org/company/app/ui/components/comments/CommentsList.kt
@@ -16,6 +16,7 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.Comment
 import androidx.compose.material.icons.filled.PinDrop
 import androidx.compose.material.icons.filled.Verified
 import androidx.compose.material.icons.outlined.Comment
@@ -284,7 +285,7 @@ fun CommentItems(comments: Item, viewModel: MainViewModel = koinInject<MainViewM
                     horizontalArrangement = Arrangement.spacedBy(4.dp)
                 ) {
                     Icon(
-                        imageVector = Icons.Outlined.Comment,
+                        imageVector = Icons.AutoMirrored.Outlined.Comment,
                         contentDescription = "Comment",
                         tint = if (isDark) Color.White else Color.Gray,
                         modifier = Modifier.size(18.dp)
@@ -344,8 +345,10 @@ fun CommentItemWithReplies(commentItem: Item) {
                                 .clip(CircleShape),
                             onLoading = {
                                 CircularProgressIndicator(
+                                    progress = {
+                                        it
+                                    },
                                     modifier = Modifier.size(35.dp),
-                                    progress = it
                                 )
                             },
                             onFailure = {
@@ -460,7 +463,7 @@ fun CommentItemWithReplies(commentItem: Item) {
                                 horizontalArrangement = Arrangement.spacedBy(4.dp)
                             ) {
                                 Icon(
-                                    imageVector = Icons.Outlined.Comment,
+                                    imageVector = Icons.AutoMirrored.Outlined.Comment,
                                     contentDescription = "Comment",
                                     tint = if (isDark) Color.White else Color.Gray,
                                     modifier = Modifier.size(18.dp)

diff --git a/composeApp/src/commonMain/kotlin/org/company/app/ui/components/common/NoInternet.kt b/composeApp/src/commonMain/kotlin/org/company/app/ui/components/common/NoInternet.kt
@@ -24,8 +24,11 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import org.company.app.theme.LocalThemeIsDark
+import org.jetbrains.compose.resources.DrawableResource
 import org.jetbrains.compose.resources.ExperimentalResourceApi
 import org.jetbrains.compose.resources.painterResource
+import youtube_clone.composeapp.generated.resources.Res
+import youtube_clone.composeapp.generated.resources.no_internet
 
 @OptIn(ExperimentalResourceApi::class)
 @Composable
@@ -41,7 +44,7 @@ fun NoInternet() {
             horizontalAlignment = Alignment.CenterHorizontally
         ) {
             Image(
-                painter = painterResource("no_internet.webp"),
+                painter = painterResource(Res.drawable.no_internet),
                 contentDescription = "No Internet",
                 modifier = Modifier.size(300.dp),
                 contentScale = ContentScale.FillBounds