commit 578c6f5ff50a0125133c89a019a378547ede4ddc Author: maxime Date: Sat Mar 9 20:37:56 2024 +0100 initial commit 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/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..9cefda3 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,84 @@ +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 = 21 + 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(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.converter.gson) + implementation(libs.retrofit2.kotlinx.serialization.converter) + implementation(libs.kotlinx.datetime) + + implementation(libs.retrofit.adapters.arrow) + implementation(libs.arrow.core) + + 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/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..bab787e --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + \ 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..7d79766 --- /dev/null +++ b/app/src/main/java/com/iqball/app/MainActivity.kt @@ -0,0 +1,66 @@ +package com.iqball.app + +import android.os.Bundle +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.runtime.Composable +import androidx.compose.ui.Modifier +import com.google.gson.Gson +import com.iqball.app.api.EitherCallAdapterFactory +import com.iqball.app.api.service.IQBallService +import com.iqball.app.page.RegisterPage +import com.iqball.app.ui.theme.IQBallTheme +import okhttp3.OkHttpClient +import okhttp3.ResponseBody +import retrofit2.Converter +import retrofit2.Retrofit +import retrofit2.converter.gson.GsonConverterFactory +import retrofit2.create +import java.lang.reflect.Type + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val gson = Gson() + + val retrofit = Retrofit.Builder() + .addConverterFactory(GsonConverterFactory.create(gson)) + .addCallAdapterFactory(EitherCallAdapterFactory.create(gson)) + .addConverterFactory(object : Converter.Factory() { + override fun responseBodyConverter( + type: Type, + annotations: Array, + retrofit: Retrofit + ): Converter? { + return super.responseBodyConverter(type, annotations, retrofit) + } + }) + .baseUrl("http://grospc:5254") + .client( + OkHttpClient.Builder() + .addInterceptor { it.proceed(it.request()) } + .build() + ) + .build() + + val service = retrofit.create() + + setContent { + IQBallTheme { + // A surface container using the 'background' color from the theme + Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colorScheme.background) { + App(service) + } + } + } + } +} + +@Composable +fun App(service: IQBallService) { + RegisterPage(service) +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/api/EitherCall.kt b/app/src/main/java/com/iqball/app/api/EitherCall.kt new file mode 100644 index 0000000..0ceacc9 --- /dev/null +++ b/app/src/main/java/com/iqball/app/api/EitherCall.kt @@ -0,0 +1,53 @@ +package com.iqball.app.api + +import arrow.core.Either +import com.google.gson.Gson +import okhttp3.Request +import okio.Timeout +import retrofit2.Call +import retrofit2.Callback +import retrofit2.Response +import java.lang.reflect.ParameterizedType + +class EitherCall( + private val gson: Gson, + 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 parsed = gson.fromJson(response.errorBody()!!.charStream(), leftType) + Either.Left(parsed) + } + callback.onResponse(this@EitherCall, Response.success(result)) + } + + override fun onFailure(call: Call, t: Throwable) { + callback.onFailure(this@EitherCall, t) + } + + }) + } + + override fun clone(): Call> = EitherCall(gson, 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/api/EitherCallAdapterFactory.kt b/app/src/main/java/com/iqball/app/api/EitherCallAdapterFactory.kt new file mode 100644 index 0000000..67e00f1 --- /dev/null +++ b/app/src/main/java/com/iqball/app/api/EitherCallAdapterFactory.kt @@ -0,0 +1,31 @@ +package com.iqball.app.api + +import com.google.gson.Gson +import com.skydoves.retrofit.adapters.arrow.EitherCallAdapterFactory +import retrofit2.Call +import retrofit2.CallAdapter +import retrofit2.Retrofit +import java.lang.reflect.ParameterizedType +import java.lang.reflect.Type + +class EitherCallAdapterFactory(private val gson: Gson) : CallAdapter.Factory() { + override fun get( + returnType: Type, + annotations: Array, + retrofit: Retrofit + ): CallAdapter<*, *> { + return object : CallAdapter { + override fun responseType(): Type = returnType + + override fun adapt(call: Call): EitherCall { + val callType = returnType as ParameterizedType + val eitherType = callType.actualTypeArguments.first() as ParameterizedType + return EitherCall(gson, eitherType, call) + } + } + } + + companion object { + fun create(gson: Gson) = EitherCallAdapterFactory(gson) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/api/service/AuthService.kt b/app/src/main/java/com/iqball/app/api/service/AuthService.kt new file mode 100644 index 0000000..bef7e4f --- /dev/null +++ b/app/src/main/java/com/iqball/app/api/service/AuthService.kt @@ -0,0 +1,28 @@ +package com.iqball.app.api.service + +import arrow.core.Either +import kotlinx.datetime.LocalDateTime +import kotlinx.serialization.Serializable +import retrofit2.Call +import retrofit2.HttpException +import retrofit2.http.Body +import retrofit2.http.POST + +interface AuthService { + + @Serializable + data class AuthResponse(val token: String, val expirationDate: LocalDateTime) + + @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): Call + + +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/api/service/IQBallService.kt b/app/src/main/java/com/iqball/app/api/service/IQBallService.kt new file mode 100644 index 0000000..81c3f28 --- /dev/null +++ b/app/src/main/java/com/iqball/app/api/service/IQBallService.kt @@ -0,0 +1,9 @@ +package com.iqball.app.api.service + +import arrow.core.Either +import retrofit2.Call + +typealias ErrorResponseResult = Map> +typealias APIResult = Either + +interface IQBallService : AuthService \ 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..f6f8748 --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/LoginPage.kt @@ -0,0 +1,9 @@ +package com.iqball.app.page + +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable + +@Composable +fun LoginPage() { + Text(text = "Login Page") +} \ 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..012d3c9 --- /dev/null +++ b/app/src/main/java/com/iqball/app/page/RegisterPage.kt @@ -0,0 +1,47 @@ +package com.iqball.app.page + +import android.util.Log +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 arrow.core.Either +import com.iqball.app.api.service.AuthService.RegisterRequest +import com.iqball.app.api.service.IQBallService +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.coroutineScope +import kotlinx.coroutines.delay +import kotlinx.coroutines.launch +import kotlinx.coroutines.runBlocking + +@Composable +fun RegisterPage(service: IQBallService) { + + + var text by remember { mutableStateOf("No message !") } + + + runBlocking { + val result = service.register(RegisterRequest("abcdefg", "a@m.com", "123456")) + + when (result) { + is Either.Left -> println("Error : " + result.value) + is Either.Right -> println("Success : " + result.value) + } + + println(result) + text = result.toString() + Log.i("%", result.toString()) + } + + Text(text = text) +} + +suspend fun updateTextIn5Sec(setText: (String) -> Unit) = coroutineScope { + launch(Dispatchers.IO) { + delay(5000) + setText("test") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/iqball/app/ui/theme/Color.kt b/app/src/main/java/com/iqball/app/ui/theme/Color.kt new file mode 100644 index 0000000..6b01d6c --- /dev/null +++ b/app/src/main/java/com/iqball/app/ui/theme/Color.kt @@ -0,0 +1,11 @@ +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) \ No newline at end of file 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..b521bd2 --- /dev/null +++ b/app/src/main/java/com/iqball/app/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +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 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* 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/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/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 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ 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 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ 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 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ 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 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ 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 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ 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..1c64d05 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + IQBall + \ 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 @@ + + + +