Fixing merge conflict part 2

SCCapstone · Apr 3, 2023 · ba27d15 · ba27d15
1 parent 031e612
commit ba27d15
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -51,6 +51,7 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.3.0'
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.4.1'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1'
+    implementation 'com.google.firebase:firebase-database:20.1.0'
 //Firebase Firestore(database) library
 
     // UI Testing Dependencies
@@ -71,6 +72,7 @@ dependencies {
     // When using the BoM, you don't specify versions in Firebase library dependencies
     implementation 'com.google.firebase:firebase-auth'
 
+
     // Also add the dependency for the Google Play services library and specify its version
     implementation 'com.google.android.gms:play-services-auth:20.4.1'
 }
diff --git a/app/src/main/java/com/example/bored_bard/UI_files/campaign_activity.java b/app/src/main/java/com/example/bored_bard/UI_files/campaign_activity.java
@@ -38,9 +38,8 @@ public class campaign_activity extends AppCompatActivity {
     private RecyclerView RV;
     private RecyclerView.Adapter adapter;
     private RecyclerView.LayoutManager layoutManager;
-    private RecyclerView RV;
-    private RecyclerView.Adapter adapter;
-    private RecyclerView.LayoutManager layoutManager;
+
+
     FirebaseAuth auth;
     FirebaseUser user;
     TextView textView;
@@ -52,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) {
         auth = FirebaseAuth.getInstance();
         user = auth.getCurrentUser();
         textView = findViewById(R.id.username);
-        button = findViewById(R.id.btn_logout);
+
 
         if (user == null){
             Intent intent = new Intent(getApplicationContext(), google_signin_activity.class);
@@ -63,13 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
             textView.setText(user.getEmail());
         }
 
-        button.setOnClickListener(view -> {
-            FirebaseAuth.getInstance().signOut();
-            Intent intent = new Intent(getApplicationContext(), google_signin_activity.class);
-            startActivity(intent);
-            finish();
-        });
-
 
 
         BottomNavigationView bottomNavView = findViewById(R.id.bottom_nav);

diff --git a/app/src/main/res/layout/main_campaigns_screen.xml b/app/src/main/res/layout/main_campaigns_screen.xml
@@ -193,18 +193,7 @@
         app:layout_constraintEnd_toEndOf="@id/guideline_right"
         app:layout_constraintTop_toBottomOf="@id/campaigns"
         app:srcCompat="@android:drawable/ic_input_add" />
-    <Button
-        android:id="@+id/btn_logout"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="160dp"
-        android:layout_marginTop="448dp"
-        android:text="@string/logout"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:ignore="MissingConstraints" />
+
 
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/settings_screen.xml b/app/src/main/res/layout/settings_screen.xml
@@ -119,7 +119,7 @@
             android:background="@color/darkblushPink"/>
 
         <Button
-            android:id="@+id/toLogout"
+            android:id="@+id/logout"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -62,4 +62,36 @@
     <string name="Email" />
     <string name="disadv" />
     <string name="adv" />
+    <string name="encyclopedia">Encyclopedia</string>
+    <string name="new_campaign">New Campaign</string>
+    <string name="override_me">Override Me</string>
+    <string name="title_of_campaign">Title of Campaign</string>
+    <string name="edit_characters">Edit Characters</string>
+    <string name="players">Players</string>
+    <string name="your_players">Your Players</string>
+    <string name="add_new_character">Add new character</string>
+    <string name="submit_new_character">submit New character</string>
+    <string name="name">Name</string>
+    <string name="race">Race (Orc, Human, Halfing…)</string>
+    <string name="class_">Class (Fighter, Cleric, Barbarian…)</string>
+    <string name="update_character">Update Character</string>
+    <string name="add_new_campaign">Add new campaign</string>
+    <string name="number_of_players">Number of Players:</string>
+    <string name="save_campaign">Save campaign</string>
+    <string name="short_campaign_bio">Short Campaign Bio</string>
+    <string name="type">Type (NPC or PC)</string>
+    <string name="return_to_list_of_players">Return to List of Players</string>
+    <string name="race_">Race</string>
+    <string name="class__">Class</string>
+    <string name="type_">Type</string>
+
+
+
+
+
+
+
+
+
+
 </resources>