From dacd45d94c8dc10bf51f15cf459bc2dfc43868a4 Mon Sep 17 00:00:00 2001 From: LijiangnanTian <46389083+LijiangnanTian@users.noreply.github.com> Date: Tue, 10 Mar 2020 17:34:09 -0600 Subject: [PATCH 1/3] Update .travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index e52c153e..d602da97 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,7 +43,7 @@ before_install: # Get gradle - chmod +x gradlew - - wget http://services.gradle.org/distributions/gradle-5.3-bin.zip + - wget https://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 From 98dc618bff823b5e76cb61c65a1c14086a96dd36 Mon Sep 17 00:00:00 2001 From: Tian Date: Tue, 10 Mar 2020 17:48:43 -0600 Subject: [PATCH 2/3] Test Driven Development --- .gradle/5.4.1/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/5.4.1/fileHashes/fileHashes.bin | Bin 0 -> 18547 bytes .gradle/5.4.1/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/5.4.1/gc.properties | 0 .gradle/5.6.4/fileChanges/last-build.bin | Bin 0 -> 1 bytes .gradle/5.6.4/fileHashes/fileHashes.bin | Bin 0 -> 18547 bytes .gradle/5.6.4/fileHashes/fileHashes.lock | Bin 0 -> 17 bytes .gradle/5.6.4/gc.properties | 0 .../buildOutputCleanup.lock | Bin 0 -> 17 bytes .gradle/buildOutputCleanup/cache.properties | 2 + .gradle/buildOutputCleanup/outputFiles.bin | Bin 0 -> 22439 bytes .gradle/vcs-1/gc.properties | 0 .idea/.gitignore | 2 + .idea/.name | 1 + .idea/caches/build_file_checksums.ser | Bin 0 -> 534 bytes .idea/codeStyles/Project.xml | 116 +++++++++++++++ .idea/gradle.xml | 19 +++ ...droidx_annotation_annotation_1_0_0_jar.xml | 13 ++ ...androidx_appcompat_appcompat_1_0_2_aar.xml | 15 ++ ...droidx_arch_core_core_common_2_0_0_jar.xml | 11 ++ ...roidx_arch_core_core_runtime_2_0_0_aar.xml | 12 ++ ...inflater_asynclayoutinflater_1_0_0_aar.xml | 12 ++ ...droidx_collection_collection_1_0_0_jar.xml | 11 ++ ...raintlayout_constraintlayout_1_1_3_aar.xml | 10 ++ ...yout_constraintlayout_solver_1_1_3_jar.xml | 9 ++ ...atorlayout_coordinatorlayout_1_0_0_aar.xml | 15 ++ .../Gradle__androidx_core_core_1_0_1_aar.xml | 15 ++ ..._cursoradapter_cursoradapter_1_0_0_aar.xml | 12 ++ ...droidx_customview_customview_1_0_0_aar.xml | 12 ++ ...dx_documentfile_documentfile_1_0_0_aar.xml | 12 ++ ...dx_drawerlayout_drawerlayout_1_0_0_aar.xml | 15 ++ ...__androidx_fragment_fragment_1_0_0_aar.xml | 15 ++ ...dx_interpolator_interpolator_1_0_0_aar.xml | 12 ++ ...egacy_legacy_support_core_ui_1_0_0_aar.xml | 12 ++ ...cy_legacy_support_core_utils_1_0_0_aar.xml | 12 ++ ...x_lifecycle_lifecycle_common_2_0_0_jar.xml | 11 ++ ...lifecycle_lifecycle_livedata_2_0_0_aar.xml | 12 ++ ...ycle_lifecycle_livedata_core_2_0_0_aar.xml | 12 ++ ..._lifecycle_lifecycle_runtime_2_0_0_aar.xml | 12 ++ ...ifecycle_lifecycle_viewmodel_2_0_0_aar.xml | 12 ++ ...adle__androidx_loader_loader_1_0_0_aar.xml | 12 ++ ...anager_localbroadcastmanager_1_0_0_aar.xml | 12 ++ ...Gradle__androidx_print_print_1_0_0_aar.xml | 15 ++ ...panelayout_slidingpanelayout_1_0_0_aar.xml | 12 ++ ...eshlayout_swiperefreshlayout_1_0_0_aar.xml | 15 ++ ..._test_espresso_espresso_core_3_1_1_aar.xml | 14 ++ ...sso_espresso_idling_resource_3_1_1_aar.xml | 14 ++ ...radle__androidx_test_monitor_1_1_1_aar.xml | 14 ++ ...Gradle__androidx_test_runner_1_1_1_aar.xml | 14 ++ ...ectordrawable_vectordrawable_1_0_1_aar.xml | 12 ++ ...able_vectordrawable_animated_1_0_0_aar.xml | 12 ++ ...rcelable_versionedparcelable_1_0_0_aar.xml | 12 ++ ...androidx_viewpager_viewpager_1_0_0_aar.xml | 12 ++ ..._google_code_findbugs_jsr305_2_0_1_jar.xml | 9 ++ ...dle__com_squareup_javawriter_2_1_1_jar.xml | 13 ++ ...radle__javax_inject_javax_inject_1_jar.xml | 13 ++ .../Gradle__junit_junit_4_12_jar.xml | 13 ++ .../Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml | 13 ++ ..._apiguardian_apiguardian_api_1_0_0_jar.xml | 13 ++ ...le__org_hamcrest_hamcrest_core_1_3_jar.xml | 13 ++ ..._hamcrest_hamcrest_integration_1_3_jar.xml | 13 ++ ..._org_hamcrest_hamcrest_library_1_3_jar.xml | 13 ++ ...it_jupiter_junit_jupiter_api_5_3_1_jar.xml | 13 ++ ...tform_junit_platform_commons_1_3_1_jar.xml | 13 ++ ...e__org_opentest4j_opentest4j_1_1_1_jar.xml | 13 ++ .idea/misc.xml | 24 +++ .idea/modules.xml | 9 ++ .idea/runConfigurations.xml | 12 ++ .idea/vcs.xml | 6 + ListyCity.iml | 19 +++ app/app.iml | 139 ++++++++++++++++++ .../simpleparadox/listycity/CityList.java | 7 + .../simpleparadox/listycity/CityListTest.java | 12 ++ build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 12 +- local.properties | 8 + 76 files changed, 989 insertions(+), 7 deletions(-) create mode 100644 .gradle/5.4.1/fileChanges/last-build.bin create mode 100644 .gradle/5.4.1/fileHashes/fileHashes.bin create mode 100644 .gradle/5.4.1/fileHashes/fileHashes.lock create mode 100644 .gradle/5.4.1/gc.properties create mode 100644 .gradle/5.6.4/fileChanges/last-build.bin create mode 100644 .gradle/5.6.4/fileHashes/fileHashes.bin create mode 100644 .gradle/5.6.4/fileHashes/fileHashes.lock create mode 100644 .gradle/5.6.4/gc.properties create mode 100644 .gradle/buildOutputCleanup/buildOutputCleanup.lock create mode 100644 .gradle/buildOutputCleanup/cache.properties create mode 100644 .gradle/buildOutputCleanup/outputFiles.bin create mode 100644 .gradle/vcs-1/gc.properties create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/gradle.xml create mode 100644 .idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml create mode 100644 .idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml create mode 100644 .idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml create mode 100644 .idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml create mode 100644 .idea/libraries/Gradle__junit_junit_4_12_jar.xml create mode 100644 .idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml create mode 100644 .idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml create mode 100644 .idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml create mode 100644 .idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml create mode 100644 .idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 ListyCity.iml create mode 100644 app/app.iml create mode 100644 local.properties diff --git a/.gradle/5.4.1/fileChanges/last-build.bin b/.gradle/5.4.1/fileChanges/last-build.bin new file mode 100644 index 0000000000000000000000000000000000000000..f76dd238ade08917e6712764a16a22005a50573d GIT binary patch literal 1 IcmZPo000310RR91 literal 0 HcmV?d00001 diff --git a/.gradle/5.4.1/fileHashes/fileHashes.bin b/.gradle/5.4.1/fileHashes/fileHashes.bin new file mode 100644 index 0000000000000000000000000000000000000000..4eb510362df120bb966609fc24c541164f8d7b1b GIT binary patch literal 18547 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 DytFzN literal 0 HcmV?d00001 diff --git a/.gradle/vcs-1/gc.properties b/.gradle/vcs-1/gc.properties new file mode 100644 index 00000000..e69de29b diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..5c98b428 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml \ No newline at end of file diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 00000000..cb67bab4 --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +ListyCity \ No newline at end of file diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..862fa0c64eea139137634fe9b31d47316c48ca24 GIT binary patch literal 534 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE75VtLuXIpfU_r@9gb zo+MC+!R&=AO#AAv?`cVkCs&8SoQqlS?w2qKGSxgfSo}N(CEa10)6c6sEd^PvPJ4$`Rc79x;BmK%oPB3 CjJjC> literal 0 HcmV?d00001 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 00000000..681f41ae --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,116 @@ + + + + + + + +
+ + + + xmlns:android + + ^$ + + + +
+
+ + + + xmlns:.* + + ^$ + + + BY_NAME + +
+
+ + + + .*:id + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + .*:name + + http://schemas.android.com/apk/res/android + + + +
+
+ + + + name + + ^$ + + + +
+
+ + + + style + + ^$ + + + +
+
+ + + + .* + + ^$ + + + BY_NAME + +
+
+ + + + .* + + http://schemas.android.com/apk/res/android + + + ANDROID_ATTRIBUTE_ORDER + +
+
+ + + + .* + + .* + + + BY_NAME + +
+ + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 00000000..440480e5 --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml new file mode 100644 index 00000000..37407517 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml new file mode 100644 index 00000000..407ca61f --- /dev/null +++ b/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml new file mode 100644 index 00000000..83e1a45b --- /dev/null +++ b/.idea/libraries/Gradle__androidx_arch_core_core_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml new file mode 100644 index 00000000..725cefee --- /dev/null +++ b/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml new file mode 100644 index 00000000..26e789bd --- /dev/null +++ b/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml new file mode 100644 index 00000000..2fee65b9 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_collection_collection_1_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml new file mode 100644 index 00000000..9d18c990 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml new file mode 100644 index 00000000..f92fb426 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_solver_1_1_3_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml new file mode 100644 index 00000000..d622cdb5 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml b/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml new file mode 100644 index 00000000..c16cb3f8 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml new file mode 100644 index 00000000..ef114428 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml new file mode 100644 index 00000000..f29a9980 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml new file mode 100644 index 00000000..cdedcb42 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml new file mode 100644 index 00000000..6c317919 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml new file mode 100644 index 00000000..00f5f1ce --- /dev/null +++ b/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml new file mode 100644 index 00000000..2f1959ce --- /dev/null +++ b/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml new file mode 100644 index 00000000..acd4c1b7 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml new file mode 100644 index 00000000..f3b3dfbf --- /dev/null +++ b/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml new file mode 100644 index 00000000..f2e418b7 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_common_2_0_0_jar.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml new file mode 100644 index 00000000..8961b532 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml new file mode 100644 index 00000000..a81b3d16 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml new file mode 100644 index 00000000..156d971c --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml new file mode 100644 index 00000000..14362ba8 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_viewmodel_2_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml new file mode 100644 index 00000000..c8ad8001 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_loader_loader_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml new file mode 100644 index 00000000..98b64593 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_localbroadcastmanager_localbroadcastmanager_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml new file mode 100644 index 00000000..7322eb45 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_print_print_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml new file mode 100644 index 00000000..b11a6ec5 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_slidingpanelayout_slidingpanelayout_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml new file mode 100644 index 00000000..40b91b22 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_swiperefreshlayout_swiperefreshlayout_1_0_0_aar.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml new file mode 100644 index 00000000..2b6cc60e --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_core_3_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml new file mode 100644 index 00000000..80e01234 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_espresso_espresso_idling_resource_3_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml new file mode 100644 index 00000000..60a7218d --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_monitor_1_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml new file mode 100644 index 00000000..a9aa2a86 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_test_runner_1_1_1_aar.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml new file mode 100644 index 00000000..cdb5eb4f --- /dev/null +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_1_0_1_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml new file mode 100644 index 00000000..30495264 --- /dev/null +++ b/.idea/libraries/Gradle__androidx_vectordrawable_vectordrawable_animated_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml new file mode 100644 index 00000000..f6734d7f --- /dev/null +++ b/.idea/libraries/Gradle__androidx_versionedparcelable_versionedparcelable_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml new file mode 100644 index 00000000..a33bd3bf --- /dev/null +++ b/.idea/libraries/Gradle__androidx_viewpager_viewpager_1_0_0_aar.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml new file mode 100644 index 00000000..947e2512 --- /dev/null +++ b/.idea/libraries/Gradle__com_google_code_findbugs_jsr305_2_0_1_jar.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml new file mode 100644 index 00000000..f97c138c --- /dev/null +++ b/.idea/libraries/Gradle__com_squareup_javawriter_2_1_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml new file mode 100644 index 00000000..5ac7d7b4 --- /dev/null +++ b/.idea/libraries/Gradle__javax_inject_javax_inject_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__junit_junit_4_12_jar.xml b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml new file mode 100644 index 00000000..24e5b72d --- /dev/null +++ b/.idea/libraries/Gradle__junit_junit_4_12_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml new file mode 100644 index 00000000..ddd26354 --- /dev/null +++ b/.idea/libraries/Gradle__net_sf_kxml_kxml2_2_3_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml b/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml new file mode 100644 index 00000000..ed00dd42 --- /dev/null +++ b/.idea/libraries/Gradle__org_apiguardian_apiguardian_api_1_0_0_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml new file mode 100644 index 00000000..6b1e2e76 --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_core_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml new file mode 100644 index 00000000..a8015c9b --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_integration_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml new file mode 100644 index 00000000..00bb125e --- /dev/null +++ b/.idea/libraries/Gradle__org_hamcrest_hamcrest_library_1_3_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml new file mode 100644 index 00000000..6913f786 --- /dev/null +++ b/.idea/libraries/Gradle__org_junit_jupiter_junit_jupiter_api_5_3_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml new file mode 100644 index 00000000..8db4ce51 --- /dev/null +++ b/.idea/libraries/Gradle__org_junit_platform_junit_platform_commons_1_3_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml b/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml new file mode 100644 index 00000000..4a5344bb --- /dev/null +++ b/.idea/libraries/Gradle__org_opentest4j_opentest4j_1_1_1_jar.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 00000000..257364ef --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 00000000..d69d24a6 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 00000000..7f68460d --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 00000000..35eb1ddf --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file 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..a3756f89 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java index 6da242f3..2f1d108a 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -77,4 +77,11 @@ public void delete(City city) { public int countCities() { return cities.size(); } + + public void append (City city) { + /*if (hasCity(city)) { + throw new IllegalArgumentException(); + } + cities.add(city);*/ + } } 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..22987e93 100644 --- a/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java +++ b/app/src/test/java/com/example/simpleparadox/listycity/CityListTest.java @@ -93,4 +93,16 @@ void testCountCities() { assertEquals(1, cityList.countCities()); } + + @Test + void testAppend() { + CityList cityList = mockCityList(); + + assertEquals(1, cityList.countCities()); + + cityList.append(new City("Regina", "Saskatchewan")); + + assertEquals(2, cityList.countCities()); + assertTrue(cityList.hasCity(new City("Regina", "Saskatchewan"))); + } } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 5509623a..33656b1b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:3.6.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 36854e58..f8cdc2db 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Sep 13 11:31:05 MDT 2019 -distributionBase=GRADLE_USER_HOME -distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME -zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip +#Tue Mar 10 17:41:22 MDT 2020 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip diff --git a/local.properties b/local.properties new file mode 100644 index 00000000..87be297b --- /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. +#Tue Mar 10 17:40:58 MDT 2020 +sdk.dir=/Users/tljn/Library/Android/sdk From f871db54224be4cb65dd9fc3b7d4afdeb4c70dfd Mon Sep 17 00:00:00 2001 From: Tian Date: Tue, 10 Mar 2020 18:17:14 -0600 Subject: [PATCH 3/3] Functionality implemented --- .../java/com/example/simpleparadox/listycity/CityList.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java index 2f1d108a..69f221b3 100644 --- a/app/src/main/java/com/example/simpleparadox/listycity/CityList.java +++ b/app/src/main/java/com/example/simpleparadox/listycity/CityList.java @@ -79,9 +79,9 @@ public int countCities() { } public void append (City city) { - /*if (hasCity(city)) { + if (hasCity(city)) { throw new IllegalArgumentException(); } - cities.add(city);*/ + cities.add(city); } }