Skip to content

Rename packages, restructure ui #6

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

Merged
St0pien merged 1 commit into from
Jan 2, 2025
Merged

Rename packages, restructure ui #6

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
3 changes: 3 additions & 0 deletions app/src/main/java/com/github/feelbeatapp/androidclient/model/Player.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.github.feelbeatapp.androidclient.model

data class Player(val name: String, val image: Int)
5 changes: 5 additions & 0 deletions app/src/main/java/com/github/feelbeatapp/androidclient/model/PlayerWithResult.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package com.github.feelbeatapp.androidclient.model

import com.github.feelbeatapp.androidclient.ui.guesssong.ResultStatus

data class PlayerWithResult(val player: Player, val resultStatus: ResultStatus, val points: Int)
2 changes: 1 addition & 1 deletion ...eatapp/androidclient/ui/state/Playlist.kt → ...elbeatapp/androidclient/model/Playlist.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
package com.github.feelbeatapp.androidclient.ui.state
package com.github.feelbeatapp.androidclient.model

data class Playlist(val name: String, val songs: List<Song>)
2 changes: 1 addition & 1 deletion ...eelbeatapp/androidclient/ui/state/Room.kt → ...b/feelbeatapp/androidclient/model/Room.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.state
package com.github.feelbeatapp.androidclient.model

