Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor gradient extension with open-closed principles(SOLID) #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

refactor gradient extension with open-closed principles(SOLID) #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
332ee69
refactor gradient ext with ocp n remove unused imports
tfaki Dec 28, 2021
c098108
remove .idea folder
tfaki Dec 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 0 additions & 3 deletions .idea/.gitignore
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/copyright/droidbaza.xml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/copyright/profiles_settings.xml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/gradle.xml
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

111 changes: 0 additions & 111 deletions .idea/misc.xml
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml
View file
Open in desktop

This file was deleted.

5 changes: 4 additions & 1 deletion app/src/main/java/com/droidbaza/spotifycompose/model/Category.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,9 @@ data class Category(
companion object {
val Default = Category(0, subtitle = "empty subtitle")
}
}

fun authors(): List<String> = data.map { it.title ?: "" }
// written with solid principles(open-closed)
fun Category.authors(): List<String> {
return data.map { it.title ?: "" }
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/droidbaza/spotifycompose/screens/AddPersonsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,11 @@ import com.droidbaza.spotifycompose.components.CardColumn
import com.droidbaza.spotifycompose.components.SearchBar
import com.droidbaza.spotifycompose.components.TextTitle
import com.droidbaza.spotifycompose.repository.DataProvider
import com.droidbaza.spotifycompose.tools.Ext
import com.droidbaza.spotifycompose.tools.Ext.color
import com.droidbaza.spotifycompose.tools.Ext.gradient
import com.droidbaza.spotifycompose.tools.Ext.offsetY
import com.droidbaza.spotifycompose.tools.Ext.round
import com.droidbaza.spotifycompose.tools.GradientTypeVertical
import com.droidbaza.spotifycompose.tools.Sizes
import com.droidbaza.spotifycompose.ui.theme.Primary30

Expand Down Expand Up @@ -98,7 +98,7 @@ fun AddPersonsScreen() {
.align(Alignment.BottomCenter)
.gradient(
listOf(Color.Transparent, Primary30),
Ext.GradientType.VERTICAL
GradientTypeVertical()
)
) {
Text(
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/droidbaza/spotifycompose/screens/AddPodcastsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,12 @@ import com.droidbaza.spotifycompose.components.CardColumn
import com.droidbaza.spotifycompose.components.SearchBar
import com.droidbaza.spotifycompose.components.TextTitle
import com.droidbaza.spotifycompose.repository.DataProvider
import com.droidbaza.spotifycompose.tools.Ext
import com.droidbaza.spotifycompose.tools.Ext.color
import com.droidbaza.spotifycompose.tools.Ext.gradient
import com.droidbaza.spotifycompose.tools.Ext.offsetY
import com.droidbaza.spotifycompose.tools.Ext.clickableResize
import com.droidbaza.spotifycompose.tools.Ext.round
import com.droidbaza.spotifycompose.tools.GradientTypeVertical
import com.droidbaza.spotifycompose.tools.Sizes
import com.droidbaza.spotifycompose.ui.theme.Primary30

Expand Down Expand Up @@ -100,7 +100,7 @@ fun AddPodcastsScreen() {
.align(Alignment.BottomCenter)
.gradient(
listOf(Color.Transparent, Primary30),
Ext.GradientType.VERTICAL
GradientTypeVertical()
)
) {
Text(
Expand Down
5 changes: 2 additions & 3 deletions app/src/main/java/com/droidbaza/spotifycompose/screens/MainScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ import androidx.compose.material.Scaffold
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.remember
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
Expand All @@ -41,9 +40,9 @@ import com.droidbaza.spotifycompose.navigation.NavigationContainer
import com.droidbaza.spotifycompose.navigation.Screen
import com.droidbaza.spotifycompose.navigation.Router
import com.droidbaza.spotifycompose.navigation.RouterImpl
import com.droidbaza.spotifycompose.tools.Ext
import com.droidbaza.spotifycompose.tools.Ext.clickableResize
import com.droidbaza.spotifycompose.tools.Ext.gradient
import com.droidbaza.spotifycompose.tools.GradientTypeVertical

@ExperimentalFoundationApi
@ExperimentalAnimationApi
Expand All @@ -69,7 +68,7 @@ fun MainScreen(finish: () -> Unit) {
modifier = Modifier
.gradient(
listOf(Color.Transparent, Color.Black),
Ext.GradientType.VERTICAL
GradientTypeVertical()
)
.padding(top = 20.dp)
) {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/java/com/droidbaza/spotifycompose/screens/PlayerFullScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ import androidx.compose.ui.unit.sp
import com.droidbaza.spotifycompose.R
import com.droidbaza.spotifycompose.components.*
import com.droidbaza.spotifycompose.components.core.TopBar
import com.droidbaza.spotifycompose.tools.Ext
import com.droidbaza.spotifycompose.tools.Ext.gradient
import com.droidbaza.spotifycompose.tools.Ext.round
import com.droidbaza.spotifycompose.tools.GradientTypeVertical
import com.droidbaza.spotifycompose.tools.Sizes.MEDIUM

const val DEFAULT_DESCRIPTION =
Expand All @@ -58,7 +58,7 @@ fun PlayerFullScreen() {
.verticalScroll(scrollState)
.gradient(
listOf(Color.Red, Color.Transparent, Color.Transparent),
Ext.GradientType.VERTICAL
GradientTypeVertical()
)
) {
TopBar(
Expand Down