From 9ecffe7854da65b39ae13b18be7da425777f1ee8 Mon Sep 17 00:00:00 2001 From: marcinzelent Date: Thu, 26 Apr 2018 13:34:40 +0200 Subject: Riced the app, added Atlas and About views --- app/src/main/AndroidManifest.xml | 5 +- app/src/main/ic_launcher-web.png | Bin 0 -> 14861 bytes .../org/marcinzelent/liberavem/AboutFragment.java | 142 +++++ .../org/marcinzelent/liberavem/AtlasFragment.java | 11 + .../marcinzelent/liberavem/AtlasGridAdapter.java | 67 +++ .../org/marcinzelent/liberavem/LoginActivity.java | 15 +- .../org/marcinzelent/liberavem/MainActivity.java | 15 +- .../liberavem/NewObservationActivity.java | 2 +- .../liberavem/ObservationsFragment.java | 6 +- .../liberavem/ResetPasswordActivity.java | 8 +- .../org/marcinzelent/liberavem/SignupActivity.java | 12 +- app/src/main/res/drawable/ic_add_white_24dp.xml | 5 + app/src/main/res/drawable/ic_bird.xml | 5 + app/src/main/res/drawable/ic_book_black_24dp.xml | 9 + .../res/drawable/ic_directions_walk_black_24dp.xml | 9 + .../res/drawable/ic_info_outline_black_24dp.xml | 9 + .../main/res/drawable/ic_launcher_foreground.xml | 11 + app/src/main/res/drawable/ic_logo.xml | 9 + app/src/main/res/drawable/ic_search_black_24dp.xml | 9 + .../main/res/drawable/ic_settings_black_24dp.xml | 9 + app/src/main/res/drawable/side_nav_bar.xml | 5 +- app/src/main/res/layout/activity_login.xml | 10 +- .../main/res/layout/activity_new_observation.xml | 4 +- .../main/res/layout/activity_reset_password.xml | 12 +- app/src/main/res/layout/activity_signup.xml | 10 +- app/src/main/res/layout/app_bar_main.xml | 2 +- app/src/main/res/layout/atlas_grid_item.xml | 26 + app/src/main/res/layout/fragment_about.xml | 82 +++ app/src/main/res/layout/fragment_atlas.xml | 13 +- app/src/main/res/layout/fragment_observations.xml | 2 +- app/src/main/res/menu/activity_main_drawer.xml | 10 +- app/src/main/res/menu/main.xml | 4 +- app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml | 4 +- .../res/mipmap-anydpi-v26/ic_launcher_round.xml | 4 +- app/src/main/res/mipmap-hdpi/ic_launcher.png | Bin 3056 -> 1577 bytes app/src/main/res/mipmap-hdpi/ic_launcher_round.png | Bin 5024 -> 3509 bytes app/src/main/res/mipmap-mdpi/ic_launcher.png | Bin 2096 -> 1131 bytes app/src/main/res/mipmap-mdpi/ic_launcher_round.png | Bin 2858 -> 2206 bytes app/src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 4569 -> 2185 bytes .../main/res/mipmap-xhdpi/ic_launcher_round.png | Bin 7098 -> 5023 bytes app/src/main/res/mipmap-xxhdpi/ic_launcher.png | Bin 6464 -> 3353 bytes .../main/res/mipmap-xxhdpi/ic_launcher_round.png | Bin 10676 -> 7711 bytes app/src/main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 9250 -> 4642 bytes .../main/res/mipmap-xxxhdpi/ic_launcher_round.png | Bin 15523 -> 11086 bytes app/src/main/res/raw/gpl_3.html | 639 +++++++++++++++++++++ app/src/main/res/values-v21/styles.xml | 10 +- app/src/main/res/values/colors.xml | 6 +- app/src/main/res/values/ic_launcher_background.xml | 4 + app/src/main/res/values/strings.xml | 13 +- app/src/main/res/values/styles.xml | 2 +- 50 files changed, 1145 insertions(+), 75 deletions(-) create mode 100644 app/src/main/ic_launcher-web.png create mode 100644 app/src/main/java/org/marcinzelent/liberavem/AboutFragment.java create mode 100644 app/src/main/java/org/marcinzelent/liberavem/AtlasGridAdapter.java create mode 100644 app/src/main/res/drawable/ic_add_white_24dp.xml create mode 100644 app/src/main/res/drawable/ic_bird.xml create mode 100644 app/src/main/res/drawable/ic_book_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_directions_walk_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_info_outline_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/drawable/ic_logo.xml create mode 100644 app/src/main/res/drawable/ic_search_black_24dp.xml create mode 100644 app/src/main/res/drawable/ic_settings_black_24dp.xml create mode 100644 app/src/main/res/layout/atlas_grid_item.xml create mode 100644 app/src/main/res/layout/fragment_about.xml create mode 100644 app/src/main/res/raw/gpl_3.html create mode 100644 app/src/main/res/values/ic_launcher_background.xml (limited to 'app/src') diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5639a98..9bfddb8 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -37,15 +37,14 @@ + android:label="@string/title_activity_login"> - + \ No newline at end of file diff --git a/app/src/main/ic_launcher-web.png b/app/src/main/ic_launcher-web.png new file mode 100644 index 0000000..70caf49 Binary files /dev/null and b/app/src/main/ic_launcher-web.png differ diff --git a/app/src/main/java/org/marcinzelent/liberavem/AboutFragment.java b/app/src/main/java/org/marcinzelent/liberavem/AboutFragment.java new file mode 100644 index 0000000..eb7897c --- /dev/null +++ b/app/src/main/java/org/marcinzelent/liberavem/AboutFragment.java @@ -0,0 +1,142 @@ +package org.marcinzelent.liberavem; + +import android.content.Context; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.text.Html; +import android.text.Spanned; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import org.jetbrains.annotations.Nullable; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link AboutFragment.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link AboutFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class AboutFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + public AboutFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment AboutFragment. + */ + // TODO: Rename and change types and number of parameters + public static AboutFragment newInstance(String param