diff --git a/app/src/main/java/com/iqball/app/MainActivity.kt b/app/src/main/java/com/iqball/app/MainActivity.kt index 964daee..f7b697b 100644 --- a/app/src/main/java/com/iqball/app/MainActivity.kt +++ b/app/src/main/java/com/iqball/app/MainActivity.kt @@ -13,6 +13,7 @@ import com.google.gson.GsonBuilder import com.iqball.app.api.EitherBodyConverter import com.iqball.app.api.EitherCallAdapterFactory import com.iqball.app.api.service.IQBallService +import com.iqball.app.page.DisplayHomePage import com.iqball.app.page.RegisterPage import com.iqball.app.ui.theme.IQBallTheme import okhttp3.OkHttpClient @@ -56,5 +57,5 @@ class MainActivity : ComponentActivity() { @Composable fun App(service: IQBallService) { - RegisterPage(service) + DisplayHomePage() } \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/page/HomePage.kt b/app/src/main/java/com/iqball/app/page/HomePage.kt new file mode 100644 index 0000000..4d7b3d8 --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/HomePage.kt @@ -0,0 +1,139 @@ +package com.iqball.app.page + +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Divider +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.graphics.Shape +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.iqball.app.R +import com.iqball.app.ui.theme.Orange + +@Preview +@Composable +fun DisplayHomePage() { + HomePage() +} + +@Composable +fun HomePage() { + Column { + AppHeader() + PersonalSpace() + PersonalSpaceMenu() + } +} + +@Composable +fun AppHeader() { + Box( + modifier = Modifier + .background(Color.DarkGray) + .fillMaxWidth(), + contentAlignment = Alignment.Center + ) { + Row { + Text( + text = stringResource(R.string.app_name), + color = Orange, + fontWeight = FontWeight.Bold, + fontSize = 25.sp + ) + //rajouter petit bonhomme avec le nom + } + } +} + +@Composable +fun PersonalSpace() { + Box( + modifier = Modifier + .background(Color.Gray) + .fillMaxWidth(), + contentAlignment = Alignment.Center + ) { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + Text( + text = stringResource(R.string.espace_personnel), + color = Color.White, + fontWeight = FontWeight.Bold, + fontSize = 15.sp, + modifier = Modifier.padding(5.dp) + ) + Box( + modifier = Modifier + .border(2.dp, Color.Black, RoundedCornerShape(5.dp)) + .fillMaxWidth(), + contentAlignment = Alignment.Center + ) { + Text( + text = "Aucune tactique créée !", + fontSize = 10.sp, + modifier = Modifier.padding(5.dp) + ) + } + } + } +} + +@Composable +fun PersonalSpaceMenu() { + Box( + modifier = Modifier + .fillMaxSize() + .background(Color.LightGray) + ) { + Column { + Row { + Row { + Box( + modifier = Modifier + .background(Color.DarkGray) + .padding(5.dp) + ) { + Text(text = "Mes équipes") + } + Divider( + modifier = Modifier.align(Alignment.Bottom), + color = Color.DarkGray, + thickness = 3.dp + ) + //ajouter button add si jamais on fait ajout team en android + } + + } + Row { + Box( + modifier = Modifier + .background(Color.DarkGray) + .padding(5.dp) + ) { + Text(text = "Mes dernières stratégies") + } + Divider( + modifier = Modifier.align(Alignment.Bottom), + color = Color.DarkGray, + thickness = 3.dp + ) + + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/ui/theme/Color.kt b/app/src/main/java/com/iqball/app/ui/theme/Color.kt index 6b01d6c..25acc52 100644 --- a/app/src/main/java/com/iqball/app/ui/theme/Color.kt +++ b/app/src/main/java/com/iqball/app/ui/theme/Color.kt @@ -8,4 +8,6 @@ val Pink80 = Color(0xFFEFB8C8) val Purple40 = Color(0xFF6650a4) val PurpleGrey40 = Color(0xFF625b71) -val Pink40 = Color(0xFF7D5260) \ No newline at end of file +val Pink40 = Color(0xFF7D5260) + +val Orange = Color(0xFFFF8000) \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1c64d05..46b279f 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,4 @@ IQBall + Espace Personnel \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 9c53489..f10c49e 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -agp = "8.3.0" +agp = "8.2.2" arrowCore = "1.2.1" converterGson = "2.9.0" kotlin = "1.9.0"