From f44042efa87e66e8701fef49dd0fa20bd324b8bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dennis=20Thie=C3=9Fen?= Date: Sun, 10 Jan 2016 22:26:32 +0100 Subject: [PATCH] =?UTF-8?q?DT=20@10.01.2016:=20Icons=20ver=C3=A4ndert,=20S?= =?UTF-8?q?ubscription=20hinzugef=C3=BCgt,=20Profile=20von=20anderen=20Use?= =?UTF-8?q?rn=20einsehbar.=20Release=201.3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/inspectionProfiles/Project_Default.xml | 1 + .idea/modules.xml | 2 +- RiskAhead.iml | 2 +- app/app-release.apk | Bin 5660050 -> 5498258 bytes app/app.iml | 3 +- app/build.gradle | 4 +- .../deke/risk/riskahead/LoginActivity.java | 135 ++++--- .../org/deke/risk/riskahead/MainActivity.java | 128 +++--- .../org/deke/risk/riskahead/MapsActivity.java | 79 ++-- .../deke/risk/riskahead/ProfileActivity.java | 50 ++- .../deke/risk/riskahead/ReportWFActivity.java | 159 ++++---- .../risk/riskahead/SubscriptionsActivity.java | 380 ++++++++++++++++-- .../risk/riskahead/ViewReportActivity.java | 24 +- .../adapter/ProfilePagerAdapter.java | 68 +++- .../fragment/ProfileStatisticsFragment.java | 61 ++- .../fragment/ReportListFragment.java | 7 +- .../fragment/ReportWF_8_Fragment.java | 4 +- .../riskahead/fragment/SettingsFragment.java | 49 ++- .../riskahead/fragment/Top10Fragment.java | 12 + .../deke/risk/riskahead/helper/AppConfig.java | 35 +- .../risk/riskahead/helper/BaseActivity.java | 14 +- .../risk/riskahead/helper/IncidentReport.java | 167 ++++++-- .../risk/riskahead/helper/SessionManager.java | 29 +- .../main/res/drawable-hdpi/btn_report.9.png | Bin 4458 -> 0 bytes .../drawable-hdpi/btn_report_pressed.9.png | Bin 4406 -> 0 bytes .../res/drawable-hdpi/icon_general_f.9.png | Bin 2592 -> 1970 bytes .../res/drawable-hdpi/icon_general_w_f.9.png | Bin 2832 -> 2158 bytes .../drawable-hdpi/icon_high_violance_f.9.png | Bin 2579 -> 1864 bytes .../icon_high_violance_w_f.9.png | Bin 2812 -> 2084 bytes .../main/res/drawable-hdpi/icon_infra.9.png | Bin 1071 -> 0 bytes .../res/drawable-hdpi/icon_infra_v2_f.9.png | Bin 2597 -> 2192 bytes .../res/drawable-hdpi/icon_infra_v2_w_f.9.png | Bin 2804 -> 2402 bytes .../icon_middle_violance_f.9.png | Bin 2809 -> 1986 bytes .../icon_middle_violance_w_f.9.png | Bin 3040 -> 2213 bytes .../res/drawable-hdpi/icon_nature_f.9.png | Bin 2665 -> 1940 bytes .../res/drawable-hdpi/icon_nature_w_f.9.png | Bin 2879 -> 2163 bytes .../res/drawable-hdpi/icon_verbal_f.9.png | Bin 2584 -> 1915 bytes .../res/drawable-hdpi/icon_verbal_w_f.9.png | Bin 2822 -> 2152 bytes .../main/res/drawable-mdpi/btn_report.9.png | Bin 2597 -> 0 bytes .../drawable-mdpi/btn_report_pressed.9.png | Bin 2465 -> 0 bytes .../res/drawable-mdpi/icon_general_f.9.png | Bin 1484 -> 1154 bytes .../res/drawable-mdpi/icon_general_w_f.9.png | Bin 1626 -> 1288 bytes .../drawable-mdpi/icon_high_violance_f.9.png | Bin 1431 -> 1104 bytes .../icon_high_violance_w_f.9.png | Bin 1566 -> 1231 bytes .../main/res/drawable-mdpi/icon_infra.9.png | Bin 663 -> 0 bytes .../res/drawable-mdpi/icon_infra_v2_f.9.png | Bin 1492 -> 1318 bytes .../res/drawable-mdpi/icon_infra_v2_w_f.9.png | Bin 1621 -> 1436 bytes .../icon_middle_violance_f.9.png | Bin 1550 -> 1177 bytes .../icon_middle_violance_w_f.9.png | Bin 1687 -> 1311 bytes .../res/drawable-mdpi/icon_nature_f.9.png | Bin 1494 -> 1138 bytes .../res/drawable-mdpi/icon_nature_w_f.9.png | Bin 1624 -> 1281 bytes .../res/drawable-mdpi/icon_verbal_f.9.png | Bin 1461 -> 1151 bytes .../res/drawable-mdpi/icon_verbal_w_f.9.png | Bin 1600 -> 1291 bytes .../main/res/drawable-xhdpi/btn_report.9.png | Bin 6328 -> 0 bytes .../drawable-xhdpi/btn_report_pressed.9.png | Bin 6651 -> 0 bytes .../res/drawable-xhdpi/icon_general_f.9.png | Bin 2374 -> 2231 bytes .../res/drawable-xhdpi/icon_general_w_f.9.png | Bin 2675 -> 2459 bytes .../drawable-xhdpi/icon_high_violance_f.9.png | Bin 2538 -> 2225 bytes .../icon_high_violance_w_f.9.png | Bin 2817 -> 2443 bytes .../main/res/drawable-xhdpi/icon_infra.9.png | Bin 1143 -> 0 bytes .../res/drawable-xhdpi/icon_infra_v2_f.9.png | Bin 2223 -> 2434 bytes .../drawable-xhdpi/icon_infra_v2_w_f.9.png | Bin 2520 -> 2675 bytes .../icon_middle_violance_f.9.png | Bin 2782 -> 2361 bytes .../icon_middle_violance_w_f.9.png | Bin 3085 -> 2581 bytes .../res/drawable-xhdpi/icon_nature_f.9.png | Bin 2568 -> 2278 bytes .../res/drawable-xhdpi/icon_nature_w_f.9.png | Bin 2837 -> 2498 bytes .../res/drawable-xhdpi/icon_verbal_f.9.png | Bin 2307 -> 2194 bytes .../res/drawable-xhdpi/icon_verbal_w_f.9.png | Bin 2604 -> 2452 bytes .../main/res/drawable-xxhdpi/btn_report.9.png | Bin 11537 -> 0 bytes .../drawable-xxhdpi/btn_report_pressed.9.png | Bin 12253 -> 0 bytes .../res/drawable-xxhdpi/icon_general_f.9.png | Bin 5440 -> 4401 bytes .../drawable-xxhdpi/icon_general_w_f.9.png | Bin 5971 -> 4834 bytes .../icon_high_violance_f.9.png | Bin 5653 -> 4269 bytes .../icon_high_violance_w_f.9.png | Bin 6202 -> 4725 bytes .../main/res/drawable-xxhdpi/icon_infra.9.png | Bin 2299 -> 0 bytes .../res/drawable-xxhdpi/icon_infra_v2_f.9.png | Bin 5285 -> 4751 bytes .../drawable-xxhdpi/icon_infra_v2_w_f.9.png | Bin 5813 -> 5189 bytes .../icon_middle_violance_f.9.png | Bin 6262 -> 4617 bytes .../icon_middle_violance_w_f.9.png | Bin 6789 -> 5110 bytes .../res/drawable-xxhdpi/icon_nature_f.9.png | Bin 5681 -> 4446 bytes .../res/drawable-xxhdpi/icon_nature_w_f.9.png | Bin 6201 -> 4933 bytes .../res/drawable-xxhdpi/icon_verbal_f.9.png | Bin 5326 -> 4229 bytes .../res/drawable-xxhdpi/icon_verbal_w_f.9.png | Bin 5880 -> 4693 bytes .../res/drawable-xxxhdpi/btn_report.9.png | Bin 15617 -> 0 bytes .../drawable-xxxhdpi/btn_report_pressed.9.png | Bin 17444 -> 0 bytes .../res/drawable-xxxhdpi/icon_general_f.9.png | Bin 4459 -> 4510 bytes .../drawable-xxxhdpi/icon_general_w_f.9.png | Bin 4806 -> 4770 bytes .../icon_high_violance_f.9.png | Bin 4910 -> 4515 bytes .../icon_high_violance_w_f.9.png | Bin 5254 -> 4844 bytes .../res/drawable-xxxhdpi/icon_infra.9.png | Bin 2145 -> 0 bytes .../drawable-xxxhdpi/icon_infra_v2_f.9.png | Bin 3921 -> 4697 bytes .../drawable-xxxhdpi/icon_infra_v2_w_f.9.png | Bin 4219 -> 5023 bytes .../icon_middle_violance_f.9.png | Bin 5624 -> 4907 bytes .../icon_middle_violance_w_f.9.png | Bin 5931 -> 5254 bytes .../res/drawable-xxxhdpi/icon_nature_f.9.png | Bin 4773 -> 4622 bytes .../drawable-xxxhdpi/icon_nature_w_f.9.png | Bin 5067 -> 4917 bytes .../res/drawable-xxxhdpi/icon_verbal_f.9.png | Bin 4289 -> 4395 bytes .../drawable-xxxhdpi/icon_verbal_w_f.9.png | Bin 4596 -> 4686 bytes .../fragment_reportwf_finish_button.xml | 14 +- app/src/main/res/layout/activity_login.xml | 50 ++- app/src/main/res/layout/activity_main.xml | 8 +- app/src/main/res/layout/activity_maps.xml | 13 +- .../res/layout/activity_subscriptions.xml | 17 +- .../main/res/layout/activity_view_report.xml | 27 +- .../contact_spinner_row_nothing_selected.xml | 2 +- .../res/layout/fragment_profile_stats.xml | 56 ++- .../main/res/layout/fragment_reportwf_1.xml | 1 + .../main/res/layout/fragment_reportwf_3.xml | 1 + .../main/res/layout/fragment_reportwf_4.xml | 1 + .../main/res/layout/fragment_reportwf_5.xml | 1 + .../main/res/layout/fragment_reportwf_7.xml | 1 + .../main/res/layout/fragment_reportwf_8.xml | 4 + .../res/layout/fragment_reportwf_finish.xml | 6 +- app/src/main/res/layout/map_info_window.xml | 29 +- app/src/main/res/menu/menu_maps.xml | 2 +- app/src/main/res/menu/menu_reportwf.xml | 2 +- app/src/main/res/mipmap-hdpi/btn_report.png | Bin 3004 -> 0 bytes app/src/main/res/mipmap-mdpi/btn_report.png | Bin 1645 -> 0 bytes app/src/main/res/mipmap-xhdpi/btn_report.png | Bin 4605 -> 0 bytes app/src/main/res/mipmap-xxhdpi/btn_report.png | Bin 8539 -> 0 bytes .../main/res/mipmap-xxxhdpi/btn_report.png | Bin 13176 -> 0 bytes app/src/main/res/values-de/strings.xml | 333 ++++++--------- app/src/main/res/values/colors.xml | 9 +- app/src/main/res/values/dimens.xml | 13 +- app/src/main/res/values/strings.xml | 195 +++------ 125 files changed, 1384 insertions(+), 814 deletions(-) delete mode 100644 app/src/main/res/drawable-hdpi/btn_report.9.png delete mode 100644 app/src/main/res/drawable-hdpi/btn_report_pressed.9.png delete mode 100644 app/src/main/res/drawable-hdpi/icon_infra.9.png delete mode 100644 app/src/main/res/drawable-mdpi/btn_report.9.png delete mode 100644 app/src/main/res/drawable-mdpi/btn_report_pressed.9.png delete mode 100644 app/src/main/res/drawable-mdpi/icon_infra.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/btn_report.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/btn_report_pressed.9.png delete mode 100644 app/src/main/res/drawable-xhdpi/icon_infra.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/btn_report.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/btn_report_pressed.9.png delete mode 100644 app/src/main/res/drawable-xxhdpi/icon_infra.9.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/btn_report.9.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/btn_report_pressed.9.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/icon_infra.9.png delete mode 100644 app/src/main/res/mipmap-hdpi/btn_report.png delete mode 100644 app/src/main/res/mipmap-mdpi/btn_report.png delete mode 100644 app/src/main/res/mipmap-xhdpi/btn_report.png delete mode 100644 app/src/main/res/mipmap-xxhdpi/btn_report.png delete mode 100644 app/src/main/res/mipmap-xxxhdpi/btn_report.png diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index a7aa9e6..cea327f 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,6 +1,7 @@