diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml index b268ef3..2073145 100644 --- a/.idea/deploymentTargetSelector.xml +++ b/.idea/deploymentTargetSelector.xml @@ -4,6 +4,14 @@ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 86c93f8..99f2d2d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,15 +11,22 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/Theme.VdcScore"> + + + + + + - + - \ No newline at end of file + diff --git a/app/src/main/java/com/example/vdcscore/CriarContaActivity.java b/app/src/main/java/com/example/vdcscore/CriarContaActivity.java index 0368730..1643e4a 100644 --- a/app/src/main/java/com/example/vdcscore/CriarContaActivity.java +++ b/app/src/main/java/com/example/vdcscore/CriarContaActivity.java @@ -57,10 +57,7 @@ public class CriarContaActivity extends AppCompatActivity { return; } - // Por agora só mostra mensagem (podemos pôr Firebase ou SQLite depois) - Toast.makeText(CriarContaActivity.this, "Conta criada com sucesso!", Toast.LENGTH_SHORT).show(); - finish(); // volta para o login } }); @@ -69,6 +66,7 @@ public class CriarContaActivity extends AppCompatActivity { @Override public void onClick(View view) { Intent intent = new Intent(CriarContaActivity.this, LoginActivity.class); + startActivity(intent); } }); diff --git a/app/src/main/java/com/example/vdcscore/LoginActivity.java b/app/src/main/java/com/example/vdcscore/LoginActivity.java index 81b5927..cb768dc 100644 --- a/app/src/main/java/com/example/vdcscore/LoginActivity.java +++ b/app/src/main/java/com/example/vdcscore/LoginActivity.java @@ -4,6 +4,7 @@ import android.content.Intent; import android.os.Bundle; import android.widget.Button; import android.widget.EditText; +import android.widget.TextView; import android.widget.Toast; import androidx.appcompat.app.AppCompatActivity; @@ -16,6 +17,8 @@ public class LoginActivity extends AppCompatActivity { Button btnLogin; FirebaseAuth mAuth; + private TextView criarContaTextView; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -24,10 +27,17 @@ public class LoginActivity extends AppCompatActivity { editEmail = findViewById(R.id.editEmail); editPassword = findViewById(R.id.editPassword2); btnLogin = findViewById(R.id.btnLogin); + criarContaTextView = findViewById(R.id.txtRegister); mAuth = FirebaseAuth.getInstance(); btnLogin.setOnClickListener(v -> loginUser()); + criarContaTextView.setOnClickListener(view -> criarConta()); + } + + private void criarConta() { + Intent intent= new Intent(LoginActivity.this, CriarContaActivity.class); + startActivity(intent); } private void loginUser() { diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 7bac71d..ecbf7f6 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -22,8 +22,9 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_margin="140dp" - app:layout_constraintTop_toTopOf="parent"> + android:layout_marginTop="140dp" + app:layout_constraintTop_toTopOf="parent" + >