Commit 5a23425f authored by Ethan Liang's avatar Ethan Liang
Browse files

Merge branch 'top-secret' of... 

Merge branch 'top-secret' of https://agile.bu.edu/gitlab/ec327_projects/group7project into top-secret

 Conflicts:
	.gradle/7.5/executionHistory/executionHistory.bin
	.gradle/7.5/executionHistory/executionHistory.lock
	.gradle/7.5/fileHashes/fileHashes.bin
	.gradle/7.5/fileHashes/fileHashes.lock
	.gradle/7.5/fileHashes/resourceHashesCache.bin
	.gradle/buildOutputCleanup/buildOutputCleanup.lock
	.gradle/buildOutputCleanup/outputFiles.bin
	.gradle/file-system.probe
	local.properties
parents d9240537 81e123d3

.gradle/7.5/checksums/checksums.lock

(17 B)

File changed.

No diff preview for this file type.

View original file
View changed file

.idea/deploymentTargetDropDown.xml

0 → 100644
+17 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="deploymentTargetDropDown">

    <targetSelectedWithDropDown>

      <Target>

        <type value="QUICK_BOOT_TARGET" />

        <deviceKey>

          <Key>

            <type value="VIRTUAL_DEVICE_PATH" />

            <value value="$USER_HOME$/.android/avd/Pixel_4_API_UpsideDownCake.avd" />

          </Key>

        </deviceKey>

      </Target>

    </targetSelectedWithDropDown>

    <timeTargetWasSelectedWithDropDown value="2023-04-26T14:10:17.777276Z" />

  </component>

</project>
 
 No newline at end of file

.idea/jarRepositories.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<project version="4">

  <component name="RemoteRepositoriesConfiguration">

    <remote-repository>

      <option name="id" value="central" />

      <option name="name" value="Maven Central repository" />

      <option name="url" value="https://repo1.maven.org/maven2" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="jboss.community" />

      <option name="name" value="JBoss Community repository" />

      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="MavenRepo" />

      <option name="name" value="MavenRepo" />

      <option name="url" value="https://repo.maven.apache.org/maven2/" />

    </remote-repository>

    <remote-repository>

      <option name="id" value="Google" />

      <option name="name" value="Google" />

      <option name="url" value="https://dl.google.com/dl/android/maven2/" />

    </remote-repository>

  </component>

</project>
 
 No newline at end of file

app/build.gradle

+7 −0
Original line number Diff line number Diff line 
plugins {

    id 'com.android.application'

    id 'com.google.gms.google-services'

}



android {
@@ -33,7 +34,13 @@ dependencies { 
    implementation 'androidx.appcompat:appcompat:1.4.1'

    implementation 'com.google.android.material:material:1.5.0'

    implementation 'androidx.constraintlayout:constraintlayout:2.1.3'

    implementation 'com.google.firebase:firebase-database:20.0.4'

    testImplementation 'junit:junit:4.13.2'

    androidTestImplementation 'androidx.test.ext:junit:1.1.3'

    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'



    //*

    implementation platform('com.google.firebase:firebase-bom:31.5.0')

    implementation 'com.google.firebase:firebase-analytics'

    implementation 'com.google.firebase:firebase-firestore'

}
 
 No newline at end of file

app/google-services.json

0 → 100644
+39 −0
Original line number Diff line number Diff line 
{

  "project_info": {

    "project_number": "551014678657",

    "project_id": "ec327-sim",

    "storage_bucket": "ec327-sim.appspot.com"

  },

  "client": [

    {

      "client_info": {

        "mobilesdk_app_id": "1:551014678657:android:109b6d60426393a27fcd80",

        "android_client_info": {

          "package_name": "com.example.game2d"

        }

      },

      "oauth_client": [

        {

          "client_id": "551014678657-8bt1a5b2sq41b9p84mqjfg2i5km4c95s.apps.googleusercontent.com",

          "client_type": 3

        }

      ],

      "api_key": [

        {

          "current_key": "AIzaSyAua6mz_2clTtzz44hfAzUHW7-S8C0r8Ow"

        }

      ],

      "services": {

        "appinvite_service": {

          "other_platform_oauth_client": [

            {

              "client_id": "551014678657-8bt1a5b2sq41b9p84mqjfg2i5km4c95s.apps.googleusercontent.com",

              "client_type": 3

            }

          ]

        }

      }

    }

  ],

  "configuration_version": "1"

}
 
 No newline at end of file