Update Version: 0.3 - TicketBusApp

app/src/main/java/com/rtx14/ticketbus/GetStarted.java

@@ -39,7 +39,7 @@ protected void onStart() {
  super.onStart();
  FirebaseUser currentUser = mAuth.getCurrentUser();
  if(currentUser != null){
- Toast.makeText(this, "Yeay, kamu sudah masuk sebagai: "+currentUser.getEmail()+".", Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, "Yeay, berhasil masuk sebagai: "+currentUser.getEmail()+".", Toast.LENGTH_SHORT).show();
  Intent intent = new Intent(GetStarted.this, MainActivity.class);
  startActivity(intent);
  finish();

app/src/main/java/com/rtx14/ticketbus/Login.java

@@ -58,13 +58,15 @@ private void signIn(String email, String password){
  FirebaseUser user = mAuth.getCurrentUser();
  Toast.makeText(Login.this, "Yeay, berhasil masuk sebagai: "+user.getEmail()+".", Toast.LENGTH_SHORT).show();
  Intent intent = new Intent(Login.this, MainActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
  startActivity(intent);
  finish();
  } else {
  // If sign in fails, display a message to the user.
  Log.w(TAG, "signInWithEmail:failure", task.getException());
- Toast.makeText(Login.this, "Yah gagal, coba lagi yuk.", Toast.LENGTH_SHORT).show();
+ Toast.makeText(Login.this, "Gagal, coba lagi yuk.", Toast.LENGTH_SHORT).show();
  Intent intent = new Intent(Login.this, Login.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
  startActivity(intent);
  finish();
  }
@@ -76,7 +78,7 @@ protected void onStart() {
  super.onStart();
  FirebaseUser currentUser = mAuth.getCurrentUser();
  if (currentUser != null){
- Toast.makeText(this, "Yeay, kamu sudah masuk sebagai: "+currentUser.getEmail()+".", Toast.LENGTH_SHORT).show();
+ Toast.makeText(this, "Yeay, berhasil masuk sebagai: "+currentUser.getEmail()+".", Toast.LENGTH_SHORT).show();
  startActivity(new Intent(Login.this, MainActivity.class));
  finish();
  }

app/src/main/java/com/rtx14/ticketbus/Register.java

@@ -27,7 +27,7 @@ public class Register extends AppCompatActivity {
  protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_register);
- keLogin = findViewById(R.id.btnLogin_2);
+ keLogin = findViewById(R.id.btnLogin_1);
  btnRegister = findViewById(R.id.btnRegister);
  ed_email2 = findViewById(R.id.edEmailRegister);
  ed_password2 = findViewById(R.id.edPasswordRegister);
@@ -64,13 +64,15 @@ public void onComplete(@NonNull Task<AuthResult> task) {
  FirebaseUser user = mAuth.getCurrentUser();
  Toast.makeText(Register.this, "Yeay, berhasil mendaftar sebagai: "+user.getEmail()+".", Toast.LENGTH_SHORT).show();
  Intent intent = new Intent(Register.this, MainActivity.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
  startActivity(intent);
  finish();
  } else {
  // If sign in fails, display a message to the user.
  Log.w(TAG, "createUserWithEmail:failure", task.getException());
- Toast.makeText(Register.this, "Yah gagal, coba lagi yuk.", Toast.LENGTH_SHORT).show();
+ Toast.makeText(Register.this, "Gagal, coba lagi yuk.", Toast.LENGTH_SHORT).show();
  Intent intent = new Intent(Register.this, Register.class);
+ intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
  startActivity(intent);
  finish();
  }

app/src/main/res/drawable/rectangle_button.xml

@@ -2,8 +2,8 @@
 <selector xmlns:android="http:https://schemas.android.com/apk/res/android">
  <item>
  <shape>
- <solid android:color="#A61572A1" />
- <corners android:radius="10dp" />
+ <solid android:color="#99A799" />
+ <corners android:radius="15dp" />
  </shape>
  </item>
 </selector>

app/src/main/res/drawable/rectangle_white.xml → app/src/main/res/drawable/rectangle_button_2.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http:https://schemas.android.com/apk/res/android">
-
  <item>
- <shape android:shape="rectangle">
- <solid android:color="#F1F1F1" />
- <corners android:radius="40dp" />
+ <shape>
+ <solid android:color="#C2D0D3" />
+ <corners android:radius="15dp" />
  </shape>
  </item>
-
 </selector>

app/src/main/res/drawable/rectangle_rounded_icon_assets.xml → app/src/main/res/drawable/rectangle_button_3.xml

@@ -1,11 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http:https://schemas.android.com/apk/res/android">
-
  <item>
- <shape android:shape="rectangle">
- <solid android:color="@color/abuputih" />
- <corners android:radius="10dp" />
+ <shape>
+ <solid android:color="#A6000000" />
+ <corners android:radius="15dp" />
  </shape>
  </item>
-
 </selector>

app/src/main/res/layout/activity_get_started.xml

@@ -4,45 +4,29 @@
  xmlns:tools="http:https://schemas.android.com/tools"
  android:layout_width="match_parent"
  android:layout_height="match_parent"
- tools:context=".GetStarted"
- android:background="@color/abuputih">
+ android:background="@color/putihcoklat"
+ tools:context=".GetStarted">
 
- <ImageView
- android:id="@+id/imageView2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginEnd="318dp"
- android:layout_marginBottom="555dp"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.0"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.0"
- app:srcCompat="@drawable/blob_one" />
 
  <ImageView
- android:id="@+id/imageView6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginStart="286dp"
- android:layout_marginTop="557dp"
- app:layout_constraintBottom_toBottomOf="parent"
+ android:id="@+id/imageView2"
+ android:layout_width="202.7dp"
+ android:layout_height="75dp"
+ app:layout_constraintBottom_toTopOf="@+id/textView"
  app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="1.0"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toTopOf="parent"
  app:layout_constraintVertical_bias="1.0"
- app:srcCompat="@drawable/blob_two" />
+ app:srcCompat="@drawable/bus" />
 
  <TextView
  android:id="@+id/textView"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:fontFamily="@font/dmsans_medium"
- android:text="TicketKu"
+ android:fontFamily="@font/league_spartan_medium"
+ android:text="Ticket-BusKu"
  android:textColor="@color/black"
- android:textSize="24sp"
+ android:textSize="38sp"
  app:layout_constraintBottom_toBottomOf="parent"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintHorizontal_bias="0.501"
@@ -54,38 +38,41 @@
  android:id="@+id/textView2"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
- android:layout_marginTop="12dp"
+ android:layout_marginTop="28dp"
  android:fontFamily="@font/poppins_extra_light"
- android:text="Booking your tickets online with your"
+ android:text="&quot;Booking your tickets online with your"
  android:textColor="@color/black"
  android:textSize="16sp"
+ android:textStyle="italic"
  app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.496"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/textView" />
 
  <TextView
  android:id="@+id/textView4"
  android:layout_width="wrap_content"
  android:layout_height="wrap_content"
+ android:layout_marginTop="4dp"
  android:fontFamily="@font/poppins_extra_light"
- android:text="best searching preferences"
+ android:text="best searching preferences&quot;"
  android:textColor="@color/black"
  android:textSize="16sp"
+ android:textStyle="italic"
  app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.497"
+ app:layout_constraintHorizontal_bias="0.501"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/textView2" />
 
  <Button
  android:id="@+id/buttonGetStarted"
- android:layout_width="160dp"
- android:layout_height="wrap_content"
+ android:layout_width="194dp"
+ android:layout_height="48dp"
  android:layout_marginStart="168dp"
- android:layout_marginTop="8dp"
+ android:layout_marginTop="36dp"
  android:layout_marginEnd="168dp"
  android:background="@drawable/rectangle_button"
  android:text="Get Started"
+ android:textColor="@color/black"
  app:layout_constraintEnd_toEndOf="parent"
  app:layout_constraintStart_toStartOf="parent"
  app:layout_constraintTop_toBottomOf="@+id/textView4" />