changed

nalgnaohel · Nov 28, 2024 · 2085fd7 · 2085fd7
1 parent 8c5609e
commit 2085fd7
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 166 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -27,26 +27,14 @@ jobs:
       - name: Make gradlew executable
         run: chmod +x ./gradlew
 
-<<<<<<< HEAD
-      - name: build release 
-        run: ./gradlew assembleRelease
-
-      - name: list files
-        run: ls -lrt app/build/outputs/apk/release
-=======
       - name: Execute Gradle command - assembleDebug
         run: ./gradlew assembleDebug
->>>>>>> minhnhat_branch
 
       - name: Upload Artifact to Firebase App Distribution
         uses: wzieba/Firebase-Distribution-Github-Action@v1
         with:
           appId: ${{ secrets.FIREBASE_APP_ID }}
           serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
           groups: testers
-<<<<<<< HEAD
-          file: app/build/outputs/apk/release/app-release-unsigned.apk
-=======
           file: app/build/apk/debug/app-debug.apk
->>>>>>> minhnhat_branch
           releaseNotes: ${{ inputs.release_notes }}
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -91,14 +91,11 @@ dependencies {
     implementation ("org.json:json:20210307") // org.json để xử lý JSON
     implementation ("androidx.media3:media3-exoplayer:1.1.0")
     implementation ("androidx.media3:media3-ui:1.1.0")
-<<<<<<< HEAD
-=======
 
     implementation("io.coil-kt:coil-compose:2.2.2") // Phiên bản mới nhất
     implementation ("androidx.lifecycle:lifecycle-viewmodel-compose:2.5.1")
     implementation ("androidx.lifecycle:lifecycle-runtime-compose:2.6.0-alpha03")
     // Retrofit
     implementation ("com.squareup.retrofit2:retrofit:2.9.0")
     implementation ("com.squareup.retrofit2:converter-gson:2.9.0")
->>>>>>> minhnhat_branch
 }
diff --git a/app/src/main/java/com/example/harmonyhub/MyApplication.kt b/app/src/main/java/com/example/harmonyhub/MyApplication.kt
@@ -1,23 +1,15 @@
 package com.example.harmonyhub
 
 import android.app.Application
-<<<<<<< HEAD
-=======
 import com.example.harmonyhub.data.repository.DefaultHomeScreenRepo
 import com.example.harmonyhub.data.repository.HomeScreenRepo
