+
+
+
+
+
+
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 00000000..e52c153e
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,61 @@
+language: android
+jdk: oraclejdk8
+
+env:
+ global:
+ - ANDROID_TARGET=android-22
+ - ANDROID_ABI=armeabi-v7a
+
+android:
+ components:
+ # Uncomment the lines below if you want to
+ # use the latest revision of Android SDK Tools
+ - tools
+ - platform-tools
+
+ # The BuildTools version used by your project
+ - build-tools-23.0.3
+
+ # The SDK version used to compile your project
+ # TODO: why is this here explicitly in addition to $ANDROID_TARGET below
+ - android-23
+
+ # Additional components
+ - extra-google-google_play_services
+ - extra-google-m2repository
+ - extra-android-m2repository
+
+ # The SDK version used to compile your project
+ - $ANDROID_TARGET
+
+ # Specify at least one system image,
+ # if you need to run emulator(s) during your tests.
+ # The line should look like this after interpolation:
+ # - sys-img-armeabi-v7a-android-22
+ - sys-img-${ANDROID_ABI}-${ANDROID_TARGET}
+
+licenses:
+ - 'android-sdk-license-.+'
+
+before_install:
+ # Accept sdk licenses
+ - yes | sdkmanager "platforms;android-29"
+
+ # Get gradle
+ - chmod +x gradlew
+ - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip
+ - unzip -qq gradle-5.3-bin.zip
+ - export GRADLE_HOME=$PWD/gradle-5.3
+ - export PATH=$GRADLE_HOME/bin:$PATH
+
+ # Build the project
+ - gradle -v
+
+ # Start the emulator
+ - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+ - emulator -avd test -no-skin -no-audio -no-window &
+ - android-wait-for-emulator
+ - adb shell input keyevent 82 &
+
+ # The app will now automatically be installed and tested via
+ # the command `gradle connectedCheck`
diff --git a/ListyCity.iml b/ListyCity.iml
new file mode 100644
index 00000000..307ea763
--- /dev/null
+++ b/ListyCity.iml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/app.iml b/app/app.iml
new file mode 100644
index 00000000..9975634a
--- /dev/null
+++ b/app/app.iml
@@ -0,0 +1,141 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ generateDebugSources
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/generated/source/buildConfig/androidTest/debug/com/example/simpleparadox/listycity/test/BuildConfig.java b/app/build/generated/source/buildConfig/androidTest/debug/com/example/simpleparadox/listycity/test/BuildConfig.java
new file mode 100644
index 00000000..4c655362
--- /dev/null
+++ b/app/build/generated/source/buildConfig/androidTest/debug/com/example/simpleparadox/listycity/test/BuildConfig.java
@@ -0,0 +1,13 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.example.simpleparadox.listycity.test;
+
+public final class BuildConfig {
+ public static final boolean DEBUG = Boolean.parseBoolean("true");
+ public static final String APPLICATION_ID = "com.example.simpleparadox.listycity.test";
+ public static final String BUILD_TYPE = "debug";
+ public static final String FLAVOR = "";
+ public static final int VERSION_CODE = 1;
+ public static final String VERSION_NAME = "1.0";
+}
diff --git a/app/build/generated/source/buildConfig/debug/com/example/simpleparadox/listycity/BuildConfig.java b/app/build/generated/source/buildConfig/debug/com/example/simpleparadox/listycity/BuildConfig.java
new file mode 100644
index 00000000..0c8cdc12
--- /dev/null
+++ b/app/build/generated/source/buildConfig/debug/com/example/simpleparadox/listycity/BuildConfig.java
@@ -0,0 +1,13 @@
+/**
+ * Automatically generated file. DO NOT MODIFY
+ */
+package com.example.simpleparadox.listycity;
+
+public final class BuildConfig {
+ public static final boolean DEBUG = Boolean.parseBoolean("true");
+ public static final String APPLICATION_ID = "com.example.simpleparadox.listycity";
+ public static final String BUILD_TYPE = "debug";
+ public static final String FLAVOR = "";
+ public static final int VERSION_CODE = 1;
+ public static final String VERSION_NAME = "1.0";
+}
diff --git a/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson b/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
new file mode 100644
index 00000000..eaec4687
--- /dev/null
+++ b/app/build/intermediates/apk_list/debug/mainApkListPersistenceDebug/apk-list.gson
@@ -0,0 +1 @@
+[{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"}]
\ No newline at end of file
diff --git a/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml b/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
new file mode 100644
index 00000000..9f286d0a
--- /dev/null
+++ b/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/AndroidManifest.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json b/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
new file mode 100644
index 00000000..b9d4f701
--- /dev/null
+++ b/app/build/intermediates/bundle_manifest/debug/processDebugManifest/bundle-manifest/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"BUNDLE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.example.simpleparadox.listycity","split":"","minSdkVersion":"15"}}]
\ No newline at end of file
diff --git a/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json b/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
new file mode 100644
index 00000000..0637a088
--- /dev/null
+++ b/app/build/intermediates/compatible_screen_manifest/debug/createDebugCompatibleScreenManifests/out/output.json
@@ -0,0 +1 @@
+[]
\ No newline at end of file
diff --git a/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml b/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
new file mode 100644
index 00000000..1271ccc9
--- /dev/null
+++ b/app/build/intermediates/instant_app_manifest/debug/AndroidManifest.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/intermediates/instant_app_manifest/debug/output.json b/app/build/intermediates/instant_app_manifest/debug/output.json
new file mode 100644
index 00000000..e5494a6a
--- /dev/null
+++ b/app/build/intermediates/instant_app_manifest/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"INSTANT_APP_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.example.simpleparadox.listycity","split":"","minSdkVersion":"15"}}]
\ No newline at end of file
diff --git a/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
new file mode 100644
index 00000000..bbd858bc
--- /dev/null
+++ b/app/build/intermediates/manifest_merge_blame_file/debug/manifest-merger-blame-debug-report.txt
@@ -0,0 +1,46 @@
+1
+2
+6
+7 D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+9 android:targetSdkVersion="29" />
+9-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+10
+11 D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:5:5-19:19
+12 android:allowBackup="true"
+12-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:6:9-35
+13 android:appComponentFactory="androidx.core.app.CoreComponentFactory"
+13-->[androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:22:18-86
+14 android:debuggable="true"
+15 android:icon="@mipmap/ic_launcher"
+15-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:7:9-43
+16 android:label="@string/app_name"
+16-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:8:9-41
+17 android:roundIcon="@mipmap/ic_launcher_round"
+17-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:9:9-54
+18 android:supportsRtl="true"
+18-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:10:9-35
+19 android:theme="@style/AppTheme" >
+19-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:11:9-40
+20
+20-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:12:9-18:20
+20-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:12:19-47
+21
+21-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:13:13-17:29
+22
+22-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:14:17-69
+22-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:14:25-66
+23
+24
+24-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:16:17-77
+24-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:16:27-74
+25
+26
+27
+28
+29
diff --git a/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
new file mode 100644
index 00000000..317a497b
--- /dev/null
+++ b/app/build/intermediates/manifest_merge_blame_file/debugAndroidTest/manifest-merger-blame-debug-androidTest-report.txt
@@ -0,0 +1,33 @@
+1
+2
+4
+5 D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:5:5-74
+6 android:minSdkVersion="15"
+6-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:5:15-41
+7 android:targetSdkVersion="29" />
+7-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:5:42-71
+8
+9 D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:11:5-15:85
+10 android:name="androidx.test.runner.AndroidJUnitRunner"
+10-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:11:22-76
+11 android:functionalTest="false"
+11-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:14:22-52
+12 android:handleProfiling="false"
+12-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:13:22-53
+13 android:label="Tests for com.example.simpleparadox.listycity"
+13-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:15:22-83
+14 android:targetPackage="com.example.simpleparadox.listycity" />
+14-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:12:22-81
+15
+16
+16-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:7:5-9:19
+16-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:7:18-43
+17
+17-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:8:9-60
+17-->D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\build\intermediates\tmp\manifest\androidTest\debug\manifestMerger7911735986794852901.xml:8:23-57
+18
+19
+20
diff --git a/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
new file mode 100644
index 00000000..9f286d0a
--- /dev/null
+++ b/app/build/intermediates/merged_manifests/debug/AndroidManifest.xml
@@ -0,0 +1,29 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/intermediates/merged_manifests/debug/output.json b/app/build/intermediates/merged_manifests/debug/output.json
new file mode 100644
index 00000000..d69ebc5a
--- /dev/null
+++ b/app/build/intermediates/merged_manifests/debug/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{"packageId":"com.example.simpleparadox.listycity","split":"","minSdkVersion":"15"}}]
\ No newline at end of file
diff --git a/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml b/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
new file mode 100644
index 00000000..d901a7f0
--- /dev/null
+++ b/app/build/intermediates/merged_manifests/debugAndroidTest/AndroidManifest.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build/intermediates/merged_manifests/debugAndroidTest/output.json b/app/build/intermediates/merged_manifests/debugAndroidTest/output.json
new file mode 100644
index 00000000..480c8cad
--- /dev/null
+++ b/app/build/intermediates/merged_manifests/debugAndroidTest/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"MERGED_MANIFESTS"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug-androidTest.apk","fullName":"debugAndroidTest","baseName":"debug-androidTest"},"path":"AndroidManifest.xml","properties":{}}]
\ No newline at end of file
diff --git a/app/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json b/app/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
new file mode 100644
index 00000000..5875ae57
--- /dev/null
+++ b/app/build/intermediates/metadata_feature_manifest/debug/processDebugManifest/metadata-feature/output.json
@@ -0,0 +1 @@
+[{"outputType":{"type":"METADATA_FEATURE_MANIFEST"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"1.0","enabled":true,"outputFile":"app-debug.apk","fullName":"debug","baseName":"debug"},"path":"AndroidManifest.xml","properties":{}}]
\ No newline at end of file
diff --git a/app/build/outputs/logs/manifest-merger-debug-report.txt b/app/build/outputs/logs/manifest-merger-debug-report.txt
new file mode 100644
index 00000000..4a44af6b
--- /dev/null
+++ b/app/build/outputs/logs/manifest-merger-debug-report.txt
@@ -0,0 +1,154 @@
+-- Merging decision tree log ---
+manifest
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+MERGED from [androidx.appcompat:appcompat:1.0.2] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f6a183f8595ca34f3d5cc99d1f8bc322\appcompat-1.0.2\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8392647ca9531c13a8f0d6b7ad086e7e\constraintlayout-1.1.3\AndroidManifest.xml:2:1-11:12
+MERGED from [androidx.fragment:fragment:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\4f37a040d795d0eef135b10b20545e3f\fragment-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d382ba9b8c9ea9d7b43a9cfaea0ecdf4\vectordrawable-animated-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\abc680e55824c418c024460e31034ed4\legacy-support-core-ui-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\ba2af06f417607d7ef1ca9f201a0d139\legacy-support-core-utils-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\324a702de98e8e0560de88ae82ee3427\vectordrawable-1.0.1\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\331f61861c2d3a925f2252286afb1f53\loader-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f3997ce16a5c00ae84a772d300d0e1e8\viewpager-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\04087833f388d5ffa97a080d757646c2\coordinatorlayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\34085af895daa23049fd0af188e6a001\drawerlayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\eb11c4797d5d5b24d5dcbbebe26babf4\slidingpanelayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\740a70a0c89c8c085b6e012b4bd7790e\customview-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\31dc29ba3158cee4b1ca2bf2f6ff141b\swiperefreshlayout-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\435f1166e6a428a0025d9cd273cb35a2\asynclayoutinflater-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:17:1-24:12
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\07608d1ce0a2b5e25216bbe877b06158\versionedparcelable-1.0.0\AndroidManifest.xml:17:1-25:12
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\aa91d8d2653c363bbd5da9d9892260d3\cursoradapter-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\684c19030ab34291fff8f6b761838da8\lifecycle-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9d52be8c254a228a91eaf05f51d52923\documentfile-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9093771a98b01557e81860f4122d7892\localbroadcastmanager-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.print:print:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\7ec682ca46f5c90ea9a9e0cba0c0310a\print-1.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\85b59553d84ac8d04663d7d81848664c\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\420f294924962582b4c42c622af43461\lifecycle-livedata-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\66e997bde0b6ece28f7fd36f5f4a1584\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8787729f29cf7add1bc29c81caccddfd\core-runtime-2.0.0\AndroidManifest.xml:17:1-22:12
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d4ef17d609918d2a5f5a86d1ea02678f\interpolator-1.0.0\AndroidManifest.xml:17:1-22:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+ package
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:3:5-50
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ android:versionName
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ android:versionCode
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:1-21:12
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ xmlns:android
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:2:11-69
+application
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:5:5-19:19
+MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8392647ca9531c13a8f0d6b7ad086e7e\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20
+MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8392647ca9531c13a8f0d6b7ad086e7e\constraintlayout-1.1.3\AndroidManifest.xml:9:5-20
+MERGED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:22:5-89
+MERGED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:22:5-89
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\07608d1ce0a2b5e25216bbe877b06158\versionedparcelable-1.0.0\AndroidManifest.xml:22:5-23:19
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\07608d1ce0a2b5e25216bbe877b06158\versionedparcelable-1.0.0\AndroidManifest.xml:22:5-23:19
+ android:appComponentFactory
+ ADDED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:22:18-86
+ android:supportsRtl
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:10:9-35
+ android:label
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:8:9-41
+ android:roundIcon
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:9:9-54
+ android:icon
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:7:9-43
+ android:allowBackup
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:6:9-35
+ android:theme
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:11:9-40
+activity#com.example.simpleparadox.listycity.MainActivity
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:12:9-18:20
+ android:name
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:12:19-47
+intent-filter#action:name:android.intent.action.MAIN+category:name:android.intent.category.LAUNCHER
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:13:13-17:29
+action#android.intent.action.MAIN
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:14:17-69
+ android:name
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:14:25-66
+category#android.intent.category.LAUNCHER
+ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:16:17-77
+ android:name
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml:16:27-74
+uses-sdk
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml reason: use-sdk injection requested
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+MERGED from [androidx.appcompat:appcompat:1.0.2] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f6a183f8595ca34f3d5cc99d1f8bc322\appcompat-1.0.2\AndroidManifest.xml:20:5-44
+MERGED from [androidx.appcompat:appcompat:1.0.2] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f6a183f8595ca34f3d5cc99d1f8bc322\appcompat-1.0.2\AndroidManifest.xml:20:5-44
+MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8392647ca9531c13a8f0d6b7ad086e7e\constraintlayout-1.1.3\AndroidManifest.xml:5:5-7:41
+MERGED from [androidx.constraintlayout:constraintlayout:1.1.3] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8392647ca9531c13a8f0d6b7ad086e7e\constraintlayout-1.1.3\AndroidManifest.xml:5:5-7:41
+MERGED from [androidx.fragment:fragment:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\4f37a040d795d0eef135b10b20545e3f\fragment-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.fragment:fragment:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\4f37a040d795d0eef135b10b20545e3f\fragment-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d382ba9b8c9ea9d7b43a9cfaea0ecdf4\vectordrawable-animated-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.vectordrawable:vectordrawable-animated:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d382ba9b8c9ea9d7b43a9cfaea0ecdf4\vectordrawable-animated-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\abc680e55824c418c024460e31034ed4\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-ui:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\abc680e55824c418c024460e31034ed4\legacy-support-core-ui-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\ba2af06f417607d7ef1ca9f201a0d139\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.legacy:legacy-support-core-utils:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\ba2af06f417607d7ef1ca9f201a0d139\legacy-support-core-utils-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\324a702de98e8e0560de88ae82ee3427\vectordrawable-1.0.1\AndroidManifest.xml:20:5-44
+MERGED from [androidx.vectordrawable:vectordrawable:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\324a702de98e8e0560de88ae82ee3427\vectordrawable-1.0.1\AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\331f61861c2d3a925f2252286afb1f53\loader-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.loader:loader:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\331f61861c2d3a925f2252286afb1f53\loader-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f3997ce16a5c00ae84a772d300d0e1e8\viewpager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.viewpager:viewpager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\f3997ce16a5c00ae84a772d300d0e1e8\viewpager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\04087833f388d5ffa97a080d757646c2\coordinatorlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.coordinatorlayout:coordinatorlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\04087833f388d5ffa97a080d757646c2\coordinatorlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\34085af895daa23049fd0af188e6a001\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.drawerlayout:drawerlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\34085af895daa23049fd0af188e6a001\drawerlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\eb11c4797d5d5b24d5dcbbebe26babf4\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.slidingpanelayout:slidingpanelayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\eb11c4797d5d5b24d5dcbbebe26babf4\slidingpanelayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\740a70a0c89c8c085b6e012b4bd7790e\customview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.customview:customview:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\740a70a0c89c8c085b6e012b4bd7790e\customview-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\31dc29ba3158cee4b1ca2bf2f6ff141b\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.swiperefreshlayout:swiperefreshlayout:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\31dc29ba3158cee4b1ca2bf2f6ff141b\swiperefreshlayout-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\435f1166e6a428a0025d9cd273cb35a2\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.asynclayoutinflater:asynclayoutinflater:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\435f1166e6a428a0025d9cd273cb35a2\asynclayoutinflater-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:20:5-44
+MERGED from [androidx.core:core:1.0.1] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\72b2b92ec4ab73ff21fb9bc348de3b22\core-1.0.1\AndroidManifest.xml:20:5-44
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\07608d1ce0a2b5e25216bbe877b06158\versionedparcelable-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.versionedparcelable:versionedparcelable:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\07608d1ce0a2b5e25216bbe877b06158\versionedparcelable-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\aa91d8d2653c363bbd5da9d9892260d3\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.cursoradapter:cursoradapter:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\aa91d8d2653c363bbd5da9d9892260d3\cursoradapter-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\684c19030ab34291fff8f6b761838da8\lifecycle-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\684c19030ab34291fff8f6b761838da8\lifecycle-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9d52be8c254a228a91eaf05f51d52923\documentfile-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.documentfile:documentfile:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9d52be8c254a228a91eaf05f51d52923\documentfile-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9093771a98b01557e81860f4122d7892\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.localbroadcastmanager:localbroadcastmanager:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\9093771a98b01557e81860f4122d7892\localbroadcastmanager-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\7ec682ca46f5c90ea9a9e0cba0c0310a\print-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.print:print:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\7ec682ca46f5c90ea9a9e0cba0c0310a\print-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\85b59553d84ac8d04663d7d81848664c\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-viewmodel:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\85b59553d84ac8d04663d7d81848664c\lifecycle-viewmodel-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\420f294924962582b4c42c622af43461\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\420f294924962582b4c42c622af43461\lifecycle-livedata-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\66e997bde0b6ece28f7fd36f5f4a1584\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.lifecycle:lifecycle-livedata-core:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\66e997bde0b6ece28f7fd36f5f4a1584\lifecycle-livedata-core-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8787729f29cf7add1bc29c81caccddfd\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.arch.core:core-runtime:2.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\8787729f29cf7add1bc29c81caccddfd\core-runtime-2.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d4ef17d609918d2a5f5a86d1ea02678f\interpolator-1.0.0\AndroidManifest.xml:20:5-44
+MERGED from [androidx.interpolator:interpolator:1.0.0] C:\Users\jhans\.gradle\caches\transforms-2\files-2.1\d4ef17d609918d2a5f5a86d1ea02678f\interpolator-1.0.0\AndroidManifest.xml:20:5-44
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ android:targetSdkVersion
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ android:minSdkVersion
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ ADDED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
+ INJECTED from D:\School\fall2019\cmput301\listycity7\Lab-8-Template-Monday\app\src\main\AndroidManifest.xml
diff --git a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
index 787eab7e..2272de99 100644
--- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
+++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java
@@ -29,6 +29,18 @@ void testAdd() {
assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan")));
}
+ @Test
+ void testAdd2() {
+ CityList cityList = mockCityList();
+
+ assertEquals(1, cityList.countCities());
+
+ cityList.add(new City("Regina", "Saskatchewan"));
+
+ assertEquals(2, cityList.countCities());
+ assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan")));
+ }
+
@Test
void testAddException() {
CityList cityList = mockCityList();
diff --git a/local.properties b/local.properties
new file mode 100644
index 00000000..8febf248
--- /dev/null
+++ b/local.properties
@@ -0,0 +1,8 @@
+## This file must *NOT* be checked into Version Control Systems,
+# as it contains information specific to your local configuration.
+#
+# Location of the SDK. This is only used by Gradle.
+# For customization when using a Version Control System, please read the
+# header note.
+#Mon Oct 28 17:25:06 MDT 2019
+sdk.dir=C\:\\Users\\jhans\\AppData\\Local\\Android\\Sdk