Merge pull request #44 from CSE-110-Winter-2023/US-12a

US-12A push to main
CSE-110-Winter-2023 · Mar 5, 2023 · d96b29a · d96b29a
2 parents de51679 + 71d737b
commit d96b29a
Show file tree

Hide file tree

Showing 22 changed files with 382 additions and 871 deletions.
diff --git a/.idea/androidTestResultsUserPreferences.xml b/.idea/androidTestResultsUserPreferences.xml
diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -0,0 +1,20 @@
+{
+  "version": 3,
+  "artifactType": {
+    "type": "APK",
+    "kind": "Directory"
+  },
+  "applicationId": "com.example.demo5",
+  "variantName": "release",
+  "elements": [
+    {
+      "type": "SINGLE",
+      "filters": [],
+      "attributes": [],
+      "versionCode": 1,
+      "versionName": "1.0",
+      "outputFile": "app-release.apk"
+    }
+  ],
+  "elementType": "File"
+}
diff --git a/app/src/androidTest/java/com/example/demo5/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/demo5/ExampleInstrumentedTest.java
diff --git a/app/src/androidTest/java/com/example/demo5/MainActivityTest.java b/app/src/androidTest/java/com/example/demo5/MainActivityTest.java
@@ -37,7 +37,7 @@ public void mainActivityTest() {
                         childAtPosition(
                                 childAtPosition(
                                         withId(android.R.id.content),
-                                        0),
+                                        2),
                                 2),
                         isDisplayed()));
         appCompatEditText.perform(replaceText("my parent's house"), closeSoftKeyboard());

diff --git a/app/src/androidTest/java/com/example/demo5/ParentHouseLocationTest.java b/app/src/androidTest/java/com/example/demo5/ParentHouseLocationTest.java