Skip to content
This repository was archived by the owner on Jan 29, 2021. It is now read-only.

Commit f22b3c7

Browse files
committed
Fix main activity name
1 parent c72b65d commit f22b3c7

File tree

5 files changed

+6
-14
lines changed

5 files changed

+6
-14
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<activity android:name=".activities.ConnexionActivity" />
3737
<activity android:name=".activities.InscriptionActivity" />
3838

39-
<activity android:name=".activities.MainActivity2"
39+
<activity android:name=".activities.MainActivity"
4040
android:theme="@style/Theme.Baley_Labeye.NoActionBar">
4141

4242
</activity>

app/src/main/java/com/ticandroid/baley_labeye/activities/ConnexionActivity.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,23 +9,17 @@
99
import android.widget.TextView;
1010
import android.widget.Toast;
1111

12-
import androidx.annotation.NonNull;
1312
import androidx.appcompat.app.AppCompatActivity;
1413

15-
import com.google.android.gms.tasks.OnFailureListener;
1614
import com.google.android.gms.tasks.OnSuccessListener;
1715
import com.google.android.gms.tasks.Task;
1816
import com.google.firebase.auth.AuthResult;
1917
import com.google.firebase.auth.FirebaseAuth;
2018
import com.google.firebase.firestore.DocumentReference;
2119
import com.google.firebase.firestore.DocumentSnapshot;
2220
import com.google.firebase.firestore.FirebaseFirestore;
23-
import com.google.firebase.firestore.model.Document;
24-
import com.google.rpc.context.AttributeContext;
2521
import com.ticandroid.baley_labeye.R;
2622

27-
import java.util.Objects;
28-
2923
public class ConnexionActivity extends AppCompatActivity implements View.OnClickListener {
3024
private transient EditText email;
3125
private transient EditText password;
@@ -73,10 +67,10 @@ public void onSuccess(AuthResult authResult) {
7367
if (task.getResult().getBoolean("isAdmin")) {
7468
startActivity(new Intent(ConnexionActivity.this, AdminActivity.class));
7569
} else {
76-
startActivity(new Intent(ConnexionActivity.this, MainActivity2.class));
70+
startActivity(new Intent(ConnexionActivity.this, MainActivity.class));
7771
}
7872
} catch (NullPointerException e) {
79-
startActivity(new Intent(ConnexionActivity.this, MainActivity2.class));
73+
startActivity(new Intent(ConnexionActivity.this, MainActivity.class));
8074
} finally {
8175
finish();
8276
}

app/src/main/java/com/ticandroid/baley_labeye/activities/InscriptionActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public void onSuccess(UploadTask.TaskSnapshot taskSnapshot) {
9595
progressDialog.dismiss();
9696
String downloadUrl = taskSnapshot.getMetadata().getReference().getDownloadUrl().toString();
9797
Toast.makeText(InscriptionActivity.this, "Inscription réussie", Toast.LENGTH_SHORT).show();
98-
Intent inscriptionF = new Intent(InscriptionActivity.this, MainActivity2.class);
98+
Intent inscriptionF = new Intent(InscriptionActivity.this, MainActivity.class);
9999
startActivity(inscriptionF);
100100
finish();
101101
}

app/src/main/java/com/ticandroid/baley_labeye/activities/MainActivity2.java renamed to app/src/main/java/com/ticandroid/baley_labeye/activities/MainActivity.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import com.google.android.gms.tasks.Task;
2020
import com.google.android.material.navigation.NavigationView;
2121
import com.google.firebase.auth.FirebaseAuth;
22-
import com.google.firebase.firestore.DocumentReference;
23-
import com.google.firebase.firestore.DocumentSnapshot;
2422
import com.google.firebase.firestore.FirebaseFirestore;
2523
import com.google.firebase.firestore.QueryDocumentSnapshot;
2624
import com.google.firebase.firestore.QuerySnapshot;
@@ -50,7 +48,7 @@
5048
import java.io.IOException;
5149

5250

53-
public class MainActivity2 extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
51+
public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener {
5452

5553
private transient TextView textView;
5654
private ImageView imageView;
@@ -75,7 +73,7 @@ public class MainActivity2 extends AppCompatActivity implements NavigationView.O
7573
@Override
7674
protected void onCreate(Bundle savedInstanceState) {
7775
super.onCreate(savedInstanceState);
78-
setContentView(R.layout.activity_main2);
76+
setContentView(R.layout.activity_main);
7977
auth = FirebaseAuth.getInstance();
8078
stm= FirebaseStorage.getInstance().getReference();
8179
this.configureNavigationView();
File renamed without changes.

0 commit comments

Comments
 (0)