jade.van_brabandt
/
3.01-QCM_MuscuMaths
5
1
Fork 1
Code Issues 4 Pull Requests 1 Packages Projects 8 Releases Wiki Activity

Compare commits

base: jade.van_brabandt:f08b3d1a238879e824e3723b265747a2b25b8634
Branches Tags
jade.van_brabandt:master
jade.van_brabandt:optimisationAndroid
jade.van_brabandt:API
jade.van_brabandt:androidCompose
jade.van_brabandt:Multiplayer_Php
jade.van_brabandt:langues
jade.van_brabandt:Drone_Update_Testing
jade.van_brabandt:pages_listes
jade.van_brabandt:tests
...
compare: jade.van_brabandt:325aeb49ae61b53ac80e4122a627fa400b270ce0
Branches Tags
jade.van_brabandt:master
jade.van_brabandt:optimisationAndroid
jade.van_brabandt:API
jade.van_brabandt:androidCompose
jade.van_brabandt:Multiplayer_Php
jade.van_brabandt:langues
jade.van_brabandt:Drone_Update_Testing
jade.van_brabandt:pages_listes
jade.van_brabandt:tests

4 Commits
f08b3d1a23 ... 325aeb49ae

Author SHA1 Message Date
Maxence GUITARD 325aeb49ae Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths
continuous-integration/drone/push Build is passing Details
1 year ago
Maxence GUITARD 1228a00395 fix : double code
1 year ago
Maxence GUITARD 5b2f5f0d67 Merge branch 'master' of https://codefirst.iut.uca.fr/git/jade.van_brabandt/3.01-QCM_MuscuMaths
1 year ago
Maxence GUITARD 1c5d2276ef feat : style page Connexion et lien entre page
1 year ago
9 changed files with 229 additions and 38 deletions
Show Stats

39
Android/app/src/main/java/com/example/mathseduc/ConnexionPlayerActivity.kt
Unescape View File

@ -1,5 +1,6 @@
package com.example.mathseduc
import android.app.AlertDialog
import android.content.Intent
import android.os.Bundle
import android.widget.Button
@ -8,7 +9,6 @@ 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)
@ -36,5 +36,40 @@ class ConnexionPlayerActivity : AppCompatActivity() {
Toast.makeText(this, "Connexion échoué. Veuillez réessayer.", Toast.LENGTH_SHORT).show()
}
}
val btnReturn = findViewById<Button>(R.id.btnReturn)
val btnRegister = findViewById<Button>(R.id.registerButton)
btnReturn.setOnClickListener {
val intent = Intent(this, MainActivity::class.java)
startActivity(intent)
}
btnRegister.setOnClickListener {
showRegisterDialog()
}
}
private fun showRegisterDialog() {
val builder = AlertDialog.Builder(this)
val inflater = layoutInflater
val dialogView = inflater.inflate(R.layout.dialog_register, null)
val etNickname = dialogView.findViewById<EditText>(R.id.nickname)
val etPassword = dialogView.findViewById<EditText>(R.id.password)
builder.setView(dialogView)
.setTitle("Créer son compte")
.setPositiveButton("Enregistrer") { dialog, which ->
val nickname = etNickname.text.toString()
val password = etPassword.text.toString()
// Faites quelque chose avec le nom d'utilisateur et le mot de passe
}
.setNegativeButton("Fermer") { dialog, which ->
dialog.dismiss()
}
val dialog = builder.create()
dialog.show()
}
}
}

6
Android/app/src/main/java/com/example/mathseduc/MainActivity.kt
Unescape View File

