Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ local.properties
*.keystore
keystore-base64.txt
/.kotlin/sessions
/application.backup
4 changes: 1 addition & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:resizeableActivity="false"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.SwingMusic"
Expand All @@ -34,10 +33,9 @@
</service>

<activity
android:name=".presentation.activity.MainActivity"
android:name=".presentation.activity.MainActivityWithAnimatedPlayer"
android:exported="true"
android:screenOrientation="portrait"
android:configChanges="orientation"
android:theme="@style/Theme.SwingMusic">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@file:Suppress("DEPRECATION")

package com.android.swingmusic.presentation.activity

import android.annotation.SuppressLint
Expand Down Expand Up @@ -87,6 +89,10 @@ import dagger.hilt.android.AndroidEntryPoint
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.launch

@Deprecated(
message = "Legacy MainActivity. Use MainActivityWithAnimatedPlayer instead.",
replaceWith = ReplaceWith("MainActivityWithAnimatedPlayer")
)
@AndroidEntryPoint
class MainActivity : ComponentActivity() {
private val mediaControllerViewModel: MediaControllerViewModel by viewModels<MediaControllerViewModel>()
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -11,29 +11,34 @@ import com.android.swingmusic.uicomponent.R as UiComponent
sealed class BottomNavItem(
var title: String,
@param:DrawableRes var icon: Int,
@param:DrawableRes var animatedIcon: Int,
var destination: DestinationSpec<*>
) {
data object Folder : BottomNavItem(
title = "Folders",
icon = UiComponent.drawable.folder_filled,
animatedIcon = UiComponent.drawable.avd_folder,
destination = FoldersAndTracksScreenDestination
)

data object Album : BottomNavItem(
title = "Albums",
icon = UiComponent.drawable.ic_album,
animatedIcon = UiComponent.drawable.avd_album,
destination = AllAlbumScreenDestination
)

data object Artist : BottomNavItem(
title = "Artists",
icon = UiComponent.drawable.ic_artist,
animatedIcon = UiComponent.drawable.avd_artist,
destination = AllArtistsScreenDestination
)

data object Search : BottomNavItem(
title = "Search",
icon = UiComponent.drawable.ic_search,
animatedIcon = UiComponent.drawable.avd_search,
destination = SearchScreenDestination
)
}
2 changes: 1 addition & 1 deletion auth/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion core/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
4 changes: 3 additions & 1 deletion database/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ android {

buildTypes {
release {
isMinifyEnabled = true
// Disabled: Hilt annotation processing in app module needs to see DAO classes
// App module's R8 will still minify this code in the final APK
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion feature/album/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
2 changes: 1 addition & 1 deletion feature/artist/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,6 @@ private fun AllArtists(

var isGridCountMenuExpanded by remember { mutableStateOf(false) }

// TODO: Add pinch to reduce Grid count... as seen in Google Photos
Scaffold {
Scaffold(
modifier = Modifier.padding(it),
Expand Down
2 changes: 1 addition & 1 deletion feature/folder/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ android {

buildTypes {
release {
isMinifyEnabled = true
isMinifyEnabled = false
}
}
compileOptions {
Expand Down
Loading