refactoring

Yanfiq · Jul 23, 2024 · d949062 · d949062
1 parent e1bffd8
commit d949062
Show file tree

Hide file tree

Showing 123 changed files with 471 additions and 3,314 deletions.
diff --git a/.idea/other.xml b/.idea/other.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -16,7 +16,10 @@
         android:theme="@style/AppTheme.NoActionBar"
         tools:targetApi="31">
         <activity
-            android:name=".screens.PlayYoutubeActivity"
+            android:name=".presentation.screens.player.PlaySpotifyActivity"
+            android:exported="false" />
+        <activity
+            android:name=".presentation.screens.player.PlayYoutubeActivity"
             android:exported="false" />
         <activity
             android:name=".ui.settings.about.AboutDetailsActivity"
@@ -32,10 +35,10 @@
             android:name=".ui.search.soundcloud.PlaySoundcloudActivity"
             android:exported="false" />
         <activity
-            android:name=".screens.PlayAudiusActivity"
+            android:name=".presentation.screens.player.PlayAudiusActivity"
             android:exported="false" />
         <activity
-            android:name=".screens.PlaySoundcloudActivity"
+            android:name=".presentation.screens.player.PlaySoundcloudActivity"
             android:exported="false" />
         <activity
             android:name=".ui.search.youtube.PlayYoutubeActivity"
@@ -46,9 +49,18 @@
             android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <category android:name="android.intent.category.BROWSABLE" />
+                <data
+                    android:host="streamfusion.com"
+                    android:scheme="https"
+                    android:path="/callback"
+                    />
+            </intent-filter>
         </activity>
     </application>
 

diff --git a/app/src/main/java/com/yanfiq/streamfusion/MainActivity.kt b/app/src/main/java/com/yanfiq/streamfusion/MainActivity.kt
@@ -9,7 +9,8 @@ import androidx.compose.runtime.Composable
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStore
-import com.yanfiq.streamfusion.ui.theme.AppTheme
+import com.yanfiq.streamfusion.presentation.screens.BottomNavigationBar
+import com.yanfiq.streamfusion.presentation.ui.theme.AppTheme
 
 val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
 
@@ -20,9 +21,6 @@ class MainActivity : AppCompatActivity() {
             MainScreen(this@MainActivity)
         }
 //        SpotifyApi.initialize(this)
-
-//        val themePref = ThemeUtils.getThemePreference(this)
-//        ThemeUtils.applyTheme(themePref)
     }
 
     @Composable

diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/audius/Artist.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/audius/Artist.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/audius/AudiusResponse.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/audius/AudiusResponse.kt
@@ -1,3 +1,5 @@
 package com.yanfiq.streamfusion.data.response.audius
 
+import com.yanfiq.streamfusion.domain.model.audius.Track
+
 data class AudiusResponse(val data: List<Track>)
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Album.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Album.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Artist.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Artist.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Image.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Image.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/SpotifyResponse.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/SpotifyResponse.kt
@@ -0,0 +1,5 @@
+package com.yanfiq.streamfusion.data.response.spotify
+
+import com.yanfiq.streamfusion.domain.model.spotify.Tracks
+
+data class SpotifyResponse(val tracks: Tracks)
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/SpotifySearchResponse.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/SpotifySearchResponse.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Tracks.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/spotify/Tracks.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/Thumbnail.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/Thumbnail.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoContentDetails.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoContentDetails.kt
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoDetailsResponse.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoDetailsResponse.kt
@@ -1,3 +1,5 @@
 package com.yanfiq.streamfusion.data.response.youtube
 
+import com.yanfiq.streamfusion.domain.model.youtube.VideoDetailsItem
+
 data class VideoDetailsResponse(val items: List<VideoDetailsItem>)
diff --git a/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoId.kt b/app/src/main/java/com/yanfiq/streamfusion/data/response/youtube/VideoId.kt