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/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 +- 39 files changed, 892 insertions(+), 45 deletions(-) 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/main/res') diff --git a/app/src/main/res/drawable/ic_add_white_24dp.xml b/app/src/main/res/drawable/ic_add_white_24dp.xml new file mode 100644 index 0000000..e3979cd --- /dev/null +++ b/app/src/main/res/drawable/ic_add_white_24dp.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_bird.xml b/app/src/main/res/drawable/ic_bird.xml new file mode 100644 index 0000000..b9e4b46 --- /dev/null +++ b/app/src/main/res/drawable/ic_bird.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_book_black_24dp.xml b/app/src/main/res/drawable/ic_book_black_24dp.xml new file mode 100644 index 0000000..811d5ac --- /dev/null +++ b/app/src/main/res/drawable/ic_book_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_directions_walk_black_24dp.xml b/app/src/main/res/drawable/ic_directions_walk_black_24dp.xml new file mode 100644 index 0000000..407d67b --- /dev/null +++ b/app/src/main/res/drawable/ic_directions_walk_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_info_outline_black_24dp.xml b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml new file mode 100644 index 0000000..cf53e14 --- /dev/null +++ b/app/src/main/res/drawable/ic_info_outline_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..132f0b7 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,11 @@ + + + + + diff --git a/app/src/main/res/drawable/ic_logo.xml b/app/src/main/res/drawable/ic_logo.xml new file mode 100644 index 0000000..fc66c7a --- /dev/null +++ b/app/src/main/res/drawable/ic_logo.xml @@ -0,0 +1,9 @@ + + + + diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml new file mode 100644 index 0000000..affc7ba --- /dev/null +++ b/app/src/main/res/drawable/ic_search_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml new file mode 100644 index 0000000..ace746c --- /dev/null +++ b/app/src/main/res/drawable/ic_settings_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml index 6d81870..2352aa1 100644 --- a/app/src/main/res/drawable/side_nav_bar.xml +++ b/app/src/main/res/drawable/side_nav_bar.xml @@ -2,8 +2,7 @@ android:shape="rectangle"> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index 160803c..bdde7aa 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -21,7 +21,7 @@ android:layout_height="@dimen/logo_w_h" android:layout_gravity="center_horizontal" android:layout_marginBottom="30dp" - android:src="@mipmap/ic_launcher" /> + app:srcCompat="@drawable/ic_logo" /> @@ -49,7 +49,7 @@ android:layout_marginBottom="10dp" android:hint="@string/hint_password" android:inputType="textPassword" - android:textColor="@android:color/white" + android:textColor="@color/input_login" android:textColorHint="@android:color/white" /> @@ -62,7 +62,7 @@ android:layout_marginTop="20dip" android:background="@color/colorAccent" android:text="@string/btn_login" - android:textColor="@android:color/black" /> + android:textColor="@color/common_google_signin_btn_text_dark_default" />