fix : double code

androidCompose
Maxence GUITARD 1 year ago
parent 5b2f5f0d67
commit 1228a00395

@ -1,5 +1,6 @@
package com.example.mathseduc package com.example.mathseduc
import android.app.AlertDialog
import android.content.Intent import android.content.Intent
import android.os.Bundle import android.os.Bundle
import android.widget.Button import android.widget.Button
@ -8,7 +9,6 @@ import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import com.example.mathseduc.controllers.ControllerPlayer import com.example.mathseduc.controllers.ControllerPlayer
import org.mindrot.jbcrypt.BCrypt import org.mindrot.jbcrypt.BCrypt
class ConnexionPlayerActivity : AppCompatActivity() { class ConnexionPlayerActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
@ -36,5 +36,40 @@ class ConnexionPlayerActivity : AppCompatActivity() {
Toast.makeText(this, "Connexion échoué. Veuillez réessayer.", Toast.LENGTH_SHORT).show() 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()
} }
} }

@ -38,10 +38,5 @@ class MainActivity : AppCompatActivity() {
val intent = Intent(this, ConnexionPlayerActivity::class.java) val intent = Intent(this, ConnexionPlayerActivity::class.java)
startActivity(intent) startActivity(intent)
} }
btnConnexion.setOnClickListener{
val intent = Intent(this, ConnexionPlayerActivity::class.java)
startActivity(intent)
}
} }
} }

@ -1,40 +1,98 @@
<?xml version="1.0" encoding="utf-8"?> <?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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="16dp"> tools:context=".ConnexionPlayerActivity">
<EditText <Button
android:id="@+id/editTextNickname" android:id="@+id/btnReturn"
android:layout_width="match_parent" android:layout_width="100dp"
android:layout_height="wrap_content" android:layout_height="60dp"
android:hint="Nickname" android:layout_gravity="start"
android:background="#FFFFFF" android:layout_marginTop="16dp"
android:padding="8dp" android:backgroundTint="@color/grey"
android:textColor="#000000" android:text="@string/retour"
android:layout_marginBottom="16dp"/> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.948"
<EditText app:layout_constraintStart_toStartOf="parent"
android:id="@+id/editTextPassword" app:layout_constraintTop_toTopOf="parent" />
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="Password" android:orientation="vertical"
android:inputType="textPassword" android:padding="25dp"
android:background="#FFFFFF" app:layout_constraintBottom_toBottomOf="parent"
android:padding="8dp" app:layout_constraintEnd_toEndOf="parent"
android:textColor="#000000" app:layout_constraintStart_toStartOf="parent"
android:layout_below="@id/editTextNickname" app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="8dp" tools:ignore="MissingConstraints">
android:layout_marginBottom="16dp"/>
<Button <TextView
android:id="@+id/buttonLogin" 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_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Login" android:layout_marginBottom="15dp"
android:background="#4CAF50" android:text=""
android:textColor="#FFFFFF" android:textAlignment="center"
android:layout_below="@id/editTextPassword" android:textColor="@android:color/holo_red_dark"
android:layout_marginTop="16dp"/> android:textSize="20sp" /> -->
</RelativeLayout>
<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>

@ -6,8 +6,7 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:weightSum="10" android:weightSum="10"
tools:context=".MainActivity" tools:context=".MainActivity">
android:gravity="center">
<FrameLayout <FrameLayout

Loading…
Cancel
Save