data class Room(
val id: Int,
Expand Down
8 changes: 8 additions & 0 deletions app/src/main/java/com/github/feelbeatapp/androidclient/model/RoomSettings.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.github.feelbeatapp.androidclient.model

data class RoomSettings(
val maxPlayers: Int,
val snippetDuration: Int,
val pointsToWin: Int,
val playlistLink: String,
)
3 changes: 3 additions & 0 deletions app/src/main/java/com/github/feelbeatapp/androidclient/model/Song.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.github.feelbeatapp.androidclient.model

data class Song(val id: Int, val title: String)
16 changes: 8 additions & 8 deletions app/src/main/java/com/github/feelbeatapp/androidclient/ui/FeelBeatApp.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ import androidx.compose.ui.tooling.preview.Preview
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.composable
import androidx.navigation.compose.rememberNavController
import com.github.feelbeatapp.androidclient.ui.acceptGame.AcceptGameScreen
import com.github.feelbeatapp.androidclient.ui.gameResult.GameResultScreen
import com.github.feelbeatapp.androidclient.ui.guessSong.GuessResultScreen
import com.github.feelbeatapp.androidclient.ui.guessSong.GuessSongScreen
import com.github.feelbeatapp.androidclient.ui.acceptgame.AcceptGameScreen
import com.github.feelbeatapp.androidclient.ui.gameresult.GameResultScreen
import com.github.feelbeatapp.androidclient.ui.guesssong.GuessResultScreen
import com.github.feelbeatapp.androidclient.ui.guesssong.GuessSongScreen
import com.github.feelbeatapp.androidclient.ui.home.HomeScreen
import com.github.feelbeatapp.androidclient.ui.login.LoginScreen
import com.github.feelbeatapp.androidclient.ui.newRoomSettings.NewRoomSettingsScreen
import com.github.feelbeatapp.androidclient.ui.roomSettings.RoomSettingsScreen
import com.github.feelbeatapp.androidclient.ui.startGame.StartGameScreen
import com.github.feelbeatapp.androidclient.ui.roomsettings.screens.EditRoomSettingsScreen
import com.github.feelbeatapp.androidclient.ui.roomsettings.screens.NewRoomSettingsScreen
import com.github.feelbeatapp.androidclient.ui.startgame.StartGameScreen
import com.github.feelbeatapp.androidclient.ui.theme.FeelBeatTheme

@Composable
Expand All @@ -38,7 +38,7 @@ fun FeelBeatApp(
NewRoomSettingsScreen(navController = navController)
}
composable(route = FeelBeatRoute.ROOM_SETTINGS.name) {
RoomSettingsScreen(navController = navController)
EditRoomSettingsScreen(navController = navController)
}
composable(route = FeelBeatRoute.ACCEPT_GAME.name) {
AcceptGameScreen(navController = navController)
Expand Down
6 changes: 3 additions & 3 deletions ...dclient/ui/acceptGame/AcceptGameScreen.kt → ...dclient/ui/acceptgame/AcceptGameScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.acceptGame
package com.github.feelbeatapp.androidclient.ui.acceptgame

import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -34,8 +34,8 @@ import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.FeelBeatRoute
import com.github.feelbeatapp.androidclient.ui.state.Song
import com.github.feelbeatapp.androidclient.ui.startGame.PlayerCard
import com.github.feelbeatapp.androidclient.model.Song
import com.github.feelbeatapp.androidclient.ui.startgame.PlayerCard

@Composable
fun AcceptGameScreen(
Expand Down
7 changes: 3 additions & 4 deletions ...ient/ui/acceptGame/AcceptGameViewModel.kt → ...ient/ui/acceptgame/AcceptGameViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
package com.github.feelbeatapp.androidclient.ui.acceptGame
package com.github.feelbeatapp.androidclient.ui.acceptgame

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.state.GameState
import com.github.feelbeatapp.androidclient.ui.state.Player
import com.github.feelbeatapp.androidclient.ui.state.Song
import com.github.feelbeatapp.androidclient.model.Player
import com.github.feelbeatapp.androidclient.model.Song
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.flow.asStateFlow
Expand Down
7 changes: 6 additions & 1 deletion ...atapp/androidclient/ui/state/GameState.kt → .../androidclient/ui/acceptgame/GameState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
package com.github.feelbeatapp.androidclient.ui.state
package com.github.feelbeatapp.androidclient.ui.acceptgame

import com.github.feelbeatapp.androidclient.model.Player
import com.github.feelbeatapp.androidclient.model.Playlist
import com.github.feelbeatapp.androidclient.model.Room
import com.github.feelbeatapp.androidclient.model.Song

data class GameState(
val players: List<Player> = emptyList(),
Expand Down
38 changes: 0 additions & 38 deletions app/src/main/java/com/github/feelbeatapp/androidclient/ui/game/GameScreen.kt
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions app/src/main/java/com/github/feelbeatapp/androidclient/ui/game/GameViewModel.kt
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions ...dclient/ui/gameResult/GameResultScreen.kt → ...dclient/ui/gameresult/GameResultScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.gameResult
package com.github.feelbeatapp.androidclient.ui.gameresult

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
Expand Down Expand Up @@ -31,7 +31,7 @@ import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.FeelBeatRoute
import com.github.feelbeatapp.androidclient.ui.state.PlayerWithResult
import com.github.feelbeatapp.androidclient.model.PlayerWithResult

@Composable
fun GameResultScreen(
Expand Down
8 changes: 4 additions & 4 deletions ...ient/ui/gameResult/GameResultViewModel.kt → ...ient/ui/gameresult/GameResultViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.github.feelbeatapp.androidclient.ui.gameResult
package com.github.feelbeatapp.androidclient.ui.gameresult

import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.state.Player
import com.github.feelbeatapp.androidclient.ui.state.PlayerWithResult
import com.github.feelbeatapp.androidclient.ui.guessSong.ResultStatus
import com.github.feelbeatapp.androidclient.model.Player
import com.github.feelbeatapp.androidclient.model.PlayerWithResult
import com.github.feelbeatapp.androidclient.ui.guesssong.ResultStatus
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
import kotlinx.coroutines.launch
Expand Down
2 changes: 1 addition & 1 deletion ...dclient/ui/guessSong/GuessResultScreen.kt → ...dclient/ui/guesssong/GuessResultScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.guessSong
package com.github.feelbeatapp.androidclient.ui.guesssong

import androidx.compose.foundation.Image
import androidx.compose.foundation.layout.Arrangement
Expand Down
6 changes: 3 additions & 3 deletions ...oidclient/ui/guessSong/GuessSongScreen.kt → ...oidclient/ui/guesssong/GuessSongScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.guessSong
package com.github.feelbeatapp.androidclient.ui.guesssong

import androidx.compose.foundation.Image
import androidx.compose.foundation.border
Expand Down Expand Up @@ -41,8 +41,8 @@ import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.FeelBeatRoute
import com.github.feelbeatapp.androidclient.ui.state.PlayerWithResult
import com.github.feelbeatapp.androidclient.ui.state.Song
import com.github.feelbeatapp.androidclient.model.PlayerWithResult
import com.github.feelbeatapp.androidclient.model.Song

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
9 changes: 4 additions & 5 deletions ...client/ui/guessSong/GuessSongViewModel.kt → ...client/ui/guesssong/GuessSongViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package com.github.feelbeatapp.androidclient.ui.guessSong
package com.github.feelbeatapp.androidclient.ui.guesssong

import androidx.compose.ui.text.input.TextFieldValue
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.state.GuessState
import com.github.feelbeatapp.androidclient.ui.state.Player
import com.github.feelbeatapp.androidclient.ui.state.PlayerWithResult
import com.github.feelbeatapp.androidclient.ui.state.Song
import com.github.feelbeatapp.androidclient.model.Player
import com.github.feelbeatapp.androidclient.model.PlayerWithResult
import com.github.feelbeatapp.androidclient.model.Song
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.StateFlow
Expand Down
6 changes: 5 additions & 1 deletion ...tapp/androidclient/ui/state/GuessState.kt → .../androidclient/ui/guesssong/GuessState.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
package com.github.feelbeatapp.androidclient.ui.state
package com.github.feelbeatapp.androidclient.ui.guesssong

import androidx.compose.ui.text.input.TextFieldValue
import com.github.feelbeatapp.androidclient.model.PlayerWithResult
import com.github.feelbeatapp.androidclient.model.Playlist
import com.github.feelbeatapp.androidclient.model.Room
import com.github.feelbeatapp.androidclient.model.Song

data class GuessState(
val players: List<PlayerWithResult> = emptyList(),
Expand Down
2 changes: 1 addition & 1 deletion ...ndroidclient/ui/guessSong/ResultStatus.kt → ...ndroidclient/ui/guesssong/ResultStatus.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.github.feelbeatapp.androidclient.ui.guessSong
package com.github.feelbeatapp.androidclient.ui.guesssong

enum class ResultStatus {
CORRECT,
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/feelbeatapp/androidclient/ui/home/HomeScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ import androidx.navigation.NavController
import androidx.navigation.compose.rememberNavController
import com.github.feelbeatapp.androidclient.R
import com.github.feelbeatapp.androidclient.ui.FeelBeatRoute
import com.github.feelbeatapp.androidclient.ui.state.Room
import com.github.feelbeatapp.androidclient.model.Room

@OptIn(ExperimentalMaterial3Api::class)
@Composable
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/github/feelbeatapp/androidclient/ui/home/HomeViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import android.content.Context
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import com.github.feelbeatapp.androidclient.auth.AuthManager
import com.github.feelbeatapp.androidclient.ui.state.Room
import com.github.feelbeatapp.androidclient.model.Room
import dagger.hilt.android.lifecycle.HiltViewModel
import javax.inject.Inject
import kotlinx.coroutines.flow.MutableStateFlow
Expand Down
37 changes: 0 additions & 37 deletions .../java/com/github/feelbeatapp/androidclient/ui/newRoomSettings/NewRoomSettingsViewModel.kt
View file
Open in desktop

This file was deleted.

46 changes: 0 additions & 46 deletions ...c/main/java/com/github/feelbeatapp/androidclient/ui/roomSettings/RoomSettingsViewModel.kt
View file
Open in desktop

This file was deleted.

Loading
Loading