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

Refactor package names: Remove underscores for consistency #25

Open
wants to merge 1 commit into
base: JetFit
Choose a base branch
from
Open

Refactor package names: Remove underscores for consistency #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions JetFit/app/src/main/java/com/google/jetfit/presentation/App.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ import androidx.navigation.navArgument
import com.google.jetfit.presentation.screens.Screens
import com.google.jetfit.presentation.screens.favorites.FavoritesScreen
import com.google.jetfit.presentation.screens.home.HomeScreen
import com.google.jetfit.presentation.screens.more_options.MoreOptionsScreen
import com.google.jetfit.presentation.screens.moreoptions.MoreOptionsScreen
import com.google.jetfit.presentation.screens.player.audio.AudioPlayerScreen
import com.google.jetfit.presentation.screens.player.video.VideoPlayerScreen
import com.google.jetfit.presentation.screens.profileSelector.ProfileSelectorScreen
import com.google.jetfit.presentation.screens.profileselector.ProfileSelectorScreen
import com.google.jetfit.presentation.screens.subscription.SubscriptionScreen
import com.google.jetfit.presentation.screens.training.TrainingScreen
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityScreen
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityScreen
import com.google.jetfit.presentation.utils.navigateTo
import com.google.jetfit.presentation.utils.navigationDrawerGraph

Expand Down
4 changes: 2 additions & 2 deletions JetFit/app/src/main/java/com/google/jetfit/presentation/screens/dashboard/DashboardScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ import androidx.navigation.compose.composable
import com.google.jetfit.presentation.screens.Screens
import com.google.jetfit.presentation.screens.favorites.FavoritesScreen
import com.google.jetfit.presentation.screens.home.HomeScreen
import com.google.jetfit.presentation.screens.more_options.MoreOptionsScreen
import com.google.jetfit.presentation.screens.moreoptions.MoreOptionsScreen
import com.google.jetfit.presentation.screens.player.audio.AudioPlayerScreen
import com.google.jetfit.presentation.screens.player.video.VideoPlayerScreen
import com.google.jetfit.presentation.screens.search.SearchScreen
import com.google.jetfit.presentation.screens.settings.SettingsScreen
import com.google.jetfit.presentation.screens.subscription.SubscriptionScreen
import com.google.jetfit.presentation.screens.training.TrainingScreen
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityScreen
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityScreen


@Composable
Expand Down
8 changes: 4 additions & 4 deletions ...screens/more_options/MoreOptionsScreen.kt → .../screens/moreoptions/MoreOptionsScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options
package com.google.jetfit.presentation.screens.moreoptions

import android.util.Log
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -14,9 +14,9 @@ import androidx.compose.ui.unit.dp
import androidx.constraintlayout.compose.ConstraintLayout
import androidx.hilt.navigation.compose.hiltViewModel
import com.google.jetfit.R
import com.google.jetfit.presentation.screens.more_options.composable.BackRowSchema
import com.google.jetfit.presentation.screens.more_options.composable.MoreOptionsButton
import com.google.jetfit.presentation.screens.more_options.composable.TrainingDetails
import com.google.jetfit.presentation.screens.moreoptions.composable.BackRowSchema
import com.google.jetfit.presentation.screens.moreoptions.composable.MoreOptionsButton
import com.google.jetfit.presentation.screens.moreoptions.composable.TrainingDetails


@Composable
Expand Down
2 changes: 1 addition & 1 deletion ...creens/more_options/MoreOptionsUiState.kt → ...screens/moreoptions/MoreOptionsUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options
package com.google.jetfit.presentation.screens.moreoptions

import com.google.jetfit.data.entities.TrainingDetails

Expand Down
2 changes: 1 addition & 1 deletion ...eens/more_options/MoreOptionsViewModel.kt → ...reens/moreoptions/MoreOptionsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options
package com.google.jetfit.presentation.screens.moreoptions

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion .../more_options/composable/BackRowSchema.kt → ...s/moreoptions/composable/BackRowSchema.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options.composable
package com.google.jetfit.presentation.screens.moreoptions.composable

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Row
Expand Down
2 changes: 1 addition & 1 deletion ...e_options/composable/MoreOptionsButton.kt → ...reoptions/composable/MoreOptionsButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options.composable
package com.google.jetfit.presentation.screens.moreoptions.composable

import androidx.annotation.DrawableRes
import androidx.compose.foundation.layout.PaddingValues
Expand Down
2 changes: 1 addition & 1 deletion ...options/composable/TrainingDetailsCard.kt → ...options/composable/TrainingDetailsCard.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.more_options.composable
package com.google.jetfit.presentation.screens.moreoptions.composable

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
Expand Down
2 changes: 1 addition & 1 deletion .../profileSelector/ProfileSelectorScreen.kt → .../profileselector/ProfileSelectorScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.profileSelector
package com.google.jetfit.presentation.screens.profileselector

import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
Expand Down
2 changes: 1 addition & 1 deletion ...profileSelector/ProfileSelectorUiState.kt → ...profileselector/ProfileSelectorUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.profileSelector
package com.google.jetfit.presentation.screens.profileselector

import javax.annotation.concurrent.Immutable

