From 70bd4fffd8decf4bac96cdd22ea283fabddf22d8 Mon Sep 17 00:00:00 2001 From: "jeremy.ducourthial" Date: Wed, 28 Feb 2024 17:24:16 +0100 Subject: [PATCH] =?UTF-8?q?feat=20:=20ajout=20connexion=20d'un=20joueur=20?= =?UTF-8?q?+=20obligation=20d'=C3=AAtre=20connecter=20pour=20jouer=20en=20?= =?UTF-8?q?multi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/app/build.gradle | 3 +- Android/app/src/main/AndroidManifest.xml | 1 + .../mathseduc/ConnexionPlayerActivity.kt | 40 ++++++++++++++++++ .../com/example/mathseduc/MainActivity.kt | 17 +++++++- .../mathseduc/controllers/ControllerPlayer.kt | 42 ++++++++++++++++++- .../com/example/mathseduc/models/Player.kt | 5 ++- .../res/layout/activity_connexion_player.xml | 40 ++++++++++++++++++ 7 files changed, 143 insertions(+), 5 deletions(-) create mode 100644 Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt create mode 100644 Android/app/src/main/res/layout/activity_connexion_player.xml diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 5b7025d..8968c27 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -10,7 +10,7 @@ android { defaultConfig { applicationId "com.example.mathseduc" minSdk 21 - targetSdk 34 + targetSdk 33 versionCode 1 versionName "1.0" @@ -44,4 +44,5 @@ dependencies { implementation("com.squareup.okhttp3:okhttp:4.10.0") implementation("com.google.code.gson:gson:2.10.1") + implementation "org.mindrot:jbcrypt:0.4" } \ No newline at end of file diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 3f54b3e..c0ca71d 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -22,5 +22,6 @@ + \ No newline at end of file diff --git a/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt new file mode 100644 index 0000000..72907b9 --- /dev/null +++ b/Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt @@ -0,0 +1,40 @@ +package com.example.mathseduc + +import android.content.Intent +import android.os.Bundle +import android.widget.Button +import android.widget.EditText +import android.widget.Toast +import androidx.appcompat.app.AppCompatActivity +import com.example.mathseduc.controllers.ControllerPlayer +import org.mindrot.jbcrypt.BCrypt + +class ConnexionPlayerActivity : AppCompatActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_connexion_player) + + val buttonLogin = findViewById