Merge pull request #427 from forrestguice/develop

forrestguice · Sep 9, 2020 · 8d33829 · 8d33829
2 parents db903af + c4a9ac4
commit 8d33829
Show file tree

Hide file tree

Showing 364 changed files with 21,612 additions and 3,222 deletions.
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_cardview_v7_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_cardview_v7_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml b/.idea/libraries/Gradle__com_android_support_constraint_constraint_layout_1_0_2_aar.xml
diff --git a/...a/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml b/...a/libraries/Gradle__com_android_support_constraint_constraint_layout_solver_1_0_2_jar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_design_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_design_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_annotations_25_4_0_jar.xml b/.idea/libraries/Gradle__com_android_support_support_annotations_25_4_0_jar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_compat_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_v4_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_4_0_aar.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_25_4_0_aar.xml
diff --git a/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml b/.idea/libraries/Gradle__com_android_support_test_espresso_espresso_core_2_2_2_aar.xml