@ -15,9 +15,9 @@ class MainActivity : AppCompatActivity() {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_main)
var btnSolo = findViewById<Button>(R.id.btnSolo)
var btnMulti = findViewById<Button>(R.id.btnMulti)
var btnConnexion = findViewById<Button>(R.id.btnConnexion)
val btnSolo = findViewById<Button>(R.id.btnSolo)
val btnMulti = findViewById<Button>(R.id.btnMulti)
val btnConnexion = findViewById<Button>(R.id.btnConnexion)
btnSolo.setOnClickListener {
// Traitement pour le bouton Solo

8
Android/app/src/main/res/drawable/rounded_corner.xml
Unescape View File

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/white" />
<corners android:radius="10dp" />
<stroke android:width="1dp"
android:color="@color/grey"/>
</shape>

118
Android/app/src/main/res/layout/activity_connexion_player.xml
Unescape View File

@ -1,40 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="16dp">
tools:context=".ConnexionPlayerActivity">
<EditText
android:id="@+id/editTextNickname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Nickname"
android:background="#FFFFFF"
android:padding="8dp"
android:textColor="#000000"
android:layout_marginBottom="16dp"/>
<EditText
android:id="@+id/editTextPassword"
<Button
android:id="@+id/btnReturn"
android:layout_width="100dp"
android:layout_height="60dp"
android:layout_gravity="start"
android:layout_marginTop="16dp"
android:backgroundTint="@color/grey"
android:text="@string/retour"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.948"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Password"
android:inputType="textPassword"
android:background="#FFFFFF"
android:padding="8dp"
android:textColor="#000000"
android:layout_below="@id/editTextNickname"
android:layout_marginTop="8dp"
android:layout_marginBottom="16dp"/>
android:orientation="vertical"
android:padding="25dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:ignore="MissingConstraints">
<Button
android:id="@+id/buttonLogin"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:fontFamily="@font/math_educ_font"
android:text="@string/connexion"
android:textColor="@color/white"
android:textSize="40sp" />
<!--<TextView
android:id="@+id/errorTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Login"
android:background="#4CAF50"
android:textColor="#FFFFFF"
android:layout_below="@id/editTextPassword"
android:layout_marginTop="16dp"/>
</RelativeLayout>
android:layout_marginBottom="15dp"
android:text=""
android:textAlignment="center"
android:textColor="@android:color/holo_red_dark"
android:textSize="20sp" /> -->
<EditText
android:id="@+id/editTextNickname"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:autofillHints=""
android:background="@drawable/rounded_corner"
android:hint="@string/nom_d_utilisateur"
android:inputType="text"
android:minHeight="50dp"
android:padding="8dp"
tools:ignore="RtlSymmetry" />
<EditText
android:id="@+id/editTextPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:autofillHints=""
android:background="@drawable/rounded_corner"
android:hint="@string/mot_de_passe"
android:inputType="textPassword"
android:minHeight="50dp"
android:padding="8dp"
tools:ignore="RtlSymmetry" />
<Button
android:id="@+id/buttonLogin"
android:layout_width="wrap_content"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginTop="13dp"
android:backgroundTint="@color/blue"
android:text="@string/se_connecter" />
<Button
android:id="@+id/registerButton"
android:layout_width="wrap_content"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginTop="3dp"
android:backgroundTint="@color/blue"
android:text="@string/s_inscrire" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

4
Android/app/src/main/res/layout/activity_main.xml
Unescape View File

@ -3,10 +3,10 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical"
android:weightSum="10"
tools:context=".MainActivity"
android:gravity="center">
tools:context=".MainActivity">
<FrameLayout

82
Android/app/src/main/res/layout/dialog_register.xml
Unescape View File

@ -0,0 +1,82 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="350dp"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:background="@drawable/rounded_corner"
tools:ignore="MissingConstraints">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="15dp"
android:paddingTop="2dp"
android:fontFamily="@font/math_educ_font"
android:text="@string/creer_compte"
android:textColor="@color/black"
android:textSize="40sp"/>
<!--<TextView
android:id="@+id/errorTextView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="15dp"
android:text=""
android:textAlignment="center"
android:textColor="@android:color/holo_red_dark"
android:textSize="20sp" /> -->
<EditText
android:id="@+id/nickname"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:background="@drawable/rounded_corner"
android:hint="@string/nom_d_utilisateur"
android:layout_gravity="center_horizontal"
android:paddingStart="8dp"
android:inputType="text"
android:minHeight="50dp"
android:autofillHints=""
tools:ignore="RtlSymmetry" />
<EditText
android:id="@+id/password"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:background="@drawable/rounded_corner"
android:layout_gravity="center_horizontal"
android:hint="@string/mot_de_passe"
android:inputType="textPassword"
android:minHeight="50dp"
android:paddingStart="8dp"
android:autofillHints=""
tools:ignore="RtlSymmetry" />
<Button
android:id="@+id/loginButton"
android:layout_width="wrap_content"
android:layout_gravity="center"
android:layout_height="55dp"
android:layout_marginTop="13dp"
android:backgroundTint="@color/blue"
android:text="@string/enregistrer" />
<Button
android:id="@+id/registerButton"
android:layout_width="wrap_content"
android:layout_height="55dp"
android:layout_gravity="center"
android:layout_marginTop="1dp"
android:backgroundTint="@color/blackgrey"
android:text="@string/fermer" />
</LinearLayout>

1
Android/app/src/main/res/values/colors.xml
Unescape View File

@ -11,4 +11,5 @@
<color name="orange">#FFA500</color>
<color name="grey">#8C92AC</color>
<color name="blue">#0d6efd</color>
<color name="blackgrey">#5c636a</color>
</resources>

7
Android/app/src/main/res/values/strings.xml
Unescape View File

@ -11,6 +11,13 @@
<string name="listLobbies">Liste des lobbies</string>
<string name="difficulty_prompt">Selectionne la difficulty</string>
<string name="chapter_prompt">Selectionne un chapter</string>
<string name="se_connecter">Se connecter</string>
<string name="mot_de_passe">Mot de passe</string>
<string name="s_inscrire">S\'inscrire</string>
<string name="nom_d_utilisateur">Nom d\'utilisateur</string>
<string name="creer_compte">Créer son compte</string>
<string name="fermer">Fermer</string>
<string name="enregistrer">Enregistrer</string>
<string-array name="difficulty_array">
<item>Facile</item>

2
Android/app/src/main/res/values/themes.xml
Unescape View File

@ -1,6 +1,6 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="Theme.MathsEduc" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="Theme.MathsEduc" parent="Theme.MaterialComponents.DayNight.NoActionBar">
<!-- Primary brand color. -->
<item name="colorPrimary">@color/purple_500</item>
<item name="colorPrimaryVariant">@color/purple_700</item>

Write Preview
Loading…
Cancel
Save