From 4e6fc4fcdbcc3c75be13b3f8b80c24e4648fe354 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Thu, 19 Apr 2018 23:03:13 +0200 Subject: Added details view, improved observations list --- .idea/caches/build_file_checksums.ser | Bin 508 -> 535 bytes .idea/kotlinc.xml | 7 - .idea/misc.xml | 14 +- .idea/modules.xml | 2 +- .idea/vcs.xml | 7 - app/build.gradle | 13 +- app/src/main/AndroidManifest.xml | 5 +- .../liberavem/AllObservationsFragment.java | 73 ++++++- .../main/java/org/marcinzelent/liberavem/Bird.java | 52 +++-- .../org/marcinzelent/liberavem/MainActivity.java | 9 + .../liberavem/MyObservationsFragment.java | 21 +- .../org/marcinzelent/liberavem/Observation.java | 93 +++++++++ .../liberavem/ObservationDetailsActivity.java | 36 ++++ .../liberavem/ObservationsFragment.java | 2 - .../liberavem/ObservationsListAdapter.java | 88 +++++++++ .../marcinzelent/liberavem/SquareImageView.java | 28 +++ .../res/layout/activity_observation_details.xml | 216 +++++++++++++++++++++ app/src/main/res/layout/observations_list_item.xml | 41 ++++ .../main/res/values/attrs_square_image_view.xml | 8 + app/src/main/res/values/strings.xml | 7 + build.gradle | 4 +- 21 files changed, 675 insertions(+), 51 deletions(-) delete mode 100644 .idea/kotlinc.xml delete mode 100644 .idea/vcs.xml create mode 100644 app/src/main/java/org/marcinzelent/liberavem/Observation.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/ObservationDetailsActivity.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/ObservationsListAdapter.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/SquareImageView.java create mode 100644 app/src/main/res/layout/activity_observation_details.xml create mode 100644 app/src/main/res/layout/observations_list_item.xml create mode 100644 app/src/main/res/values/attrs_square_image_view.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index d0a563d..0f5c9d1 100644 Binary files a/.idea/caches/build_file_checksums.ser and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml deleted file mode 100644 index 5806fb3..0000000 --- a/.idea/kotlinc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index d1817bf..99202cc 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,11 +5,12 @@ @@ -24,5 +25,10 @@ - + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml index f6f9cee..33f5b4a 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 8306744..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 21419c7..fe925d9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,11 +26,14 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support:support-v4:27.1.0' - implementation 'com.android.support:design:27.1.0' - implementation 'com.android.support.constraint:constraint-layout:1.0.2' - implementation 'com.android.support:support-vector-drawable:27.1.0' + implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:support-v4:27.1.1' + implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support.constraint:constraint-layout:1.1.0' + implementation 'com.android.support:support-vector-drawable:27.1.1' + implementation 'com.android.volley:volley:1.1.0' + implementation 'com.google.code.gson:gson:2.8.2' + implementation 'com.squareup.retrofit2:retrofit:2.4.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'com.android.support.test:runner:1.0.1' androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c5206f3..edc0b5d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -3,6 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.marcinzelent.liberavem"> + + + android:label="@string/title_activity_settings" /> + \ No newline at end of file diff --git a/app/src/main/java/org/marcinzelent/liberavem/AllObservationsFragment.java b/app/src/main/java/org/marcinzelent/liberavem/AllObservationsFragment.java index ee07682..3f3ad7b 100644 --- a/app/src/main/java/org/marcinzelent