From 14e6b8b0171601c7392d13c4c79e38c2e55df928 Mon Sep 17 00:00:00 2001 From: Marcin Zelent Date: Thu, 29 Mar 2018 15:58:03 +0200 Subject: Added fragments --- .idea/caches/build_file_checksums.ser | Bin 0 -> 508 bytes .idea/codeStyles/Project.xml | 29 +++ .idea/kotlinc.xml | 7 + app/build.gradle | 2 + app/src/main/AndroidManifest.xml | 8 +- .../liberavem/AppCompatPreferenceActivity.java | 109 +++++++++ .../org/marcinzelent/liberavem/AtlasFragment.java | 108 +++++++++ .../org/marcinzelent/liberavem/MainActivity.java | 52 +++-- .../liberavem/ObservationsFragment.java | 124 ++++++++++ .../marcinzelent/liberavem/SettingsActivity.java | 254 +++++++++++++++++++++ app/src/main/res/drawable/ic_info_black_24dp.xml | 9 + .../res/drawable/ic_notifications_black_24dp.xml | 9 + app/src/main/res/drawable/ic_sync_black_24dp.xml | 9 + app/src/main/res/layout/app_bar_main.xml | 18 +- app/src/main/res/layout/content_main.xml | 21 -- app/src/main/res/layout/fragment_atlas.xml | 14 ++ app/src/main/res/layout/fragment_observations.xml | 45 ++++ app/src/main/res/menu/main.xml | 7 +- app/src/main/res/values/strings.xml | 78 ++++++- app/src/main/res/xml/pref_data_sync.xml | 21 ++ app/src/main/res/xml/pref_general.xml | 33 +++ app/src/main/res/xml/pref_headers.xml | 20 ++ app/src/main/res/xml/pref_notification.xml | 27 +++ 23 files changed, 953 insertions(+), 51 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/kotlinc.xml create mode 100644 app/src/main/java/org/marcinzelent/liberavem/AppCompatPreferenceActivity.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/AtlasFragment.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/ObservationsFragment.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/SettingsActivity.java create mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml delete mode 100644 app/src/main/res/layout/content_main.xml create mode 100644 app/src/main/res/layout/fragment_atlas.xml create mode 100644 app/src/main/res/layout/fragment_observations.xml create mode 100644 app/src/main/res/xml/pref_data_sync.xml create mode 100644 app/src/main/res/xml/pref_general.xml create mode 100644 app/src/main/res/xml/pref_headers.xml create mode 100644 app/src/main/res/xml/pref_notification.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000..f7888ee Binary files /dev/null and b/.idea/caches/build_file_checksums.ser differ diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..5806fb3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 765c72f..21419c7 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,6 +13,7 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + vectorDrawables.useSupportLibrary = true } buildTypes { release { @@ -29,6 +30,7 @@ dependencies { 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' 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 66db694..c5206f3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -4,14 +4,13 @@ package="org.marcinzelent.liberavem"> + tools:ignore="AllowBackup,GoogleAppIndexingWarning"> + \ No newline at end of file diff --git a/app/src/main/java/org/marcinzelent/liberavem/AppCompatPreferenceActivity.java b/app/src/main/java/org/marcinzelent/liberavem/AppCompatPreferenceActivity.java new file mode 100644 index 0000000..f63b0b5 --- /dev/null +++ b/app/src/main/java/org/marcinzelent/liberavem/AppCompatPreferenceActivity.java @@ -0,0 +1