Expand Down
2 changes: 1 addition & 1 deletion ...ofileSelector/ProfileSelectorViewModel.kt → ...ofileselector/ProfileSelectorViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.profileSelector
package com.google.jetfit.presentation.screens.profileselector

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion .../training_entities/TrainingEntityPages.kt → ...g/trainingentities/TrainingEntityPages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities
package com.google.jetfit.presentation.screens.training.trainingentities

sealed class TrainingEntityPages {
data object EntityDetails : TrainingEntityPages()
Expand Down
8 changes: 4 additions & 4 deletions ...training_entities/TrainingEntityScreen.kt → .../trainingentities/TrainingEntityScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities
package com.google.jetfit.presentation.screens.training.trainingentities

import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.layout.Box
Expand All @@ -13,9 +13,9 @@ import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.hilt.navigation.compose.hiltViewModel
import com.google.jetfit.presentation.screens.training.training_entities.composables.ChallengeTabs
import com.google.jetfit.presentation.screens.training.training_entities.composables.RoundedGradientImage
import com.google.jetfit.presentation.screens.training.training_entities.composables.TrainingEntityDetails
import com.google.jetfit.presentation.screens.training.trainingentities.composables.ChallengeTabs
import com.google.jetfit.presentation.screens.training.trainingentities.composables.RoundedGradientImage
import com.google.jetfit.presentation.screens.training.trainingentities.composables.TrainingEntityDetails

@Composable
fun TrainingEntityScreen(
Expand Down
10 changes: 5 additions & 5 deletions ...raining_entities/TrainingEntityUiState.kt → ...trainingentities/TrainingEntityUiState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.google.jetfit.presentation.screens.training.training_entities
package com.google.jetfit.presentation.screens.training.trainingentities

import com.google.jetfit.R
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.CHALLENGES
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.ROUTINE
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.SERIES
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.WORK_OUT
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.CHALLENGES
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.ROUTINE
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.SERIES
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.WORK_OUT

data class TrainingEntityUiState(
val contentType: ContentType = ROUTINE,
Expand Down
2 changes: 1 addition & 1 deletion ...ining_entities/TrainingEntityViewModel.kt → ...ainingentities/TrainingEntityViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities
package com.google.jetfit.presentation.screens.training.trainingentities

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
Expand Down
2 changes: 1 addition & 1 deletion ...s/composables/ChallengeTabRowIndicator.kt → ...s/composables/ChallengeTabRowIndicator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities.composables
package com.google.jetfit.presentation.screens.training.trainingentities.composables

import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateDpAsState
Expand Down
4 changes: 2 additions & 2 deletions ...ing_entities/composables/ChallengeTabs.kt → ...ningentities/composables/ChallengeTabs.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities.composables
package com.google.jetfit.presentation.screens.training.trainingentities.composables

import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Box
Expand Down Expand Up @@ -32,7 +32,7 @@ import androidx.tv.material3.TabRow
import androidx.tv.material3.Text
import com.google.jetfit.R
import com.google.jetfit.components.CustomCard
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState

@OptIn(ExperimentalTvMaterial3Api::class, ExperimentalComposeUiApi::class)
@Composable
Expand Down
2 changes: 1 addition & 1 deletion ...ities/composables/ChallengesPlanButton.kt → ...ities/composables/ChallengesPlanButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities.composables
package com.google.jetfit.presentation.screens.training.trainingentities.composables

import androidx.compose.animation.animateColor
import androidx.compose.animation.core.updateTransition
Expand Down
2 changes: 1 addition & 1 deletion ...ities/composables/RoundedGradientImage.kt → ...ities/composables/RoundedGradientImage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities.composables
package com.google.jetfit.presentation.screens.training.trainingentities.composables

import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.runtime.Composable
Expand Down
16 changes: 8 additions & 8 deletions ...ties/composables/TrainingEntityDetails.kt → ...ties/composables/TrainingEntityDetails.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.google.jetfit.presentation.screens.training.training_entities.composables
package com.google.jetfit.presentation.screens.training.trainingentities.composables

import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.layout.Arrangement
Expand All @@ -24,13 +24,13 @@ import androidx.tv.material3.MaterialTheme
import androidx.tv.material3.OutlinedButton
import androidx.tv.material3.Text
import com.google.jetfit.R
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.CHALLENGES
import com.google.jetfit.presentation.screens.training.training_entities.TrainingEntityUiState.ContentType.ROUTINE
import com.google.jetfit.presentation.screens.training.training_entities.getSecondaryButtonID
import com.google.jetfit.presentation.screens.training.training_entities.getSecondaryButtonIcon
import com.google.jetfit.presentation.screens.training.training_entities.getStartButtonID
import com.google.jetfit.presentation.screens.training.training_entities.isSecondaryButtonVisible
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.CHALLENGES
import com.google.jetfit.presentation.screens.training.trainingentities.TrainingEntityUiState.ContentType.ROUTINE
import com.google.jetfit.presentation.screens.training.trainingentities.getSecondaryButtonID
import com.google.jetfit.presentation.screens.training.trainingentities.getSecondaryButtonIcon
import com.google.jetfit.presentation.screens.training.trainingentities.getStartButtonID
import com.google.jetfit.presentation.screens.training.trainingentities.isSecondaryButtonVisible

@OptIn(ExperimentalTvMaterial3Api::class)
@Composable
Expand Down