From 503dee54943736781a3649f5851f7dc4a808609b Mon Sep 17 00:00:00 2001 From: maxime Date: Tue, 25 Jun 2024 11:12:23 +0100 Subject: [PATCH] Android --- .gitignore | 10 + README.md | 2 + app/Home.kt | 1 + app/build.gradle.kts | 90 ++++ app/icons/ball.svg | 62 +++ app/icons/full_court.svg | 135 ++++++ app/icons/half_court.svg | 73 ++++ app/proguard-rules.pro | 21 + .../com/iqball/app/ExampleInstrumentedTest.kt | 24 ++ app/src/main/AndroidManifest.xml | 33 ++ .../main/java/com/iqball/app/MainActivity.kt | 140 ++++++ .../java/com/iqball/app/component/Actions.kt | 330 ++++++++++++++ .../com/iqball/app/component/BallPiece.kt | 22 + .../com/iqball/app/component/BasketCourt.kt | 164 +++++++ .../com/iqball/app/component/PlayerPiece.kt | 42 ++ .../java/com/iqball/app/component/StepTree.kt | 152 +++++++ .../com/iqball/app/domains/PlayerDomains.kt | 112 +++++ .../iqball/app/domains/StepsTreeDomains.kt | 19 + .../main/java/com/iqball/app/geo/Vector.kt | 45 ++ .../main/java/com/iqball/app/model/Tactic.kt | 9 + .../java/com/iqball/app/model/TacticInfo.kt | 11 + .../main/java/com/iqball/app/model/Team.kt | 9 + .../com/iqball/app/model/tactic/Action.kt | 24 ++ .../com/iqball/app/model/tactic/BallState.kt | 13 + .../com/iqball/app/model/tactic/CourtType.kt | 6 + .../iqball/app/model/tactic/MovementPath.kt | 3 + .../com/iqball/app/model/tactic/PlayerInfo.kt | 13 + .../com/iqball/app/model/tactic/PlayerTeam.kt | 6 + .../iqball/app/model/tactic/Positioning.kt | 9 + .../iqball/app/model/tactic/StepComponent.kt | 42 ++ .../iqball/app/model/tactic/StepContent.kt | 15 + .../iqball/app/model/tactic/StepNodeInfo.kt | 17 + .../com/iqball/app/net/EitherBodyConverter.kt | 37 ++ .../java/com/iqball/app/net/EitherCall.kt | 54 +++ .../app/net/EitherCallAdapterFactory.kt | 38 ++ .../com/iqball/app/net/service/AuthService.kt | 24 ++ .../iqball/app/net/service/IQBallService.kt | 8 + .../iqball/app/net/service/TacticService.kt | 44 ++ .../com/iqball/app/net/service/UserService.kt | 13 + .../main/java/com/iqball/app/page/HomePage.kt | 407 ++++++++++++++++++ .../java/com/iqball/app/page/LoginPage.kt | 109 +++++ .../java/com/iqball/app/page/RegisterPage.kt | 130 ++++++ .../com/iqball/app/page/VisualizerPage.kt | 213 +++++++++ .../app/serialization/EitherTypeAdapter.kt | 97 +++++ .../app/serialization/EnumTypeAdapter.kt | 81 ++++ .../com/iqball/app/session/Authentication.kt | 4 + .../com/iqball/app/session/DataSession.kt | 3 + .../java/com/iqball/app/session/Session.kt | 5 + app/src/main/java/com/iqball/app/stub/Stub.kt | 72 ++++ .../java/com/iqball/app/ui/theme/Color.kt | 25 ++ .../java/com/iqball/app/ui/theme/Theme.kt | 76 ++++ .../main/java/com/iqball/app/ui/theme/Type.kt | 34 ++ .../drawable-v24/ic_launcher_foreground.xml | 30 ++ app/src/main/res/drawable/ball.xml | 38 ++ app/src/main/res/drawable/half_court.xml | 171 ++++++++ .../res/drawable/ic_launcher_background.xml | 170 ++++++++ app/src/main/res/drawable/plain_court.xml | 301 +++++++++++++ app/src/main/res/drawable/tree_icon.png | Bin 0 -> 5779 bytes .../res/mipmap-anydpi-v26/ic_launcher.xml | 6 + .../mipmap-anydpi-v26/ic_launcher_round.xml | 6 + app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 0 -> 1404 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 0 -> 2898 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 0 -> 982 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 0 -> 1772 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 0 -> 1900 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 0 -> 3918 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 0 -> 2884 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 0 -> 5914 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 0 -> 3844 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 0 -> 7778 bytes app/src/main/res/values/colors.xml | 11 + app/src/main/res/values/strings.xml | 4 + app/src/main/res/values/themes.xml | 5 + app/src/main/res/xml/backup_rules.xml | 13 + .../main/res/xml/data_extraction_rules.xml | 19 + .../main/res/xml/network_security_config.xml | 8 + .../java/com/iqball/app/ExampleUnitTest.kt | 17 + build.gradle.kts | 5 + gradle.properties | 23 + gradle/libs.versions.toml | 60 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59203 bytes gradle/wrapper/gradle-wrapper.properties | 6 + gradlew | 185 ++++++++ gradlew.bat | 89 ++++ settings.gradle.kts | 26 ++ 85 files changed, 4321 insertions(+) create mode 100644 .gitignore create mode 100644 README.md create mode 100644 app/Home.kt create mode 100644 app/build.gradle.kts create mode 100644 app/icons/ball.svg create mode 100644 app/icons/full_court.svg create mode 100644 app/icons/half_court.svg create mode 100644 app/proguard-rules.pro create mode 100644 app/src/androidTest/java/com/iqball/app/ExampleInstrumentedTest.kt create mode 100644 app/src/main/AndroidManifest.xml create mode 100644 app/src/main/java/com/iqball/app/MainActivity.kt create mode 100644 app/src/main/java/com/iqball/app/component/Actions.kt create mode 100644 app/src/main/java/com/iqball/app/component/BallPiece.kt create mode 100644 app/src/main/java/com/iqball/app/component/BasketCourt.kt create mode 100644 app/src/main/java/com/iqball/app/component/PlayerPiece.kt create mode 100644 app/src/main/java/com/iqball/app/component/StepTree.kt create mode 100644 app/src/main/java/com/iqball/app/domains/PlayerDomains.kt create mode 100644 app/src/main/java/com/iqball/app/domains/StepsTreeDomains.kt create mode 100644 app/src/main/java/com/iqball/app/geo/Vector.kt create mode 100644 app/src/main/java/com/iqball/app/model/Tactic.kt create mode 100644 app/src/main/java/com/iqball/app/model/TacticInfo.kt create mode 100644 app/src/main/java/com/iqball/app/model/Team.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/Action.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/BallState.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/CourtType.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/MovementPath.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/PlayerInfo.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/PlayerTeam.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/Positioning.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/StepComponent.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/StepContent.kt create mode 100644 app/src/main/java/com/iqball/app/model/tactic/StepNodeInfo.kt create mode 100644 app/src/main/java/com/iqball/app/net/EitherBodyConverter.kt create mode 100644 app/src/main/java/com/iqball/app/net/EitherCall.kt create mode 100644 app/src/main/java/com/iqball/app/net/EitherCallAdapterFactory.kt create mode 100644 app/src/main/java/com/iqball/app/net/service/AuthService.kt create mode 100644 app/src/main/java/com/iqball/app/net/service/IQBallService.kt create mode 100644 app/src/main/java/com/iqball/app/net/service/TacticService.kt create mode 100644 app/src/main/java/com/iqball/app/net/service/UserService.kt create mode 100644 app/src/main/java/com/iqball/app/page/HomePage.kt create mode 100644 app/src/main/java/com/iqball/app/page/LoginPage.kt create mode 100644 app/src/main/java/com/iqball/app/page/RegisterPage.kt create mode 100644 app/src/main/java/com/iqball/app/page/VisualizerPage.kt create mode 100644 app/src/main/java/com/iqball/app/serialization/EitherTypeAdapter.kt create mode 100644 app/src/main/java/com/iqball/app/serialization/EnumTypeAdapter.kt create mode 100644 app/src/main/java/com/iqball/app/session/Authentication.kt create mode 100644 app/src/main/java/com/iqball/app/session/DataSession.kt create mode 100644 app/src/main/java/com/iqball/app/session/Session.kt create mode 100644 app/src/main/java/com/iqball/app/stub/Stub.kt create mode 100644 app/src/main/java/com/iqball/app/ui/theme/Color.kt create mode 100644 app/src/main/java/com/iqball/app/ui/theme/Theme.kt create mode 100644 app/src/main/java/com/iqball/app/ui/theme/Type.kt create mode 100644 app/src/main/res/drawable-v24/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ball.xml create mode 100644 app/src/main/res/drawable/half_court.xml create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/plain_court.xml create mode 100644 app/src/main/res/drawable/tree_icon.png create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-hdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-mdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp create mode 100644 app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp create mode 100644 app/src/main/res/values/colors.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/values/themes.xml create mode 100644 app/src/main/res/xml/backup_rules.xml create mode 100644 app/src/main/res/xml/data_extraction_rules.xml create mode 100644 app/src/main/res/xml/network_security_config.xml create mode 100644 app/src/test/java/com/iqball/app/ExampleUnitTest.kt create mode 100644 build.gradle.kts create mode 100644 gradle.properties create mode 100644 gradle/libs.versions.toml create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle.kts diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3e2813a --- /dev/null +++ b/.gitignore @@ -0,0 +1,10 @@ +*.iml +.gradle +/local.properties +.idea +.DS_Store +build +/captures +.externalNativeBuild +.cxx +local.properties diff --git a/README.md b/README.md new file mode 100644 index 0000000..38dfe36 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# IQBall - Android Application +This repository hosts the IQBall application for the android platform diff --git a/app/Home.kt b/app/Home.kt new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/app/Home.kt @@ -0,0 +1 @@ + diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..11be49b --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,90 @@ +plugins { + alias(libs.plugins.androidApplication) + alias(libs.plugins.jetbrainsKotlinAndroid) + + kotlin("plugin.serialization") version "1.9.23" + +} + +android { + namespace = "com.iqball.app" + compileSdk = 34 + + defaultConfig { + applicationId = "com.iqball.app" + minSdk = 28 + targetSdk = 34 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + debug { + isDebuggable = true + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.5.1" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} + +dependencies { + implementation("io.coil-kt:coil-compose:2.6.0") + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.activity.compose) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.androidx.material3) + + implementation(libs.retrofit) + implementation(libs.retrofit2.kotlinx.serialization.converter) + implementation(libs.kotlinx.datetime) + implementation(libs.moshi) + implementation(libs.moshi.adapters) + implementation(libs.converter.moshi.v250) + implementation(libs.moshi.kotlin) + implementation(libs.zoomable) + implementation(libs.compose.free.scroll) + + implementation(libs.retrofit.adapters.arrow) + implementation(libs.arrow.core) + implementation(libs.androidx.navigation.compose) + + testImplementation(libs.junit) + androidTestImplementation(libs.androidx.junit) + androidTestImplementation(libs.androidx.espresso.core) + androidTestImplementation(platform(libs.androidx.compose.bom)) + androidTestImplementation(libs.androidx.ui.test.junit4) + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} \ No newline at end of file diff --git a/app/icons/ball.svg b/app/icons/ball.svg new file mode 100644 index 0000000..6351088 --- /dev/null +++ b/app/icons/ball.svg @@ -0,0 +1,62 @@ + + + + +Created by potrace 1.15, written by Peter Selinger 2001-2017 + + + + + + + + + + + + diff --git a/app/icons/full_court.svg b/app/icons/full_court.svg new file mode 100644 index 0000000..5bfc0de --- /dev/null +++ b/app/icons/full_court.svg @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/icons/half_court.svg b/app/icons/half_court.svg new file mode 100644 index 0000000..f621f93 --- /dev/null +++ b/app/icons/half_court.svg @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/com/iqball/app/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/iqball/app/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..04b635f --- /dev/null +++ b/app/src/androidTest/java/com/iqball/app/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.iqball.app + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.iqball.app", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..f090dc0 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/MainActivity.kt b/app/src/main/java/com/iqball/app/MainActivity.kt new file mode 100644 index 0000000..201ec44 --- /dev/null +++ b/app/src/main/java/com/iqball/app/MainActivity.kt @@ -0,0 +1,140 @@ +package com.iqball.app + +import android.os.Bundle +import android.util.Log +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier + +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.rememberNavController +import com.iqball.app.model.tactic.ActionType +import com.iqball.app.model.tactic.BallComponent +import com.iqball.app.model.tactic.BallState +import com.iqball.app.model.tactic.FixedPosition +import com.iqball.app.model.tactic.PhantomComponent +import com.iqball.app.model.tactic.PlayerComponent +import com.iqball.app.model.tactic.PlayerTeam +import com.iqball.app.model.tactic.Positioning +import com.iqball.app.model.tactic.RelativePositioning +import com.iqball.app.model.tactic.StepComponent +import com.iqball.app.net.EitherBodyConverter +import com.iqball.app.net.EitherCallAdapterFactory +import com.iqball.app.net.service.IQBallService +import com.iqball.app.page.HomePage +import com.iqball.app.page.LoginPage +import com.iqball.app.page.RegisterPage +import com.iqball.app.serialization.EitherTypeAdapterFactory +import com.iqball.app.serialization.EnumTypeAdapterFactory +import com.iqball.app.session.DataSession +import com.iqball.app.session.Session +import com.iqball.app.ui.theme.IQBallTheme +import com.squareup.moshi.Moshi +import com.squareup.moshi.adapters.PolymorphicJsonAdapterFactory +import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory +import okhttp3.OkHttpClient +import retrofit2.Retrofit +import retrofit2.converter.moshi.MoshiConverterFactory +import retrofit2.create + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val moshi = Moshi.Builder() + .add(EitherTypeAdapterFactory) + .add( + PolymorphicJsonAdapterFactory.of(StepComponent::class.java, "type") + .withSubtype(PlayerComponent::class.java, "player") + .withSubtype(PhantomComponent::class.java, "phantom") + .withSubtype(BallComponent::class.java, "ball") + ) + .add( + PolymorphicJsonAdapterFactory.of(Positioning::class.java, "type") + .withSubtype(FixedPosition::class.java, "fixed") + .withSubtype(RelativePositioning::class.java, "follows") + ) + .add(EnumTypeAdapterFactory.create(true)) + .add(EnumTypeAdapterFactory.create(true) { + "HOLDS_ORIGIN" means BallState.HoldsOrigin + "HOLDS_BY_PASS" means BallState.HoldsByPass + "PASSED_ORIGIN" means BallState.PassedOrigin + }) + .add(EnumTypeAdapterFactory.create(true)) + .add(KotlinJsonAdapterFactory()) + .build() + + val retrofit = Retrofit.Builder() + .addConverterFactory(EitherBodyConverter.create()) + .addConverterFactory(MoshiConverterFactory.create(moshi)) + .addCallAdapterFactory(EitherCallAdapterFactory.create()) + .baseUrl("https://iqball.maxou.dev/api/dotnet-master/") + .client( + OkHttpClient.Builder() + .addInterceptor { it.proceed(it.request()) } + .build() + ) + .build() + + val service = retrofit.create() + + setContent { + IQBallTheme(darkTheme = false, dynamicColor = false) { + // A surface container using the 'background' color from the theme + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + val sessionState = remember { mutableStateOf(DataSession()) } + App(service, sessionState) + } + } + } + } +} + +@Composable +fun App(service: IQBallService, sessionState: MutableState) { + val navController = rememberNavController() + + NavHost(navController = navController, startDestination = "login") { + composable("login") { + LoginPage( + service = service, + onLoginSuccess = { auth -> + Log.i("ZIZI", "auth : ${auth}") + sessionState.value = DataSession(auth) + navController.navigate("home") + Log.i("ZIZI", "auth : ${auth}") + }, + onNavigateToRegister = { + navController.navigate("register") + } + ) + } + composable("register") { + RegisterPage( + service = service, + onRegisterSuccess = { auth -> + sessionState.value = DataSession(auth) + navController.navigate("home") + }, + onNavigateToLogin = { + navController.navigate("login") + } + ) + } + composable("home") { + HomePage(service = service, sessionState.value.auth!!) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/component/Actions.kt b/app/src/main/java/com/iqball/app/component/Actions.kt new file mode 100644 index 0000000..cff94ee --- /dev/null +++ b/app/src/main/java/com/iqball/app/component/Actions.kt @@ -0,0 +1,330 @@ +package com.iqball.app.component + +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.graphics.Path +import androidx.compose.ui.graphics.PathEffect +import androidx.compose.ui.graphics.drawscope.ContentDrawScope +import androidx.compose.ui.graphics.drawscope.DrawScope +import androidx.compose.ui.graphics.drawscope.Fill +import androidx.compose.ui.graphics.drawscope.Stroke +import androidx.compose.ui.graphics.drawscope.rotate +import arrow.core.Either +import com.iqball.app.geo.Vector +import com.iqball.app.model.tactic.Action +import com.iqball.app.model.tactic.ActionType +import com.iqball.app.model.tactic.ComponentId +import com.iqball.app.model.tactic.Segment +import com.iqball.app.model.tactic.StepContent +import kotlin.math.cos +import kotlin.math.pow +import kotlin.math.sin + +private const val ArrowWidthPx = 5F +private const val ArrowHeadHeightPx = 35F + +fun drawActions( + drawer: ContentDrawScope, + content: StepContent, + offsets: Map, + area: Rect, + playersPixelsRadius: Float, + color: Color +) { + for (component in content.components) { + val originPos = offsets[component.id]!! + for (action in component.actions) { + + val type = action.type + + val forceStraight = type == ActionType.Shoot + + val strokeStyle = when (type) { + ActionType.Screen, ActionType.Move, ActionType.Dribble -> Stroke(width = ArrowWidthPx) + ActionType.Shoot -> Stroke( + width = ArrowWidthPx, + pathEffect = PathEffect.dashPathEffect(floatArrayOf(15F, 15F)) + ) + } + + // draw the arrow body + if (forceStraight) { + val targetOffset = when (val value = action.target) { + is Either.Left -> offsets[value.value]!! + is Either.Right -> value.value.posWithinArea(area) + } + val path = Path() + val pathStart = constraintInCircle( + originPos, + getOrientationPointFromSegmentBounds( + action.segments, + originPos, + offsets, + area, + false + ), + playersPixelsRadius + ) + val pathEnd = constraintInCircle( + targetOffset, + getOrientationPointFromSegmentBounds( + action.segments, + originPos, + offsets, + area, + true + ), + playersPixelsRadius + ArrowHeadHeightPx + ) + path.moveTo(pathStart.x, pathStart.y) + path.lineTo(pathEnd.x, pathEnd.y) + drawer.drawPath( + path = path, + color = color, + style = strokeStyle + ) + } else { + drawer.drawPath( + path = computeSegmentsToPath( + originPos, + action.segments, + offsets, + area, + type == ActionType.Dribble, + playersPixelsRadius + ), + color = color, + style = strokeStyle + ) + } + + drawArrowHead(drawer, originPos, action, offsets, area, playersPixelsRadius) + } + } +} + +private fun drawArrowHead( + drawer: DrawScope, + originPos: Vector, + action: Action, + offsets: Map, + area: Rect, + playersPixelsRadius: Float +) { + val segments = action.segments + val lastSegment = segments.last() + val target = lastSegment.next + var targetPos = extractPos(target, offsets, area) + val segmentOrientationPoint = + getOrientationPointFromSegmentBounds(segments, originPos, offsets, area, true) + + targetPos = constraintInCircle(targetPos, segmentOrientationPoint, playersPixelsRadius) + + val pathAngleToTarget = -targetPos.angleDegWith(segmentOrientationPoint) + + drawer.rotate(pathAngleToTarget, pivot = targetPos.toOffset()) { + + val path = + if (action.type == ActionType.Screen) getRectangleHeadPath(targetPos) else getTriangleHeadPath( + targetPos + ) + drawPath(path = path, color = Color.Black, style = Fill) + } +} + +private fun getTriangleHeadPath(start: Vector): Path { + val path = Path() + path.moveTo(start.x, start.y) + path.relativeLineTo(-ArrowHeadHeightPx, -ArrowHeadHeightPx) + path.relativeLineTo(ArrowHeadHeightPx * 2, 0F) + return path +} + +private fun getRectangleHeadPath(start: Vector): Path { + val path = Path() + path.moveTo(start.x, start.y - ArrowHeadHeightPx / 2F) + path.relativeLineTo(-ArrowHeadHeightPx, 0F) + path.relativeLineTo(0F, -ArrowHeadHeightPx / 2F) + path.relativeLineTo(ArrowHeadHeightPx * 2, 0F) + path.relativeLineTo(0F, ArrowHeadHeightPx / 2F) + return path +} + +private fun getOrientationPointFromSegmentBounds( + segments: List, + originPos: Vector, + offsets: Map, + area: Rect, + head: Boolean +): Vector { + val boundSegment = if (head) segments.last() else segments.first() + return boundSegment + .controlPoint?.posWithinArea(area) + ?: if (segments.size == 1) + if (head) originPos else extractPos(segments.last().next, offsets, area) + else run { + val referenceSegment = if (head) segments[segments.size - 2] else segments[1] + extractPos(referenceSegment.next, offsets, area) + } +} + +private fun computeSegmentsToPath( + originPos: Vector, + segments: List, + offsets: Map, + area: Rect, + wavy: Boolean, + playersPixelsRadius: Float +): Path { + val path = Path() + + + val firstSegment = segments.first() + + var segmentStart = constraintInCircle( + originPos, + getOrientationPointFromSegmentBounds(segments, originPos, offsets, area, false), + playersPixelsRadius + ) + + var lastSegmentCp = + firstSegment.controlPoint?.posWithinArea(area) ?: (segmentStart + extractPos( + firstSegment.next, offsets, area + ) / 2F) + + path.moveTo(segmentStart.x, segmentStart.y) + + + for ((i, segment) in segments.withIndex()) { + var nextPos = extractPos(segment.next, offsets, area) + + if (i == segments.size - 1) { + // if it is the last segment, the next position must be constrained to the player's radius + nextPos = constraintInCircle( + nextPos, + getOrientationPointFromSegmentBounds( + segments, + originPos, + offsets, + area, + true + ), + playersPixelsRadius + ArrowHeadHeightPx + ) + } + + val segmentCp = segment.controlPoint?.posWithinArea(area) ?: ((segmentStart + nextPos) / 2F) + val castedCp = + if (i == 0) segmentCp else segmentStart + (segmentStart - lastSegmentCp) + + if (wavy) { + wavyBezier(segmentStart, castedCp, segmentCp, nextPos, 7, 15, path) + } else { + path.cubicTo(castedCp.x, castedCp.y, segmentCp.x, segmentCp.y, nextPos.x, nextPos.y) + } + + lastSegmentCp = segmentCp + segmentStart = nextPos + } + + return path +} + +private fun cubicBeziersDerivative( + start: Vector, + cp1: Vector, + cp2: Vector, + end: Vector, + t: Float +): Vector = ((cp1 - start) * 3F * (1 - t).pow(2)) + + ((cp2 - cp1) * 6F * (1 - t) * t) + + ((end - cp2) * 3F * t.pow(2)) + + +private fun cubicBeziers( + start: Vector, + cp1: Vector, + cp2: Vector, + end: Vector, + t: Float +): Vector = (start * (1 - t).pow(3)) + + (cp1 * 3F * t * (1 - t).pow(2)) + + (cp2 * 3F * t.pow(2) * (1 - t)) + + (end * t.pow(3)) + +private fun wavyBezier( + start: Vector, + cp1: Vector, + cp2: Vector, + end: Vector, + wavesPer100Px: Int, + amplitude: Int, + path: Path +) { + + fun getVerticalDerivativeProjectionAmplification(t: Float): Vector { + val velocity = cubicBeziersDerivative(start, cp1, cp2, end, t) + val velocityLength = velocity.norm() + val projection = Vector(velocity.y, -velocity.x) + + return (projection / velocityLength) * amplitude + } + + + val dist = start.distanceFrom(cp1) + cp1.distanceFrom(cp2) + cp2.distanceFrom(end) + + val waveLength = (dist / 100) * wavesPer100Px * 2 + val step = 1F / waveLength + + // 0 : middle to up + // 1 : up to middle + // 2 : middle to down + // 3 : down to middle + var phase = 0 + + var t = step + while (t <= 1) { + val pos = cubicBeziers(start, cp1, cp2, end, t) + val amplification = getVerticalDerivativeProjectionAmplification(t) + + val nextPos = when (phase) { + 1, 3 -> pos + 0 -> pos + amplification + else -> pos - amplification + } + + val controlPointBase = cubicBeziers(start, cp1, cp2, end, t - step / 2) + val controlPoint = + if (phase == 0 || phase == 1) controlPointBase + amplification else controlPointBase - amplification + path.quadraticBezierTo(controlPoint.x, controlPoint.y, nextPos.x, nextPos.y) + phase = (phase + 1) % 4 + t += step + if (t < 1 && t > 1 - step) t = 1F + } +} + +/** + * Given a circle shaped by a central position, and a radius, return + * a position that is constrained on its perimeter, pointing to the direction + * between the circle's center and the reference position. + * @param center circle's center. + * @param reference a reference point used to create the angle where the returned position + * will point to on the circle's perimeter + * @param radius circle's radius. + */ +private fun constraintInCircle(center: Vector, reference: Vector, radius: Float): Vector { + val theta = center.angleRadWith(reference) + return Vector( + x = center.x - sin(theta) * radius, + y = center.y - cos(theta) * radius + ) +} + +private fun extractPos( + next: Either, + offsets: Map, + area: Rect +) = when (next) { + is Either.Left -> offsets[next.value]!! + is Either.Right -> next.value.posWithinArea(area) +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/component/BallPiece.kt b/app/src/main/java/com/iqball/app/component/BallPiece.kt new file mode 100644 index 0000000..3d855f1 --- /dev/null +++ b/app/src/main/java/com/iqball/app/component/BallPiece.kt @@ -0,0 +1,22 @@ +package com.iqball.app.component + +import androidx.compose.foundation.layout.size +import androidx.compose.material3.Icon +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import com.iqball.app.R +import com.iqball.app.ui.theme.BallColor + +const val BallPieceDiameterDp = 20 + +@Composable +fun BallPiece(modifier: Modifier = Modifier) { + Icon( + painter = painterResource(R.drawable.ball), + contentDescription = "ball", + tint = BallColor, + modifier = modifier.size(BallPieceDiameterDp.dp) + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/component/BasketCourt.kt b/app/src/main/java/com/iqball/app/component/BasketCourt.kt new file mode 100644 index 0000000..9b16bdb --- /dev/null +++ b/app/src/main/java/com/iqball/app/component/BasketCourt.kt @@ -0,0 +1,164 @@ +package com.iqball.app.component + +import androidx.compose.foundation.Image +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.requiredHeight +import androidx.compose.foundation.layout.requiredWidth +import androidx.compose.foundation.layout.width +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.boundsInParent +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.platform.LocalDensity +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.unit.dp +import arrow.core.getOrNone +import com.iqball.app.R +import com.iqball.app.domains.getPlayerInfo +import com.iqball.app.geo.toVector +import com.iqball.app.model.tactic.BallComponent +import com.iqball.app.model.tactic.ComponentId +import com.iqball.app.model.tactic.CourtType +import com.iqball.app.model.tactic.PlayerLike +import com.iqball.app.model.tactic.StepContent +import net.engawapg.lib.zoomable.ZoomState +import net.engawapg.lib.zoomable.zoomable + +data class BasketCourtStates( + val stepComponentsOffsets: MutableMap, + val parentComponentsOffsets: MutableMap, + val courtArea: MutableState, + val zoomState: ZoomState +) + +@Composable +fun BasketCourt( + content: StepContent, + parentContent: StepContent?, + type: CourtType, + modifier: Modifier, + state: BasketCourtStates +) { + val courtImg = when (type) { + CourtType.Plain -> R.drawable.plain_court + CourtType.Half -> R.drawable.half_court + } + + var courtArea by state.courtArea + val zoomState = state.zoomState + + + Box( + modifier = modifier + .background(Color.LightGray) + .fillMaxSize(), + contentAlignment = Alignment.Center + ) { + Box( + modifier = Modifier + .width(IntrinsicSize.Min) + .zoomable(zoomState), + contentAlignment = Alignment.Center, + ) { + Image( + painter = painterResource(id = courtImg), + contentDescription = "court", + modifier = Modifier + .background(Color.White) + .onGloballyPositioned { + if (courtArea == Rect.Zero) + courtArea = it.boundsInRoot() + } + ) + + CourtContent( + courtArea = courtArea, + content = content, + offsets = state.stepComponentsOffsets, + isFromParent = false + ) + if (parentContent != null) { + CourtContent( + courtArea = courtArea, + content = parentContent, + offsets = state.parentComponentsOffsets, + isFromParent = true + ) + } + } + } +} + +@Composable +private fun CourtContent( + courtArea: Rect, + content: StepContent, + offsets: MutableMap, + isFromParent: Boolean +) { + val playersPixelsRadius = LocalDensity.current.run { PlayerPieceDiameterDp.dp.toPx() / 2 } + + val width = LocalDensity.current.run { courtArea.width.toDp() } + val height = LocalDensity.current.run { courtArea.height.toDp() } + + Box( + modifier = Modifier + .requiredWidth(width) + .requiredHeight(height) + .drawWithContent { + val relativeOffsets = + offsets.mapValues { (it.value).toVector() } + drawActions( + this, + content, + relativeOffsets, + courtArea, + playersPixelsRadius, + if (isFromParent) Color.Gray else Color.Black + ) + drawContent() + } + ) { + + + for (component in content.components) { + val componentModifier = Modifier + .onGloballyPositioned { + if (!offsets.getOrNone(component.id).isSome { it != Offset.Zero }) + offsets[component.id] = it.boundsInParent().center + } + when (component) { + is PlayerLike -> { + val info = getPlayerInfo(component, content) + PlayerPiece( + player = info, + isFromParent = isFromParent, + modifier = componentModifier + .align(info.pos.toBiasAlignment()) + ) + } + + is BallComponent -> BallPiece( + modifier = componentModifier + .align( + component.pos + .toPos() + .toBiasAlignment() + ) + ) + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/component/PlayerPiece.kt b/app/src/main/java/com/iqball/app/component/PlayerPiece.kt new file mode 100644 index 0000000..b679a3f --- /dev/null +++ b/app/src/main/java/com/iqball/app/component/PlayerPiece.kt @@ -0,0 +1,42 @@ +package com.iqball.app.component + +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.alpha +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.iqball.app.model.tactic.PlayerInfo +import com.iqball.app.model.tactic.PlayerTeam +import com.iqball.app.ui.theme.Allies +import com.iqball.app.ui.theme.Opponents + +const val PlayerPieceDiameterDp = 25 + +@Composable +fun PlayerPiece(player: PlayerInfo, modifier: Modifier = Modifier, isFromParent: Boolean) { + + val color = if (isFromParent) Color.LightGray else if (player.team === PlayerTeam.Allies) Allies else Opponents + + return Surface( + shape = CircleShape, + border = if (player.ballState.hasBall()) BorderStroke(2.dp, Color.Black) else null, + modifier = modifier + .alpha(if (player.isPhantom) .5F else 1F) + ) { + Text( + text = player.role, + textAlign = TextAlign.Center, + color = Color.Black, + modifier = Modifier + .background(color) + .size(PlayerPieceDiameterDp.dp) + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/component/StepTree.kt b/app/src/main/java/com/iqball/app/component/StepTree.kt new file mode 100644 index 0000000..c1e4d8c --- /dev/null +++ b/app/src/main/java/com/iqball/app/component/StepTree.kt @@ -0,0 +1,152 @@ +package com.iqball.app.component + +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.shape.CircleShape +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.drawWithContent +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.layout.boundsInRoot +import androidx.compose.ui.layout.onGloballyPositioned +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.dp +import com.chihsuanwu.freescroll.freeScroll +import com.chihsuanwu.freescroll.rememberFreeScrollState +import com.iqball.app.domains.getStepName +import com.iqball.app.model.tactic.StepNodeInfo +import com.iqball.app.ui.theme.SelectedStepNode +import com.iqball.app.ui.theme.StepNode + +@Composable +fun StepsTree(root: StepNodeInfo, selectedNodeId: Int, onNodeSelected: (StepNodeInfo) -> Unit) { + + val scrollState = rememberFreeScrollState() + val nodesOffsets = remember { mutableStateMapOf() } + var globalOffset by remember { mutableStateOf(Offset.Zero) } + + Box( + modifier = Modifier + .fillMaxSize() + .freeScroll(scrollState) + .onGloballyPositioned { + if (globalOffset == Offset.Zero) + globalOffset = it.boundsInRoot().topLeft + } + .drawWithContent { + + if (nodesOffsets.isEmpty()) { + drawContent() + return@drawWithContent + } + + val toDraw = mutableListOf(root) + while (toDraw.isNotEmpty()) { + val parent = toDraw.removeLast() + val parentCenter = nodesOffsets[parent]!!.center - globalOffset + for (children in parent.children) { + val childrenCenter = nodesOffsets[children]!!.center - globalOffset + drawLine( + Color.Black, + start = parentCenter, + end = childrenCenter, + strokeWidth = 5F + ) + toDraw += children + } + } + + drawContent() + + }, + contentAlignment = Alignment.TopCenter + ) { + StepsTreeContent(root, root, selectedNodeId, onNodeSelected, nodesOffsets) + } +} + +@Composable +private fun StepsTreeContent( + root: StepNodeInfo, + node: StepNodeInfo, + selectedNodeId: Int, + onNodeSelected: (StepNodeInfo) -> Unit, + nodesOffsets: MutableMap +) { + + Column( + horizontalAlignment = Alignment.CenterHorizontally, + modifier = Modifier + ) { + StepPiece( + name = getStepName(root, node.id), + node = node, + isSelected = selectedNodeId == node.id, + onNodeSelected = { onNodeSelected(node) }, + modifier = Modifier + .padding(10.dp) + .onGloballyPositioned { + if (!nodesOffsets.containsKey(node)) + nodesOffsets[node] = it.boundsInRoot() + } + ) + + Row( + modifier = Modifier + .padding(top = 50.dp) + ) { + for (children in node.children) { + StepsTreeContent( + root = root, + node = children, + selectedNodeId = selectedNodeId, + onNodeSelected = onNodeSelected, + nodesOffsets = nodesOffsets + ) + } + } + } +} + +@Composable +fun StepPiece( + name: String, + node: StepNodeInfo, + isSelected: Boolean, + onNodeSelected: () -> Unit, + modifier: Modifier = Modifier +) { + val color = if (isSelected) SelectedStepNode else StepNode + + return Surface( + shape = CircleShape, + modifier = modifier.clickable { + onNodeSelected() + } + ) { + Text( + text = name, + textAlign = TextAlign.Center, + color = if (isSelected) Color.White else Color.Black, + modifier = Modifier + .background(color) + .size(PlayerPieceDiameterDp.dp) + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/domains/PlayerDomains.kt b/app/src/main/java/com/iqball/app/domains/PlayerDomains.kt new file mode 100644 index 0000000..df0fe7d --- /dev/null +++ b/app/src/main/java/com/iqball/app/domains/PlayerDomains.kt @@ -0,0 +1,112 @@ +package com.iqball.app.domains + +import arrow.core.merge +import com.iqball.app.geo.Vector +import com.iqball.app.model.tactic.BallComponent +import com.iqball.app.model.tactic.FixedPosition +import com.iqball.app.model.tactic.MalformedStepContentException +import com.iqball.app.model.tactic.PhantomComponent +import com.iqball.app.model.tactic.PlayerComponent +import com.iqball.app.model.tactic.PlayerInfo +import com.iqball.app.model.tactic.PlayerLike +import com.iqball.app.model.tactic.RelativePositioning +import com.iqball.app.model.tactic.StepComponent +import com.iqball.app.model.tactic.StepContent + +/** + * Converts the phantom's [Positioning] to a XY Position + * if the phantom is a [RelativePositioning], the XY coords are determined + * using the attached component, and by expecting that there is an action on the attached component that + * targets the given phantom. + * If so, then the position is determined by projecting the attached component's position, and the direction + * of the action's last segment. + * @throws MalformedStepContentException if the step content contains incoherent data + */ +fun computePhantomPosition(phantom: PhantomComponent, content: StepContent): Vector { + return when (val pos = phantom.pos) { + is FixedPosition -> pos.toPos() + + is RelativePositioning -> { + val phantomBefore = getPlayerBefore(phantom, content)!! + + val referentId = pos.attach + val actions = phantomBefore.actions + val linkAction = actions.find { it.target.isLeft(referentId::equals) } + ?: throw MalformedStepContentException("phantom ${phantom.id} is casted by ${phantom}, but there is no action between them.") + + val segments = linkAction.segments + val lastSegment = segments.last() + + val referent = content.findComponent(referentId)!! + val referentPos = computeComponentPosition(referent, content) + val directionalPos = lastSegment.controlPoint + ?: segments.elementAtOrNull(segments.size - 2) + ?.next + ?.mapLeft { computeComponentPosition(content.findComponent(it)!!, content) } + ?.merge() + ?: computeComponentPosition(phantomBefore, content) + + val axisSegment = (directionalPos - referentPos) + val segmentLength = axisSegment.norm() + val projectedVector = Vector( + x = (axisSegment.x / segmentLength) * 0.05F, + y = (axisSegment.y / segmentLength) * 0.05F, + ) + + referentPos + projectedVector + } + } + + +} + +fun computeComponentPosition(component: StepComponent, content: StepContent): Vector = + when (component) { + is PhantomComponent -> computePhantomPosition(component, content) + is PlayerComponent -> component.pos.toPos() + is BallComponent -> component.pos.toPos() + } + + +fun getPlayerBefore(phantom: PhantomComponent, content: StepContent): PlayerLike? { + val origin = content.findComponent(phantom.originPlayerId)!! + val items = origin.path!!.items + val phantomIdx = items.indexOf(phantom.id) + if (phantomIdx == -1) + throw MalformedStepContentException("phantom player is not registered it its origin's path") + if (phantomIdx == 0) + return origin + return content.findComponent(items[phantomIdx - 1]) +} + +fun getPlayerInfo(player: PlayerLike, content: StepContent): PlayerInfo { + + return when (player) { + is PlayerComponent -> PlayerInfo( + player.team, + player.role, + false, + player.pos.toPos(), + player.id, + player.actions, + player.ballState + ) + + is PhantomComponent -> { + val origin = content.findComponent(player.originPlayerId)!! + val pos = computePhantomPosition(player, content) + + PlayerInfo( + origin.team, + origin.role, + true, + pos, + player.id, + player.actions, + player.ballState + ) + } + } + + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/domains/StepsTreeDomains.kt b/app/src/main/java/com/iqball/app/domains/StepsTreeDomains.kt new file mode 100644 index 0000000..697df9e --- /dev/null +++ b/app/src/main/java/com/iqball/app/domains/StepsTreeDomains.kt @@ -0,0 +1,19 @@ +package com.iqball.app.domains + +import com.iqball.app.model.tactic.StepNodeInfo + + +fun getStepName(root: StepNodeInfo, step: Int): String { + var ord = 1 + val nodes = mutableListOf(root) + while (nodes.isNotEmpty()) { + val node = nodes.removeFirst() + + if (node.id == step) break + + ord += 1 + nodes.addAll(node.children.reversed()) + } + + return ord.toString() +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/geo/Vector.kt b/app/src/main/java/com/iqball/app/geo/Vector.kt new file mode 100644 index 0000000..9140f54 --- /dev/null +++ b/app/src/main/java/com/iqball/app/geo/Vector.kt @@ -0,0 +1,45 @@ +package com.iqball.app.geo + +import androidx.compose.ui.BiasAlignment +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import kotlin.math.atan2 +import kotlin.math.sqrt + +typealias Pos = Vector + +data class Vector(val x: Float, val y: Float) { + fun toBiasAlignment(): BiasAlignment = + BiasAlignment((x * 2 - 1), (y * 2 - 1)) + + infix operator fun minus(other: Vector) = Vector(x - other.x, y - other.y) + infix operator fun plus(other: Vector) = Vector(x + other.x, y + other.y) + infix operator fun div(other: Vector) = Vector(x / other.x, y / other.y) + infix operator fun div(n: Float) = Vector(x / n, y / n) + + infix operator fun times(other: Vector) = Vector(x * other.x, y * other.y) + infix operator fun times(n: Float) = Vector(x * n, y * n) + infix operator fun times(n: Int) = Vector(x * n, y * n) + + + fun angleRadWith(other: Vector): Float { + val (x, y) = this - other + return atan2(x, y) + } + + fun angleDegWith(other: Vector): Float = (angleRadWith(other) * (180 / Math.PI)).toFloat() + + + fun distanceFrom(other: Vector) = + sqrt(((x - other.x) * (x - other.x) + (y - other.y) * (y - other.y))) + + fun norm() = NullVector.distanceFrom(this) + + fun posWithinArea(area: Rect) = Vector(x * area.width, y * area.height) + + fun toOffset() = Offset(x, y) +} + +val NullVector = Vector(0F, 0F) + +fun Offset.toVector() = Vector(x, y) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/Tactic.kt b/app/src/main/java/com/iqball/app/model/Tactic.kt new file mode 100644 index 0000000..1cf5067 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/Tactic.kt @@ -0,0 +1,9 @@ +package com.iqball.app.model + +data class Tactic ( + val id: Int, + val name: String, + val ownerId: Int, + val courtType: String, + val creationDate: Long +) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/TacticInfo.kt b/app/src/main/java/com/iqball/app/model/TacticInfo.kt new file mode 100644 index 0000000..495a648 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/TacticInfo.kt @@ -0,0 +1,11 @@ +package com.iqball.app.model + +import com.iqball.app.model.tactic.CourtType +import java.time.LocalDateTime + +data class TacticInfo( + val id: Int, + val name: String, + val type: CourtType, + val creationDate: LocalDateTime +) diff --git a/app/src/main/java/com/iqball/app/model/Team.kt b/app/src/main/java/com/iqball/app/model/Team.kt new file mode 100644 index 0000000..8a91a8e --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/Team.kt @@ -0,0 +1,9 @@ +package com.iqball.app.model; + +data class Team ( + val id: Int, + val name: String, + val picture: String, + val mainColor: String, + val secondColor: String +) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/Action.kt b/app/src/main/java/com/iqball/app/model/tactic/Action.kt new file mode 100644 index 0000000..9a68d9e --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/Action.kt @@ -0,0 +1,24 @@ +package com.iqball.app.model.tactic + +import arrow.core.Either +import arrow.core.NonEmptyList +import com.iqball.app.geo.Vector + + +enum class ActionType { + Screen, + Dribble, + Move, + Shoot +} + +data class Segment( + val next: Either, + val controlPoint: Vector? +) + +data class Action( + val type: ActionType, + val target: Either, + val segments: List +) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/BallState.kt b/app/src/main/java/com/iqball/app/model/tactic/BallState.kt new file mode 100644 index 0000000..572c760 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/BallState.kt @@ -0,0 +1,13 @@ +package com.iqball.app.model.tactic + +enum class BallState { + None, + HoldsOrigin, + HoldsByPass, + Passed, + PassedOrigin; + + + fun hasBall() = this != None + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/CourtType.kt b/app/src/main/java/com/iqball/app/model/tactic/CourtType.kt new file mode 100644 index 0000000..c74f09f --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/CourtType.kt @@ -0,0 +1,6 @@ +package com.iqball.app.model.tactic + +enum class CourtType { + Plain, + Half +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/MovementPath.kt b/app/src/main/java/com/iqball/app/model/tactic/MovementPath.kt new file mode 100644 index 0000000..3d80488 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/MovementPath.kt @@ -0,0 +1,3 @@ +package com.iqball.app.model.tactic + +data class MovementPath(val items: List) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/PlayerInfo.kt b/app/src/main/java/com/iqball/app/model/tactic/PlayerInfo.kt new file mode 100644 index 0000000..d717924 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/PlayerInfo.kt @@ -0,0 +1,13 @@ +package com.iqball.app.model.tactic + +import com.iqball.app.geo.Vector + +data class PlayerInfo( + val team: PlayerTeam, + val role: String, + val isPhantom: Boolean, + val pos: Vector, + val id: ComponentId, + val actions: List, + val ballState: BallState +) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/PlayerTeam.kt b/app/src/main/java/com/iqball/app/model/tactic/PlayerTeam.kt new file mode 100644 index 0000000..eccb603 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/PlayerTeam.kt @@ -0,0 +1,6 @@ +package com.iqball.app.model.tactic + +enum class PlayerTeam { + Allies, + Opponents +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/Positioning.kt b/app/src/main/java/com/iqball/app/model/tactic/Positioning.kt new file mode 100644 index 0000000..ed02c62 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/Positioning.kt @@ -0,0 +1,9 @@ +package com.iqball.app.model.tactic + +import com.iqball.app.geo.Pos + +sealed interface Positioning +data class RelativePositioning(val attach: ComponentId) : Positioning +data class FixedPosition(val x: Float, val y: Float) : Positioning { + fun toPos() = Pos(x, y) +} diff --git a/app/src/main/java/com/iqball/app/model/tactic/StepComponent.kt b/app/src/main/java/com/iqball/app/model/tactic/StepComponent.kt new file mode 100644 index 0000000..7dac6be --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/StepComponent.kt @@ -0,0 +1,42 @@ +package com.iqball.app.model.tactic + +typealias ComponentId = String + + +sealed interface StepComponent { + val id: ComponentId + val actions: List +} + +sealed interface PositionableComponent