->>>>>>> minhnhat_branch
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp
 class MyApplication: Application() {
-<<<<<<< HEAD
-    override fun onCreate() {
-        super.onCreate()
-=======
     lateinit var container: HomeScreenRepo
     override fun onCreate() {
         super.onCreate()
         container = DefaultHomeScreenRepo()
->>>>>>> minhnhat_branch
     }
 }
diff --git a/app/src/main/java/com/example/harmonyhub/data/SongRepository.kt b/app/src/main/java/com/example/harmonyhub/data/SongRepository.kt
@@ -6,29 +6,6 @@ import com.example.harmonyhub.ui.components.Song
 
 object SongRepository{
     val allSongs = listOf(
-<<<<<<< HEAD
-        Song(id = "1", name = "Inside1 Out", artist = "The Chainsmokers, Charlee", imageResId = R.drawable.v,
-            "https://p.scdn.co/mp3-preview/6b7763066dd42d94dc893f12bb135d7d5392e386?cid=d8a5ed958d274c2e8ee717e6a4b0971d"),
-        Song(id = "2", name = "Young", artist = "The Chainsmokers", imageResId = R.drawable.v,
-            "https://p.scdn.co/mp3-preview/8ede412058d9e95de0b4b3a735fe3c999498336c?cid=d8a5ed958d274c2e8ee717e6a4b0971d"),
-        Song(id = "3", name = "Beach House", artist = "The Chainsmokers, Sick", imageResId = R.drawable.v,
-            "https://p.scdn.co/mp3-preview/8bf8384cc1c01bcf22a1b92ef0a2c6290fc596e4?cid=d8a5ed958d274c2e8ee717e6a4b0971d"),
-        Song(id = "4", name = "Kills You Slowly", artist = "The Chainsmokers", imageResId = R.drawable.v,""),
-        Song(id = "5", name = "Setting Fires", artist = "The Chainsmokers, XYLO", imageResId = R.drawable.v,""),
-        Song(id = "6", name = "The Real Slim Shady", artist = "Eminem", imageResId = R.drawable.v,""),
-        Song(id = "7", name = "Lose Yourself", artist = "Eminem", imageResId = R.drawable.v,""),
-        Song(id = "8", name = "Bohemian Rhapsody", artist = "Queen", imageResId = R.drawable.v,""),
-        Song(id = "9", name = "Shape of You", artist = "Ed Sheeran", imageResId = R.drawable.v,""),
-        Song(id = "10", name = "Perfect", artist = "Ed Sheeran", imageResId = R.drawable.v,""),
-        Song(id = "11", name = "Thinking Out Loud", artist = "Ed Sheeran", imageResId = R.drawable.v,""),
-        Song(id = "12", name = "Photograph", artist = "Ed Sheeran", imageResId = R.drawable.v,""),
-        Song(id = "13", name = "Imagine Dragons", artist = "Imagine Dragons", imageResId = R.drawable.v,""),
-        Song(id = "14", name = "Believer", artist = "Imagine Dragons", imageResId = R.drawable.v,""),
-        Song(id = "15", name = "Radioactive", artist = "Imagine Dragons", imageResId = R.drawable.v,""),
-        Song(id = "16", name = "Thunder", artist = "Imagine Dragons", imageResId = R.drawable.v,""),
-        Song(id = "17", name = "Demons", artist = "Imagine Dragons", imageResId = R.drawable.v,""),
-    )
-=======
         Song(id = "3ztP5O7dJSha2PG429eUCb", name = "Thiên Lý Ơi", artist = "Jack - J97",
             imageResId = "https://i.scdn.co/image/ab67616d00001e0233a31cc1175e787bfea17a65",
             url = "https://p.scdn.co/mp3-preview/8ede412058d9e95de0b4b3a735fe3c999498336c?cid=d8a5ed958d274c2e8ee717e6a4b0971d"),
@@ -53,6 +30,5 @@ object SongRepository{
 
     )
     val currentPLaylist : MutableList<Song> = mutableListOf()
->>>>>>> minhnhat_branch
 
 }
diff --git a/app/src/main/java/com/example/harmonyhub/ui/components/ArtistCard.kt b/app/src/main/java/com/example/harmonyhub/ui/components/ArtistCard.kt
@@ -20,10 +20,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-<<<<<<< HEAD
-=======
 import androidx.compose.ui.platform.LocalContext
->>>>>>> minhnhat_branch
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle

diff --git a/app/src/main/java/com/example/harmonyhub/ui/components/ChartCard.kt b/app/src/main/java/com/example/harmonyhub/ui/components/ChartCard.kt
@@ -1,56 +1,21 @@
 package com.example.harmonyhub.ui.components
 
-<<<<<<< HEAD
-import androidx.compose.foundation.Image
-import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.fillMaxSize
-=======
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
->>>>>>> minhnhat_branch
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material3.Surface
-<<<<<<< HEAD
-import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
-=======
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
->>>>>>> minhnhat_branch
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-<<<<<<< HEAD
-import androidx.compose.ui.platform.testTag
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.unit.dp
-
-@Composable
-fun ChartCard(chartImg: Int) {
-    Surface(
-        modifier = Modifier
-            .size(width = 150.dp, height = 150.dp)
-            .clickable {  },
-        color = Color.Transparent
-    ) {
-        Box(contentAlignment = Alignment.BottomCenter,
-            modifier = Modifier.padding(4.dp)) {
-            // Placeholder for the image
-            Image(
-                painter = painterResource(id = chartImg),
-                contentDescription = null,
-                contentScale = ContentScale.Crop,
-                modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(12.dp))
-            )
-=======
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
@@ -99,7 +64,6 @@ fun ChartCard(chartImg: String?, chartName: String, chartId: String) {
 //                maxLines = 1,
 //                overflow = Ellipsis
 //            )
->>>>>>> minhnhat_branch
         }
     }
 }
diff --git a/app/src/main/java/com/example/harmonyhub/ui/components/SongCard.kt b/app/src/main/java/com/example/harmonyhub/ui/components/SongCard.kt
@@ -24,11 +24,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
-<<<<<<< HEAD
-=======
 import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
->>>>>>> minhnhat_branch
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.FontWeight
@@ -41,11 +38,7 @@ data class Song(
     val id: String,
     val name: String,
     val artist: String,
-<<<<<<< HEAD
-    val imageResId: Int,
-=======
     val imageResId: String,
->>>>>>> minhnhat_branch
     val url: String
 )
 

diff --git a/app/src/main/java/com/example/harmonyhub/ui/components/SuggestionCard.kt b/app/src/main/java/com/example/harmonyhub/ui/components/SuggestionCard.kt
@@ -17,31 +17,21 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
-<<<<<<< HEAD
-=======
 import androidx.compose.ui.platform.LocalContext
->>>>>>> minhnhat_branch
 import androidx.compose.ui.platform.testTag
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextOverflow.Companion.Ellipsis
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-<<<<<<< HEAD
-=======
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
->>>>>>> minhnhat_branch
 import com.example.harmonyhub.R
 import com.example.harmonyhub.ui.theme.NotoSans
 
 @Composable
-<<<<<<< HEAD
-fun SuggestionCard(songName: String, artistName: String) {
-=======
 fun SuggestionCard(songName: String, artistName: String, songId: String, songImg: String) {
->>>>>>> minhnhat_branch
     Surface(
         modifier = Modifier
             .size(width = 125.dp, height = 180.dp)
@@ -53,11 +43,6 @@ fun SuggestionCard(songName: String, artistName: String, songId: String, songImg
             Box(
                 modifier = Modifier.size(width = 125.dp, height = 125.dp)
             ) {
-<<<<<<< HEAD
-                Image(
-                    painter = painterResource(id = R.drawable.v),
-                    contentDescription = null,
-=======
                 AsyncImage(
                     model = ImageRequest.Builder(context = LocalContext.current)
                         .data(songImg)
@@ -66,7 +51,6 @@ fun SuggestionCard(songName: String, artistName: String, songId: String, songImg
                     error = painterResource(com.example.harmonyhub.R.drawable.ic_broken_image),
                     placeholder = painterResource(id = com.example.harmonyhub.R.drawable.loading_img),
                     contentDescription = "Photo",
->>>>>>> minhnhat_branch
                     contentScale = ContentScale.Crop,
                     modifier = Modifier.fillMaxSize().clip(RoundedCornerShape(12.dp)),
                 )