{ + val pos: P +} + +sealed interface PlayerLike : PositionableComponent, StepComponent { + val ballState: BallState +} + +data class PlayerComponent( + val path: MovementPath?, + val team: PlayerTeam, + val role: String, + override val ballState: BallState, + override val pos: FixedPosition, + override val id: ComponentId, + override val actions: List, +) : PlayerLike, StepComponent + +data class PhantomComponent( + val attachedTo: ComponentId?, + val originPlayerId: ComponentId, + override val ballState: BallState, + override val pos: Positioning, + override val id: ComponentId, + override val actions: List +) : PlayerLike, StepComponent + +data class BallComponent( + override val id: ComponentId, + override val actions: List, + override val pos: FixedPosition +) : StepComponent, PositionableComponent diff --git a/app/src/main/java/com/iqball/app/model/tactic/StepContent.kt b/app/src/main/java/com/iqball/app/model/tactic/StepContent.kt new file mode 100644 index 0000000..968d251 --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/StepContent.kt @@ -0,0 +1,15 @@ +package com.iqball.app.model.tactic + +import java.lang.RuntimeException + +data class StepContent(val components: List) { + inline fun findComponent(id: String): C? { + val value = components.find { it.id == id } ?: return null + if (!C::class.java.isAssignableFrom(value.javaClass)) + return null + return value as C + } +} + + +class MalformedStepContentException(msg: String, cause: Throwable? = null): RuntimeException(msg, cause) \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/model/tactic/StepNodeInfo.kt b/app/src/main/java/com/iqball/app/model/tactic/StepNodeInfo.kt new file mode 100644 index 0000000..f91931d --- /dev/null +++ b/app/src/main/java/com/iqball/app/model/tactic/StepNodeInfo.kt @@ -0,0 +1,17 @@ +package com.iqball.app.model.tactic + +data class StepNodeInfo(val id: Int, val children: List) + + +fun getParent(root: StepNodeInfo, child: Int): StepNodeInfo? { + for (children in root.children) { + if (children.id == child) { + return root + } + val result = getParent(children, child) + if (result != null) + return result + } + + return null +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/EitherBodyConverter.kt b/app/src/main/java/com/iqball/app/net/EitherBodyConverter.kt new file mode 100644 index 0000000..8739a96 --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/EitherBodyConverter.kt @@ -0,0 +1,37 @@ +package com.iqball.app.net + +import arrow.core.Either +import okhttp3.ResponseBody +import retrofit2.Call +import retrofit2.Converter +import retrofit2.Retrofit +import java.lang.reflect.ParameterizedType +import java.lang.reflect.Type + +class EitherBodyConverter : Converter.Factory() { + override fun responseBodyConverter( + type: Type, + annotations: Array, + retrofit: Retrofit + ): Converter? { + + if (type !is ParameterizedType) { + return null + } + if (type.rawType != Call::class.java) { + return null + } + val eitherType = type.actualTypeArguments.first() + if (eitherType !is ParameterizedType || eitherType.rawType != Either::class.java) { + return null + } + + val eitherRightType = eitherType.actualTypeArguments[1] + return retrofit.nextResponseBodyConverter(this, eitherRightType, annotations) + } + + companion object { + fun create() = EitherBodyConverter() + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/EitherCall.kt b/app/src/main/java/com/iqball/app/net/EitherCall.kt new file mode 100644 index 0000000..eb0ce7a --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/EitherCall.kt @@ -0,0 +1,54 @@ +package com.iqball.app.net + +import arrow.core.Either +import okhttp3.Request +import okio.Timeout +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import retrofit2.Retrofit +import java.lang.reflect.ParameterizedType + +class EitherCall( + private val retrofit: Retrofit, + private val eitherType: ParameterizedType, + private val delegate: Call +) : Call> { + override fun enqueue(callback: Callback>) { + delegate.enqueue(object : Callback { + override fun onResponse(call: Call, response: Response) { + val result: Either = if (response.isSuccessful) { + Either.Right(response.body()!! as R) + } else { + val leftType = eitherType.actualTypeArguments[0] + val converter = retrofit.nextResponseBodyConverter(null, leftType, arrayOf()) + val result = converter.convert(response.errorBody()!!)!! + Either.Left(result) + } + callback.onResponse(this@EitherCall, Response.success(result)) + } + + override fun onFailure(call: Call, t: Throwable) { + callback.onFailure(this@EitherCall, t) + } + + }) + } + + override fun clone(): Call> = EitherCall(retrofit, eitherType, delegate.clone()) + + override fun execute(): Response> { + throw UnsupportedOperationException() + } + + override fun isExecuted(): Boolean = delegate.isExecuted + + override fun cancel() = delegate.cancel() + + override fun isCanceled(): Boolean = delegate.isCanceled + + override fun request(): Request = delegate.request() + + override fun timeout(): Timeout = delegate.timeout() + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/EitherCallAdapterFactory.kt b/app/src/main/java/com/iqball/app/net/EitherCallAdapterFactory.kt new file mode 100644 index 0000000..251f2ac --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/EitherCallAdapterFactory.kt @@ -0,0 +1,38 @@ +package com.iqball.app.net + +import arrow.core.Either +import retrofit2.Call +import retrofit2.CallAdapter +import retrofit2.Retrofit +import java.lang.reflect.ParameterizedType +import java.lang.reflect.Type + +class EitherCallAdapterFactory : CallAdapter.Factory() { + override fun get( + returnType: Type, + annotations: Array, + retrofit: Retrofit + ): CallAdapter<*, *>? { + if (returnType !is ParameterizedType) { + return null + } + if (returnType.rawType != Call::class.java) { + return null + } + val eitherType = returnType.actualTypeArguments.first() + if (eitherType !is ParameterizedType || eitherType.rawType != Either::class.java) { + return null + } + return object : CallAdapter { + override fun responseType(): Type = returnType + + override fun adapt(call: Call): EitherCall { + return EitherCall(retrofit, eitherType, call) + } + } + } + + companion object { + fun create() = EitherCallAdapterFactory() + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/service/AuthService.kt b/app/src/main/java/com/iqball/app/net/service/AuthService.kt new file mode 100644 index 0000000..064c8b1 --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/service/AuthService.kt @@ -0,0 +1,24 @@ +package com.iqball.app.net.service + +import kotlinx.serialization.Serializable +import retrofit2.http.Body +import retrofit2.http.POST + +interface AuthService { + + @Serializable + data class AuthResponse(val token: String, val expirationDate: Long) + + @Serializable + data class RegisterRequest(val username: String, val email: String, val password: String) + + @POST("auth/register") + suspend fun register(@Body req: RegisterRequest): APIResult + + data class LoginRequest(val email: String, val password: String) + + @POST("auth/token") + suspend fun login(@Body req: LoginRequest): APIResult + + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/service/IQBallService.kt b/app/src/main/java/com/iqball/app/net/service/IQBallService.kt new file mode 100644 index 0000000..a80a363 --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/service/IQBallService.kt @@ -0,0 +1,8 @@ +package com.iqball.app.net.service + +import arrow.core.Either + +typealias ErrorResponseResult = Map> +typealias APIResult = Either + +interface IQBallService : AuthService, UserService, TacticService \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/service/TacticService.kt b/app/src/main/java/com/iqball/app/net/service/TacticService.kt new file mode 100644 index 0000000..b6af5df --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/service/TacticService.kt @@ -0,0 +1,44 @@ +package com.iqball.app.net.service + +import com.iqball.app.model.tactic.StepContent +import com.iqball.app.model.tactic.StepNodeInfo +import com.iqball.app.session.Token +import retrofit2.http.GET +import retrofit2.http.Header +import retrofit2.http.Path + +interface TacticService { + + data class GetTacticInfoResponse( + val id: Int, + val name: String, + val courtType: String, + val creationDate: Long + ) + + @GET("tactics/{tacticId}") + suspend fun getTacticInfo( + @Header("Authorization") auth: Token, + @Path("tacticId") tacticId: Int + ): APIResult + + data class GetTacticStepsTreeResponse( + val root: StepNodeInfo + ) + + @GET("tactics/{tacticId}/tree") + suspend fun getTacticStepsTree( + @Header("Authorization") auth: Token, + @Path("tacticId") tacticId: Int + ): APIResult + + + + @GET("tactics/{tacticId}/steps/{stepId}") + suspend fun getTacticStepContent( + @Header("Authorization") auth: Token, + @Path("tacticId") tacticId: Int, + @Path("stepId") stepId: Int + ): APIResult + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/net/service/UserService.kt b/app/src/main/java/com/iqball/app/net/service/UserService.kt new file mode 100644 index 0000000..dc475ca --- /dev/null +++ b/app/src/main/java/com/iqball/app/net/service/UserService.kt @@ -0,0 +1,13 @@ +package com.iqball.app.net.service + +import com.iqball.app.model.Tactic +import com.iqball.app.model.Team +import retrofit2.http.GET +import retrofit2.http.Header + +interface UserService { + data class UserDataResponse(val teams: List, val tactics: List) + + @GET("user-data") + suspend fun getUserData(@Header("Authorization") auth: String): APIResult +} \ 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..b440db5 --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/HomePage.kt @@ -0,0 +1,407 @@ +package com.iqball.app.page + +import com.iqball.app.model.Tactic +import com.iqball.app.model.Team +import androidx.compose.foundation.BorderStroke +import androidx.compose.foundation.Canvas +import androidx.compose.foundation.background +import androidx.compose.foundation.border +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Box +import androidx.compose.runtime.Composable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid +import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells +import androidx.compose.foundation.lazy.staggeredgrid.items +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.Button +import androidx.compose.material3.ButtonDefaults +import androidx.core.graphics.toColorInt +import androidx.compose.material3.CenterAlignedTopAppBar +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.material3.TopAppBarDefaults.pinnedScrollBehavior +import androidx.compose.material3.rememberTopAppBarState +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.style.TextOverflow +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.draw.shadow +import androidx.compose.ui.graphics.RectangleShape +import androidx.compose.ui.input.nestedscroll.nestedScroll +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.unit.TextUnit +import arrow.core.Either +import coil.compose.AsyncImage +import com.iqball.app.net.service.AuthService +import com.iqball.app.net.service.IQBallService +import com.iqball.app.net.service.UserService +import com.iqball.app.session.Authentication +import kotlinx.coroutines.runBlocking +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId +import java.time.format.DateTimeFormatter + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomePage(service: IQBallService, auth: Authentication) { + val tactics: List + val teams: List + var invalid = false + + val data = getDataFromApi(service, auth) + if (data == null) { + tactics = listOf() + teams = listOf() + invalid = true + + } else { + tactics = data.tactics + teams = data.teams + } + val scrollBehavior = pinnedScrollBehavior(rememberTopAppBarState()) + Scaffold( + modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), + topBar = { + CenterAlignedTopAppBar( + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primary, + titleContentColor = MaterialTheme.colorScheme.secondary, + ), + title = { + Text( + "IQBall", + fontSize = 40.sp, + maxLines = 1, + overflow = TextOverflow.Ellipsis + ) + }, + scrollBehavior = scrollBehavior + ) + }, + ) { innerPadding -> + Body(innerPadding, tactics, teams, invalid) + } +} + +@Composable +private fun Body( + padding: PaddingValues, + tactics: List, + teams: List, + invalid: Boolean +) { + Column( + modifier = Modifier + .padding(padding) + ) { + val selectedTab = remember { mutableIntStateOf(0) } + val tabs = listOf Unit>>( + Pair("Espace personnel") { + ListComponentCard(tactics) { tactic -> + TacticCard(tactic = tactic) + } + }, + Pair("Mes équipes") { + ListComponentCard(teams) { team -> + TeamCard(team = team) + } + } + ) + TabsSelector(tabsTitles = tabs.map { it.first }, selectedIndex = selectedTab) + if (!invalid) { + tabs[selectedTab.intValue].second() + return + } + + + TextCentered( + text = "Erreur : Aucune connexion internet. Veillez activer votre connexion internet puis relancer l'application", + fontSize = 20.sp + ) + } +} + +@Composable +private fun TabsSelector(tabsTitles: List, selectedIndex: MutableState) { + Row( + horizontalArrangement = Arrangement.Center, + modifier = Modifier + .padding(top = 20.dp, start = 2.dp, end = 2.dp, bottom = 10.dp) + .fillMaxWidth() + ) { + + for ((idx, tab) in tabsTitles.withIndex()) { + TabButton( + tab, + fill = idx == selectedIndex.value, + onClick = { selectedIndex.value = idx } + ) + if (idx != tabsTitles.size - 1) { + Spacer( + modifier = Modifier + .padding(5.dp) + ) + } + } + + } +} + +@Composable +private fun TabButton(title: String, fill: Boolean, onClick: () -> Unit) { + val scheme = MaterialTheme.colorScheme + Button( + border = BorderStroke( + 1.dp, + color = scheme.tertiary + ), + colors = ButtonDefaults.buttonColors( + containerColor = if (fill) scheme.tertiary else scheme.background, + contentColor = if (fill) scheme.background else scheme.tertiary, + ), + onClick = onClick + ) { + Text(title) + } +} + +@Composable +private fun ListComponentCard(items: List, componentCard: @Composable (C) -> Unit) { + LazyVerticalStaggeredGrid( + columns = StaggeredGridCells.Fixed(2), + modifier = Modifier + .padding(5.dp), + content = { + items(items) { tactic -> + componentCard(tactic) + } + } + ) +} + +@Composable +private fun TacticCard(tactic: Tactic) { + Column( + modifier = Modifier + .padding(5.dp) + .border( + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), + shape = RoundedCornerShape(8.dp) + ) + .shadow(1.dp, shape = RoundedCornerShape(8.dp)) + .background( + color = Color.White + ) + .padding(15.dp) + ) { + Row { + TextCentered(text = tactic.name, fontSize = 16.sp) + } + Row { + val date = LocalDateTime.ofInstant( + Instant.ofEpochMilli(tactic.creationDate), + ZoneId.systemDefault() + ) + val dateFormatted = date.format(DateTimeFormatter.ofPattern("dd/MM/yyyy kk:mm")) + TextCentered( + text = dateFormatted, + fontSize = 10.sp, + fontWeight = FontWeight.Bold, + modifier = Modifier.padding(2.dp) + ) + } + } +} + +@Composable +private fun TeamCard(team: Team) { + var mainColor = Color.White + var secondColor = Color.White + var validMain = true + var validSecond = true + try { + mainColor = Color(team.mainColor.toColorInt()) + } catch (e: Exception) { + validMain = false + } + try { + secondColor = Color(team.secondColor.toColorInt()) + } catch (e: Exception) { + validSecond = false + } + + Column( + modifier = Modifier + .padding(5.dp) + .border( + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), + shape = RoundedCornerShape(8.dp) + ) + .shadow(1.dp, shape = RoundedCornerShape(8.dp)) + .background( + color = Color.White + ) + .padding(15.dp) + + ) { + AsyncImage( + model = team.picture, + contentDescription = null, + modifier = Modifier + .fillMaxWidth() + .border( + border = BorderStroke(1.dp, MaterialTheme.colorScheme.outline), + shape = RectangleShape + ) + ) + TextCentered(text = team.name) + Row { + TeamColorCard("Couleur principale", mainColor, 0.5f) + TeamColorCard("Couleur secondaire", secondColor) + } + if (!validMain || !validSecond) { + TextCentered(text = "Erreur : Format des couleurs invalides", fontSize = 16.sp) + } + } +} + +@Composable +private fun TeamColorCard(text: String, color: Color, fraction: Float = 1f) { + Column( + modifier = Modifier + .fillMaxWidth(fraction) + ) { + Box( + contentAlignment = Alignment.Center, + modifier = Modifier + .fillMaxWidth() + .padding(2.dp) + + ) { + Canvas( + modifier = Modifier.size(30.dp), + onDraw = { + drawCircle(color = color) + } + ) + } + TextCentered(text = text, fontSize = 6.sp) + } +} + +@Composable +private fun TextCentered( + modifier: Modifier = Modifier, + text: String, + fontSize: TextUnit = 18.sp, + fontWeight: FontWeight? = null +) { + Text( + text = text, + modifier = modifier + .fillMaxWidth(), + textAlign = TextAlign.Center, + fontSize = fontSize, + fontWeight = fontWeight + ) +} + +private fun getDataFromApi( + service: IQBallService, + auth: Authentication +): UserService.UserDataResponse? { + var res: UserService.UserDataResponse? = null + try { + runBlocking { + val data = service.getUserData(auth.token) + when (data) { + is Either.Left -> null + is Either.Right -> { + res = data.value + } + } + } + return res + } catch (error: Exception) { + return res + } +} + +/* +======================================================= + Comment +======================================================= + +Managing lists to display with pairs might not be the best thing to do in the context of composable. +We chose to stick with this model due to a lack of time. + +We could have also done something like this: + +@Composable +fun Body(padding: PaddingValues, tactics: List, teams: List, invalid: Boolean) { + Column(...) { + val selectedTab by remember { mutableIntStateOf(0) } + val tabs = remember(selectedTab) { + mutableStateOf(TabsGroup.entries.getOrNull(selectedTab)) + } + TabsSelector(tabsTitles = TabsGroup.entries.map { it.title }, selectedIndex = selectedTab, ) + if (!invalid) { + ListComponentCard { + when(selectedTab) { + TabsGroup.TEAM -> { + items(tactics) { + TacticCard(tactic = it) + } + } + TabsGroup.TACTIC -> ... + } + } + tabs[selectedTab.intValue].second() + return + } + + TextCentered(...) + } +} + +enum class TabsGroup { + TEAM, + TACTIC +} + +val TabsGroup.title: String + @Composable + get() = when(this) { + TabsGroup.TACTIC -> "Espace personnel" + TabsGroup.TEAM -> "Mes équipes" + } + +@Composable +fun ListComponentCard(componentCard: LazyStaggeredGridScope.() -> Unit) { + LazyVerticalStaggeredGrid( + columns = StaggeredGridCells.Fixed(2), + modifier = ..., + content = { + componentCard() + } + ) +} + + */ \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/page/LoginPage.kt b/app/src/main/java/com/iqball/app/page/LoginPage.kt new file mode 100644 index 0000000..90a286e --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/LoginPage.kt @@ -0,0 +1,109 @@ +package com.iqball.app.page + +import android.util.Log +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.foundation.layout.* +import androidx.compose.material3.Button +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Surface +import androidx.compose.runtime.* +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import arrow.core.Either +import com.iqball.app.net.service.AuthService +import com.iqball.app.session.Authentication +import kotlinx.coroutines.runBlocking + +@Composable +fun LoginPage( + service: AuthService, + onLoginSuccess: (Authentication) -> Unit, + onNavigateToRegister: () -> Unit +) { + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var errors by remember { mutableStateOf("") } + + Surface( + color = Color.White, + modifier = Modifier.fillMaxSize() + ) { + Column( + modifier = Modifier + .padding(16.dp) + .fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "S'identifier", + fontSize = 28.sp, + color = Color.Black + ) + + Text( + text = errors, + color = Color.Red, + fontSize = 14.sp, + modifier = Modifier.padding(vertical = 8.dp) + ) + + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + modifier = Modifier.fillMaxWidth(), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.Black, + unfocusedTextColor = Color.Black + ) + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Password") }, + visualTransformation = PasswordVisualTransformation(), + modifier = Modifier.fillMaxWidth(), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.Black, + unfocusedTextColor = Color.Black + ) + ) + Spacer(modifier = Modifier.height(16.dp)) + + Button(onClick = { + runBlocking { + Log.i("ZIZI", "On click wesh") + when (val response = service.login(AuthService.LoginRequest(email, password))) { + is Either.Left -> { + errors = response.value.toList() + .flatMap { entry -> entry.second.map { "${entry.first} : ${it}" } } + .joinToString("\n") + } + + is Either.Right -> onLoginSuccess( + Authentication( + response.value.token, + response.value.expirationDate.toLong() + ) + ) + } + } + }) { + Text(text = "Se connecter") + } + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { onNavigateToRegister() }) { + Text(text = "Vous n'avez pas de compte ?") + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/page/RegisterPage.kt b/app/src/main/java/com/iqball/app/page/RegisterPage.kt new file mode 100644 index 0000000..4ee3f98 --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/RegisterPage.kt @@ -0,0 +1,130 @@ +package com.iqball.app.page + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.height +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.text.input.PasswordVisualTransformation +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import arrow.core.Either +import com.iqball.app.net.service.AuthService +import com.iqball.app.session.Authentication +import kotlinx.coroutines.runBlocking + +@Composable +fun RegisterPage( + service: AuthService, + onRegisterSuccess: (Authentication) -> Unit, + onNavigateToLogin: () -> Unit +) { + var username by remember { mutableStateOf("") } + var email by remember { mutableStateOf("") } + var password by remember { mutableStateOf("") } + var errors by remember { mutableStateOf("") } + + Surface( + color = Color.White, + modifier = Modifier.fillMaxSize() + + ) { + Column( + modifier = Modifier + .padding(16.dp) + .fillMaxSize(), + verticalArrangement = Arrangement.Center, + horizontalAlignment = Alignment.CenterHorizontally + ) { + Text( + text = "S'enregistrer", + fontSize = 28.sp, + color = Color.Black + ) + Spacer(modifier = Modifier.height(16.dp)) + Text( + text = errors, + color = Color.Red, + fontSize = 14.sp, + modifier = Modifier.padding(vertical = 8.dp) + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = username, + onValueChange = { username = it }, + label = { Text("Nom d'utilisateur") }, + modifier = Modifier.fillMaxWidth(), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.Black, + unfocusedTextColor = Color.Black + ) + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = password, + onValueChange = { password = it }, + label = { Text("Mot de passe") }, + modifier = Modifier.fillMaxWidth(), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.Black, + unfocusedTextColor = Color.Black + ), + visualTransformation = PasswordVisualTransformation() + ) + Spacer(modifier = Modifier.height(16.dp)) + OutlinedTextField( + value = email, + onValueChange = { email = it }, + label = { Text("Email") }, + modifier = Modifier.fillMaxWidth(), + colors = OutlinedTextFieldDefaults.colors( + focusedTextColor = Color.Black, + unfocusedTextColor = Color.Black + ) + ) + Button(onClick = { + runBlocking { + when (val response = + service.register(AuthService.RegisterRequest(username, email, password))) { + is Either.Left -> { + errors = response.value.toList() + .flatMap { entry -> entry.second.map { "${entry.first} : ${it}" } } + .joinToString("\n") + } + + is Either.Right -> { + onRegisterSuccess( + Authentication( + response.value.token, + response.value.expirationDate + ) + ) + } + } + } + }) { + Text(text = "Créer votre compte") + } + Spacer(modifier = Modifier.height(16.dp)) + Button(onClick = { onNavigateToLogin() }) { + Text(text = "Vous avez déjà un compte ?") + } + } + } +} + diff --git a/app/src/main/java/com/iqball/app/page/VisualizerPage.kt b/app/src/main/java/com/iqball/app/page/VisualizerPage.kt new file mode 100644 index 0000000..f85787a --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/VisualizerPage.kt @@ -0,0 +1,213 @@ +package com.iqball.app.page + +import android.content.res.Configuration +import android.util.Log +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.IntrinsicSize +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.width +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableIntStateOf +import androidx.compose.runtime.mutableStateMapOf +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.saveable.rememberSaveable +import androidx.compose.runtime.setValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.geometry.Offset +import androidx.compose.ui.geometry.Rect +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalConfiguration +import androidx.compose.ui.res.painterResource +import androidx.compose.ui.zIndex +import arrow.core.Either +import com.iqball.app.R +import com.iqball.app.component.BasketCourt +import com.iqball.app.component.BasketCourtStates +import com.iqball.app.component.StepsTree +import com.iqball.app.model.TacticInfo +import com.iqball.app.model.tactic.ComponentId +import com.iqball.app.model.tactic.CourtType +import com.iqball.app.model.tactic.StepContent +import com.iqball.app.model.tactic.StepNodeInfo +import com.iqball.app.model.tactic.getParent +import com.iqball.app.net.service.TacticService +import com.iqball.app.session.Token +import kotlinx.coroutines.runBlocking +import net.engawapg.lib.zoomable.ZoomState +import net.engawapg.lib.zoomable.rememberZoomState +import java.time.Instant +import java.time.LocalDateTime +import java.time.ZoneId + +private data class VisualizerInitialData( + val info: TacticInfo, + val rootStep: StepNodeInfo, +) + +@Composable +fun VisualizerPage( + service: TacticService, + auth: Token, + tacticId: Int, +) { + val dataEither = remember { initializeVisualizer(service, auth, tacticId) } + val showTree = remember { mutableStateOf(true) } + + val (info, stepsTree) = when (dataEither) { + // On error return a text to print it to the user + is Either.Left -> return Text(text = dataEither.value) + is Either.Right -> dataEither.value + } + + fun getStepContent(step: Int): StepContent = runBlocking { + val result = service.getTacticStepContent(auth, tacticId, step).onLeft { + Log.e( + "received error response from server when retrieving step content: {}", + it.toString() + ) + } + when (result) { + is Either.Left -> throw Error("Unexpected error") + is Either.Right -> result.value + } + } + + + val screenOrientation = LocalConfiguration.current.orientation + var selectedStepId by rememberSaveable { mutableIntStateOf(stepsTree.id) } + val (content, parentContent) = remember(selectedStepId) { + val parentId = getParent(stepsTree, selectedStepId)?.id + Pair( + getStepContent(selectedStepId), + parentId?.let { getStepContent(it) } + ) + } + + + Column { + VisualizerHeader(title = info.name, showTree) + when (screenOrientation) { + Configuration.ORIENTATION_PORTRAIT -> StepsTree(root = stepsTree, + selectedNodeId = selectedStepId, + onNodeSelected = { selectedStepId = it.id }) + + Configuration.ORIENTATION_LANDSCAPE -> { + val courtArea = remember { mutableStateOf(Rect.Zero) } + val stepOffsets = + remember(selectedStepId) { mutableStateMapOf() } + val parentOffsets = + remember(selectedStepId) { mutableStateMapOf() } + + val courtModifier = + if (showTree.value) Modifier.width(IntrinsicSize.Min) else Modifier.fillMaxWidth() + + + val courtZoomState = remember { ZoomState() } + + Row(modifier = Modifier.background(Color.LightGray)) { + BasketCourt( + content = content, + parentContent, + type = info.type, + modifier = courtModifier, + state = BasketCourtStates( + stepOffsets, + parentOffsets, + courtArea, + courtZoomState + ) + ) + if (showTree.value) { + StepsTree( + root = stepsTree, + selectedNodeId = selectedStepId, + onNodeSelected = { selectedStepId = it.id } + ) + } + } + } + + else -> throw Exception("Could not determine device's orientation.") + } + } + +} + +@Composable +private fun VisualizerHeader(title: String, showTree: MutableState) { + + + Row( + modifier = Modifier + .fillMaxWidth() + .zIndex(10000F) + .background(Color.White), + horizontalArrangement = Arrangement.SpaceBetween, + verticalAlignment = Alignment.CenterVertically + ) { + IconButton(onClick = { /*TODO*/ }) { + Icon( + imageVector = Icons.Filled.ArrowBack, + contentDescription = "Back", + tint = Color.Black + ) + } + + Text(text = title, color = Color.Black) + + IconButton(onClick = { showTree.value = !showTree.value }) { + Icon( + painter = painterResource(id = R.drawable.tree_icon), + contentDescription = "toggle show tree" + ) + } + } +} + +private fun initializeVisualizer( + service: TacticService, auth: Token, tacticId: Int +): Either { + val (tacticInfo, tacticTree) = runBlocking { + val tacticInfo = service.getTacticInfo(auth, tacticId).map { + TacticInfo( + id = it.id, name = it.name, type = CourtType.valueOf( + it.courtType.lowercase().replaceFirstChar(Char::uppercaseChar) + ), creationDate = LocalDateTime.ofInstant( + Instant.ofEpochMilli(it.creationDate), ZoneId.systemDefault() + ) + ) + }.onLeft { + Log.e( + "received error response from server when retrieving tacticInfo : {}", it.toString() + ) + } + + val tacticTree = service.getTacticStepsTree(auth, tacticId).map { it.root }.onLeft { + Log.e( + "received error response from server when retrieving tactic steps tree: {}", + it.toString() + ) + } + + Pair(tacticInfo.getOrNull(), tacticTree.getOrNull()) + } + + if (tacticInfo == null || tacticTree == null) { + return Either.Left("Unable to retrieve tactic information") + } + + + return Either.Right(VisualizerInitialData(tacticInfo, tacticTree)) +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/serialization/EitherTypeAdapter.kt b/app/src/main/java/com/iqball/app/serialization/EitherTypeAdapter.kt new file mode 100644 index 0000000..b09376a --- /dev/null +++ b/app/src/main/java/com/iqball/app/serialization/EitherTypeAdapter.kt @@ -0,0 +1,97 @@ +package com.iqball.app.serialization + +import arrow.core.Either +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.JsonDataException +import com.squareup.moshi.JsonReader +import com.squareup.moshi.JsonWriter +import com.squareup.moshi.Moshi +import com.squareup.moshi.rawType +import java.lang.reflect.ParameterizedType +import java.lang.reflect.Type + + +private class EitherTypeAdapter( + val leftType: Class<*>, + val rightType: Class<*>, + private val moshi: Moshi +) : JsonAdapter>() { + + private val leftJsonType = leftType.getJsonPrimitive() + private val rightJsonType = rightType.getJsonPrimitive() + + override fun fromJson(reader: JsonReader): Either<*, *>? { + + val valueJsonType = when (val token = reader.peek()) { + JsonReader.Token.BEGIN_ARRAY -> JsonPrimitiveType.Array + JsonReader.Token.BEGIN_OBJECT -> JsonPrimitiveType.Object + JsonReader.Token.STRING -> JsonPrimitiveType.String + JsonReader.Token.NUMBER -> JsonPrimitiveType.Number + JsonReader.Token.BOOLEAN -> JsonPrimitiveType.Boolean + JsonReader.Token.NULL -> { + reader.nextNull() + return null + } + else -> throw JsonDataException("unexpected token : $token") + } + + if (valueJsonType == leftJsonType) { + val value = moshi.adapter(leftType).fromJson(reader) + return Either.Left(value) + } + + if (valueJsonType == rightJsonType) { + val value = moshi.adapter(rightType).fromJson(reader) + return Either.Right(value) + } + throw ClassCastException("Cannot cast a json value of type " + valueJsonType + " as either " + leftType.name.lowercase() + " or " + rightType.name.lowercase()) + } + + + override fun toJson(writer: JsonWriter, value: Either<*, *>?) { + when (value) { + is Either.Left -> writer.jsonValue(value.value) + is Either.Right -> writer.jsonValue(value.value) + null -> writer.nullValue() + } + } + + +} + +object EitherTypeAdapterFactory : JsonAdapter.Factory { + override fun create( + type: Type, + annotations: MutableSet, + moshi: Moshi + ): JsonAdapter<*>? { + if (type !is ParameterizedType) + return null + if (type.rawType != Either::class.java) + return null + val leftType = type.actualTypeArguments[0].rawType + val rightType = type.actualTypeArguments[1].rawType + if (leftType.getJsonPrimitive() == rightType.getJsonPrimitive()) { + throw UnsupportedOperationException("Cannot handle Either types with both sides being object, array, string or number. Provided type is : $type") + } + return EitherTypeAdapter(leftType, rightType, moshi) + } +} + +private enum class JsonPrimitiveType { + Array, + Object, + String, + Number, + Boolean +} + +private fun Class<*>.getJsonPrimitive(): JsonPrimitiveType { + if (isPrimitive) + return if (java.lang.Boolean.TYPE == this) JsonPrimitiveType.Boolean else JsonPrimitiveType.Number + if (isArray) + return JsonPrimitiveType.Array + if (this == String::class.java) + return JsonPrimitiveType.String + return JsonPrimitiveType.Object +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/serialization/EnumTypeAdapter.kt b/app/src/main/java/com/iqball/app/serialization/EnumTypeAdapter.kt new file mode 100644 index 0000000..01e76b8 --- /dev/null +++ b/app/src/main/java/com/iqball/app/serialization/EnumTypeAdapter.kt @@ -0,0 +1,81 @@ +package com.iqball.app.serialization + +import com.squareup.moshi.JsonAdapter +import com.squareup.moshi.JsonReader +import com.squareup.moshi.JsonWriter +import com.squareup.moshi.Moshi +import com.squareup.moshi.rawType +import java.lang.reflect.Type +import java.util.NoSuchElementException + +class EnumTypeAdapter>( + values: Map, + private val bindNames: Boolean, + private val ignoreCase: Boolean, + private val fallback: E?, + private val clazz: Class +) : JsonAdapter() { + + private val values = if (ignoreCase) values.mapKeys { it.key.lowercase() } else values + + override fun fromJson(reader: JsonReader): E { + val value = reader.nextString() + val key = if (ignoreCase) value.lowercase() else value + + var result = values[key] + if (result == null && bindNames) { + result = clazz.enumConstants?.find { it.name.lowercase() == key } + } + + return result + ?: fallback + ?: throw NoSuchElementException("No enum variant matched given values bindings, and no fallback was provided (value = $value, enum type = $clazz)") + } + + override fun toJson(writer: JsonWriter, value: E?) { + throw UnsupportedOperationException() + } + +} + +class EnumTypeAdapterFactory>( + private val values: Map, + private val bindNames: Boolean, + private val ignoreCase: Boolean, + private val fallback: E?, + private val clazz: Class +) : JsonAdapter.Factory { + override fun create( + type: Type, + annotations: MutableSet, + moshi: Moshi + ): JsonAdapter<*>? { + if (type.rawType != clazz) + return null + + return EnumTypeAdapter(values, bindNames, ignoreCase, fallback, clazz) + } + + + companion object { + + class Builder>(val values: MutableMap = HashMap()) { + infix fun String.means(e: E) { + values[this] = e + } + } + + inline fun > create( + ignoreCase: Boolean = false, + bindNames: Boolean = true, + fallback: E? = null, + build: Builder.() -> Unit = {} + ): EnumTypeAdapterFactory { + val builder = Builder() + build(builder) + return EnumTypeAdapterFactory(builder.values, bindNames, ignoreCase, fallback, E::class.java) + } + + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/session/Authentication.kt b/app/src/main/java/com/iqball/app/session/Authentication.kt new file mode 100644 index 0000000..ff2855f --- /dev/null +++ b/app/src/main/java/com/iqball/app/session/Authentication.kt @@ -0,0 +1,4 @@ +package com.iqball.app.session +typealias Token = String + +data class Authentication(val token: String, val expirationDate: Long) diff --git a/app/src/main/java/com/iqball/app/session/DataSession.kt b/app/src/main/java/com/iqball/app/session/DataSession.kt new file mode 100644 index 0000000..686adc1 --- /dev/null +++ b/app/src/main/java/com/iqball/app/session/DataSession.kt @@ -0,0 +1,3 @@ +package com.iqball.app.session + +data class DataSession(override val auth: Authentication? = null) : Session \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/session/Session.kt b/app/src/main/java/com/iqball/app/session/Session.kt new file mode 100644 index 0000000..e0c1975 --- /dev/null +++ b/app/src/main/java/com/iqball/app/session/Session.kt @@ -0,0 +1,5 @@ +package com.iqball.app.session + +interface Session { + val auth: Authentication? +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/stub/Stub.kt b/app/src/main/java/com/iqball/app/stub/Stub.kt new file mode 100644 index 0000000..ba1a885 --- /dev/null +++ b/app/src/main/java/com/iqball/app/stub/Stub.kt @@ -0,0 +1,72 @@ +package com.iqball.app.stub + +import com.iqball.app.model.Tactic +import com.iqball.app.model.Team + + +private fun getStubTeam(): ArrayList { + val teams = ArrayList() + teams.addAll( + listOf( + Team( + 1, + "equipe1", + "https://www.shutterstock.com/image-vector/batman-logo-icon-vector-template-600nw-1998917738.jpg", + "#4500FF", + "#456789" + ), + Team( + 2, + "equipe2", + "https://images-wixmp-ed30a86b8c4ca887773594c2.wixmp.com/f/2f899b52-daf8-4098-83fe-5c5e27b69915/d4s4nzj-5f915488-7462-4908-b3c5-1605b0e4dc32.jpg?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ1cm46YXBwOjdlMGQxODg5ODIyNjQzNzNhNWYwZDQxNWVhMGQyNmUwIiwiaXNzIjoidXJuOmFwcDo3ZTBkMTg4OTgyMjY0MzczYTVmMGQ0MTVlYTBkMjZlMCIsIm9iaiI6W1t7InBhdGgiOiJcL2ZcLzJmODk5YjUyLWRhZjgtNDA5OC04M2ZlLTVjNWUyN2I2OTkxNVwvZDRzNG56ai01ZjkxNTQ4OC03NDYyLTQ5MDgtYjNjNS0xNjA1YjBlNGRjMzIuanBnIn1dXSwiYXVkIjpbInVybjpzZXJ2aWNlOmZpbGUuZG93bmxvYWQiXX0.KqdQgobH9kzyMIeYIneNdyWgKTpGbztwSKqK5pO3YYs", + "121212", + "#564738" + ), + Team( + 3, + "equipe3", + "https://encrypted-tbn0.gstatic.com/images?q=tbn:ANd9GcQ1jiizrhhGsr48WrxxBbDpkFrRKeAYlGgcNQ&usqp=CAU", + "#987654", + "121212" + ), + Team( + 4, + "equipe4", + "https://www.shutterstock.com/image-vector/batman-logo-icon-vector-template-600nw-1998917738.jpg", + "121212", + "121212" + ) + ) + ) + return teams +} + +private fun getStubTactic(): ArrayList { + val tactics = ArrayList() + tactics.addAll( + listOf( + Tactic(1, "Test", 1, "testType", 1), + Tactic(2, "Test2", 1, "testType", 1), + Tactic(3, "Test3", 4, "test23Type", 1), + Tactic(3, "Test6", 4, "test23Type", 1), + Tactic(1, "Test", 1, "testType", 1), + Tactic(2, "Test2", 1, "testType", 1), + Tactic(3, "Test3", 4, "test23Type", 1), + Tactic(3, "Test6", 4, "test23Type", 1), + Tactic(1, "Test", 1, "testType", 1), + Tactic(2, "Test2", 1, "testType", 1), + Tactic(3, "Test3", 4, "test23Type", 1), + Tactic(3, "Test6", 4, "test23Type", 1), + Tactic(1, "Test", 1, "testType", 1), + Tactic(2, "Test2", 1, "testType", 1), + Tactic(3, "Test3", 4, "test23Type", 1), + Tactic(3, "Test6", 4, "test23Type", 1), + Tactic(1, "Test", 1, "testType", 1), + Tactic(2, "Test2", 1, "testType", 1), + Tactic(3, "Test3", 4, "test23Type", 1), + Tactic(3, "Test6", 4, "test23Type", 1) + ) + ) + + return tactics +} 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 new file mode 100644 index 0000000..ced48bb --- /dev/null +++ b/app/src/main/java/com/iqball/app/ui/theme/Color.kt @@ -0,0 +1,25 @@ +package com.iqball.app.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) + +val black = Color(0xFF191A21) +val orange = Color(0xFFFFA239) +val blue = Color(0xFF0D6EFD) +val grey = Color(0xFF282A36) +val back = Color(0xFFf8f8f8) +val borderCard = Color(0xFFDADCE0) + +val Allies = Color(0xFF64e4f5) +val Opponents = Color(0xFFf59264) +val BallColor = Color(0XFFc5520d) + +val StepNode = Color(0xFF2AC008) +val SelectedStepNode = Color(0xFF213519) diff --git a/app/src/main/java/com/iqball/app/ui/theme/Theme.kt b/app/src/main/java/com/iqball/app/ui/theme/Theme.kt new file mode 100644 index 0000000..ae5f228 --- /dev/null +++ b/app/src/main/java/com/iqball/app/ui/theme/Theme.kt @@ -0,0 +1,76 @@ +package com.iqball.app.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80, + primaryContainer = black +) + +private val LightColorScheme = lightColorScheme( + primary = black, + secondary = orange, + tertiary = blue, + primaryContainer = black, + surface = grey, + background = back, + outline = borderCard + + + /* Other default colors to override +background = Color(0xFFFFFBFE), +surface = Color(0xFFFFFBFE), +onPrimary = Color.White, +onSecondary = Color.White, +onTertiary = Color.White, +onBackground = Color(0xFF1C1B1F), +onSurface = Color(0xFF1C1B1F), +*/ +) + +@Composable +fun IQBallTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/ui/theme/Type.kt b/app/src/main/java/com/iqball/app/ui/theme/Type.kt new file mode 100644 index 0000000..bdfc815 --- /dev/null +++ b/app/src/main/java/com/iqball/app/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.iqball.app.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ball.xml b/app/src/main/res/drawable/ball.xml new file mode 100644 index 0000000..5b55cb0 --- /dev/null +++ b/app/src/main/res/drawable/ball.xml @@ -0,0 +1,38 @@ + + + + + + + + + + diff --git a/app/src/main/res/drawable/half_court.xml b/app/src/main/res/drawable/half_court.xml new file mode 100644 index 0000000..1f7e07f --- /dev/null +++ b/app/src/main/res/drawable/half_court.xml @@ -0,0 +1,171 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/plain_court.xml b/app/src/main/res/drawable/plain_court.xml new file mode 100644 index 0000000..8ae62a7 --- /dev/null +++ b/app/src/main/res/drawable/plain_court.xml @@ -0,0 +1,301 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/tree_icon.png b/app/src/main/res/drawable/tree_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..221099c2e922dda3fe22ea741ed546bce87cd4f6 GIT binary patch literal 5779 zcma)=i9b}||Hp|>$et}3YxZ5TM~Mj|BZjO)lkHP6mKjUgvJECg)?$)n2or-WV=FZF zUG{wnG1eGF_)VYhKk$1z&b{~Xc;9p1kM}v}eb4i}-tqUrMy!{vUZSC)VKp%}w4^?} z{$7k1srQezQ*w)L7$>3x;3oj9jzbic@3k%;>I0~hmCsMXy1 z)(rG8fYQ8x7zp+Q7o8oKotFkTu79j(dCk(U{QqnTW4m+dNgt50AS0Uw3#?qYDO3BT zSWEMWu3U4&NCfD-@%A}%tsos-fpk4}K~+wLIABxdpdXIthOr2_%?y~Q^u27o4?&Ac zW!18RV(pV6VO1k;Xoi#f(EDo_uP3lB>X%M%Er|%1y_B1~k5X~ja$LK`&A#QReShu5 z^@?hA#0iiXHO(jdZo;a;8!KFjB!U+5j{A3ZK;eW%k2}p~C=~;zk|5=i=TEWZ%``Bg z7?k_q&t6NId+{e&9}S?)TUMwGJP1c0ke;LuSUA2Kz4c+a^p@26GN|mwl`r(FD1V)~aXF7Gz$)|IFF^0zo`i^?@(P)9Va#H>YJ!-S1Jycs z$ebu%V;i3D+@%Z>uOS4!b^cd;^=}^%-}QvcCe8Xz>wH(crFbS@ZLmJ#9^^+eC_aDX z{4f1RY$2)9(`ZimowLAI{(I(IxTOwU4~3A`q!JSVt)`#Ml_f~zA5*t1j|D6 zgE(|x|0p4b)-uvt-q#Bi2i^d(x(MC8yL(o#!{#Z^1$2P8&(Nfnq_s?pq8j zE{e)KkZe?op3Ry>dQt^4VLim|Rq6h7tN|!Q7m8AWlw)C9_~UhR*MW2umn<>C`#153 zwL|LauK1%F{NWhs_AJp(8KJ&14yHBv_#73v0PABLV$@W8;WuaJopVUrZo|K==Yhvh z$7G^d3WB;6+uR>&#$hxw&!DBM=^Tznr6A$*eWg;>yoWPkCjLI(_hjeH{4sTw+Qyu^ zrYIG<16iRaFw2>P1~7A_8%;)%+JS5e?a~=DWxDL!N*X|h2<(X>k)o}_>cY36j4tRM zaT~>ZO*AP@SOnk8u={*B<&#|lPN~Ci7xf89$>*Xbii+-6tC*;76Xt5bYW<+#qu?Ay z3l;K&bR_gi9n!bt0j-huIe2#)ah*JomD7^3RVu`trG}CQwr#jI&JE=^xBSzH z={r`F{2pNc5j(?&Tll8sA596SU`9}t7xBoMwn>CtL+Dyn*uo^YTEf_#JuzyC$@DNb zJO61x?{Q62bBF!UDx~lbH&n;{^y(B$7Ks=O47{oDALdZ?+9zI;%%V7k+!(o$0e8-* z2{Um${GKiZU9*wZHSj0tZ24~^!t*OzeSmvAI4pzzY?)!WU?XLFCos2?@p zoW-Jr%Z}TB-J+WKemB393*PhOF)9h&eiS$EwswH+KNb|5)h;h`b;KWY2Za#j}vjT zUt+$a22%jswrv|6fn!8Csj-zRqZ@yX$b8%ZDbS&5ra@uZ`(^e0>-)%9Df zp@j){h$<48m2v<&9I2ZoeEAgb;6mVt1qK}6|>viLnv!|kcR_xxLVC*> z`3#$_4$O?S()DCS`D>>qyPf)?XO_QayGY|S+KzL&I6eE~g5|ahiz}ywrXtwMNZHo2 zKkrEaqT_(jB5SWgoL|6JypOtj+e@B6v9>oooNQIjzH@Q@J!$wYP|Pd5B7ZNOnzWps z-TI=f`o3k!pv-#&uZdqnwvRJK#KN+3GN1^BNWtSlxpD!_db;W*hFIB++iAUZonx2C z0SzfO@Hvijfm(*j!4&3S@EFQ9#Xl1})K zSoL$Vg?b5QvGFA4?h8}i@lB*r#cadUO`}PnuW71$pNs0l3_(^dl8&YIbi?g`?p#|` zwy>?^imfP$YzM=FIhL*wf@(;|!@?&q301$dNNk4n4qA)0Ubc0kX#rATOR5`z^qmv{ zM+NWrE2l-i>pkwd)J_}kR~gO1qeu;$QaeS3oBgOgbzYV@yi>8Gw}%TWprW1*BScCU zXoG=bp~*L3PmYpNn|J7iE<3297OWkW9&HoB0t1Wz3Gp{rbuNeMw-*a+&^1APG2q#Y zYHBi>Oo=A$MyQUo-@fl`2C|q+ymbs8Y2c>aw4lCFuq)RR-3>KyTVuBnaoNl-?QVGk z;Z}~hseY{E&|Mq5gn_rrO6lINj-W|&JRr*Kt8fK6G&II z-SK|;m0=MG66U?LeV_kC1iE1nifZb=5ZKn*mKVGn8NS!+!!nh{X;h|b%{pElMb8Gf z@kn9!!5Cd+HEX?=c?pt1?d7oUlR91DaQrMl9t~}4025z7o&mNPey=cc z@s>!}q7SvC44g>%2@?m&wCb0WyIp^8X zw#_UPxUA~GeYfGL$c##kylp%Uh z3y=anb@@b4@oE;8p+QWvFuY~FE&ijaeHHn{~5%lY7~SUt5XQlmubi1Q>%L^j9w z^Ve#`zALVJTpiXKH}q~~A>Y)%_36wsEFo^OIjP6h+MBcZH74&w2JWq>!aRj#jUWc) zdRy?q>#qO~Z+;vxm1{OSo!6ER;!nV~5|Z&BU+!Csk+0`JWO7(~9-}VR$M-l96s6%Y zGfY>k5<0Np*~1K}{*q5npr^xBXfun9FNk%0P0|^oFm#?N#Jlj+4fA){n1)Z#x0Q=*-B53i_C z1Ut6+d;_n+h4S_>;{PsyyVtZ#d{07_HxOr%(MNrkR3q_JK6`lcIHmSffWLEs;Ia={w(5#)@BQy{gvY72iF0>bgt3^ym4; zufdwZ6OyNTD_U-*v9FI1H4hSvM7Nj-xc0vHlz6qH;!6Yw(^o=(p!AkS8X@h zxXep4-#@MEb;@9P3>Q%BOKEaei$O&HYi;17=nu1av$)VC$3ot=&x?Has?m+Ho4)q` zxrmLx2g!r#A&kY23?4}qjv9|dZ%UMez7%BxqthtAk)Ma&5>iPAnjaemD}z1$=`LuG z_35cOdE?jZqgM0-N)2#QbPy)8WmOni)qQ-*F3qz zLd5y_SdRU#=5fAf5r%T6*TvXl1LKsHa&ibMr#4>=aHq4NX1 zPFI%M5$@Xl_{5gH!f}l_hpHm??2{0VRoO6+VuaNy#Qx&S0{uyhzt-s!2+}e@j+#B* znW6&EqXT07wRRuyYajVle+<=&n?nnC@ioqezB2c_^HG7HMynVEN->bl#wUUemoEoR zN-@!nmey)8h~??aY&@9NbIzV!jnXvTjr#p4H5Td~f+Tr`l$UBB$}QYn8jN|AStG7# zeMmj??E@D@A&PBAcaBzE=P~vO%}V8#k=9(97_ZGeeV>w*f6&746d#!*l$JRK8eT$# zOTT`V-o=ETX)yl!fK#uHO)L9FNodmj97)&nyc@NIK?Z&9rwd@`2RX2T8c5@%135TC z(TsqYCsJ2YWYSFc{SmA)?#4UF%F-suiONd|)_JcsF;wpoZ;m(Q&rmPgOeOOCSl+KV zQhdxd88(ApR$aU#o9VT_=b2n8$x}6lJuMC0eGU840`;A-!FHB~P&2u@U89xGI@fwd z{@IbyF45}3#P@*n^VH=%TjJp2*GRzO@{O@|f5Dz3k7Gt{cNhAgu3@@$Hzlw7ehOl6&G4H*@lzFP$2XP0$@x zTH6x5v^soV;Eh+?Bq@YpF3WErj=PKgZ37$GTu(UVpVv{|YPirDW8U2LygFYmqn(ut zajdH_YhLNk(t>8d2iot27uJVKt!!!ji?U#WW^84@&9@VY>RRPF7m_--NIv8$ z#i+I0>ag6r_)t?C(_#Og$|0n6D37zzDFG6w3W>~OaLdkDAY=*8-!Z+|<*CUSTFKP{ zpB`xajt>o|3f2b<8H&NIOCrb~ueF1ir@hm-g=(rWtGtRwPPs5L zc3Qd+XULX%FH&_!_(3Q?n?)x?sz6n8@ygiLndPCU{N>>)uZ*oVS-OkovD|foYcHk) zPYrhSri(*<`zJ;c%75j+nTZ;3lQ+Ny+=3`+v#lj*v&>Vvuy_NMr)o&9{SV1(W1TlP zGMow?YHoFFJe-`;x*?hVv-B^aewwc5{^^$n%mc(_nRT=>-xXdL6%{aY_4y(wx=rP}3i#je{myh%G`~|%8aJk*8 z(Sc7vS{S|e%OSJ!-4IUrkGR%9LKyd87n|fR{Q%DmUD zvG+AEj5cyG((`*sGgpzHL=$itenpZ;I=i4ZvZi-N9XGhfZ)V}brp#zb_a@0{rJu9S z-x-DhcRpJ#dX!5F&=Q>CcDTy>qe-Dnd)TANuY={G6CfZTGV!*6S+Ue)&MxAkwuF3^ zlEtiI^pbK$u}t|yJO{6fWZ|Fi*-}8$ZQr?{a$$K)ns_u^T-T z)pd}?tj7pD{n;NTTHtBvAvQ_hM~gVc!;32?1YbokE3_YocrG~JH1$3GcY|l5DhRT91XN3%nyRST* zi7jY^oyO5U=(uMLZOv(4k4~HG&VJgHmOG2(tnGe`Yi5<-hXjk7Q!76))i%BiVi(vu z!`k=EavECw*Pm(9Y5Hq)^Hb|XKJ*&6iM1prtpcCvqTBRBNfBKWcyO^Jq+X@4==O$l z0wFA-_nD>5he}`jk$6x6L$2j)3YcDqEyCbVrc62eZa_l-1bJN(z)NKV@pvex(nh9y zuv>BKji?u2Ki>E5;?nhTduTTe=~)od?7bf9Gv6TzY{3{8ih|YXdsiQ9zM4#o}nM#giel zW7cU->cX2_Tz^H5&JWKERfDbC7wcqeL=LUnrmuV#_f)_xs`>;nuW#0q9Z3a?^DrpYX7pI3l(jRzR@b$4Z z+TdH*2);ry@o~}^D(b2K6Rar@`wR8T$y*RNf_3km!rexmTMn7Zvf!bn7Vd}``?)P&Lf&v^;oVlS>g49EN}40E yE@as@#@c9uY81er_q8E*DA<+%XA|f)0hCkhUIr2M*bhikzHi~ literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..c209e78ecd372343283f4157dcfd918ec5165bb3 GIT binary patch literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9 GIT binary patch literal 2898 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 literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..4f0f1d64e58ba64d180ce43ee13bf9a17835fbca GIT binary patch literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!TQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000000000000000000000000000000000000..948a3070fe34c611c42c0d3ad3013a0dce358be0 GIT binary patch literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? literal 0 HcmV?d00001 diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000000000000000000000000000000000000..1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f GIT binary patch literal 3918 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp zwO~NVXwXCl;jE<}>%@xz|=8fIJAB?>+E{7)|4l${4ngA3G|=r z2Dyv;VVWSgZx9Wj>qUjleGl3Ei9K4>h!(lPS%8VOG>Xu0%6VDz^O=bjJmuP7>DeUv zrbI}MlHB^^d?{zv6d=@_ZD2lg1&G7UjnVN{1}9WkaM3H~btX0GtSzB+tZ^qRgWo4m z!GmimlG$=wgXCnr6j@m<1gAL46#T~5Bnm=2{^@>|t&`9mkEPddj zAvG~@Tv~TAm2i%VW}R-g(Z0)z-Y|szHr@rk>4MAyG*Ma*7Yh#H7(!-5>DZ@8r;_dx z{prSe<>~099F8vsYd2xff7uAS%7{S)f(|@me3t2$iy&NEc7OUEchp@9A|X;;IA>8!oX+y(BKJ$EzV* znR$z;!L$s7uy@{OT~nG#B!NRraT8(X##Ho!0r_o@gg0CA-9H^;-uE&?$2$nHv_00o z%cbuUc-tCx$Uh&EZ4Nf4Zgqv)Y6>usG3>GeQnxx_Z6+PcbX-+ysbt1hQ`K1LDpOE? zrAhIZhSN9yVIAOa22gn577tbc&i3|3V8NWy&!tw##`}9*x}gtI^h1DzZRA>UuaJG) zaZ7j)dq!O}{?#8Y7~7i6fHh4{`pL?>-18|p!S75Y#^DM>-S3)vuZG+Q7l@ek zQP~#cBpWgg#mApc_sPYjpw8odQuRokmTkzcNl`^CcKB7e&;zViV;{Y{o^Y$%7i0m# z62%#1Lq!RC?}lK>%mp}T!3Xv;L*0v*>USLm``N%>w>@fwC+#T&Tx2bN4w(20JB}oU zuSa6v^kXi0xPs?pbaOHnyiqq6By1EZY9OZ^^QA>{q-Hsd&m`pbQ%8121aWG-F5xf zlZ%;B{;C>X19|`^_?dVyCq>n+41w7|!tUS!{9rHlbhX=SZO5CQ^;!Du_E7*`GiR^Q w)2!4MKjfSAeNo!9>IaV6aUZ*?W>} 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s literal 0 HcmV?d00001 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..9255bbb --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,11 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + #FFDADCE0 + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..46b279f --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,4 @@ + + IQBall + Espace Personnel + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..4ec5ded --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +