dennisthiessen/RiskAhead-API
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

@25.01.15 Dennis Thießen: TBugs und Verbesserungsvorschläge überwiegend implementiert.

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-25 07:27:15 +01:00
parent 3e4a1d5833
commit 847626b3ce
52 changed files with 943 additions and 555 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/layout/activity_login.xml
View File

@@ -81,10 +81,10 @@
<TextView
android:id="@+id/lbl_login_policy"
android:ellipsize="end"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="end"
android:ellipsize="end"
android:layout_weight=".45"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall" />

47
app/src/main/res/layout/activity_main.xml
View File

@@ -16,6 +16,17 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:id="@+id/imageView"
android:src="@drawable/bg_main_map"
android:scaleType="centerCrop"
android:layout_alignParentTop="true"
android:alpha="0.9" />
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_below="@+id/toolbar"
@@ -23,13 +34,14 @@
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_alignParentTop="true"
android:layout_marginTop="30dp"
android:gravity="center"
android:layout_marginTop="79dp"
android:layout_centerInParent="true">
android:padding="5dp"
android:background="@color/main_button"
android:id="@+id/linearLayout">
<TextView
android:id="@+id/lbl_profile_points"
@@ -37,12 +49,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="52dp"
android:textColor="@color/text_light_grey"/>
android:textColor="@color/white"/>
<TextView
android:id="@+id/txt_main_incidents"
android:text="0"
android:textColor="@color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="38dp"
@@ -55,15 +67,24 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="@color/text_light_grey"/>
android:textColor="@color/white"/>
</LinearLayout>
<ImageView
android:layout_width="200dp"
android:layout_height="200dp"
android:id="@+id/imageView3"
android:src="@drawable/logo_512w"
android:scaleType="centerCrop"
android:layout_centerInParent="true"
android:layout_below="@+id/linearLayout"
android:alpha="0.8" />
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:layout_height="wrap_content"
android:background="#7fbfbfbf"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
@@ -72,12 +93,12 @@
<Button
android:id="@+id/btn_main_report"
android:layout_weight="1"
android:background="@color/bg_common_trans"
android:background="@drawable/activity_main_button"
android:textColor="@color/white"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="80dp"
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_main_reportinc" />
@@ -87,13 +108,15 @@
android:layout_weight="1"
android:paddingRight="10dp"
android:textColor="@color/white"
android:background="@color/bg_common_trans"
android:background="@drawable/activity_main_button"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="80dp"
android:text="@string/btn_main_showmap" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

1
app/src/main/res/layout/activity_maps.xml
View File

@@ -38,6 +38,7 @@
android:clickable="true"
android:tint="@color/white"
android:src="@android:drawable/ic_input_add"
app:borderWidth="0dp"
app:layout_anchor="@+id/frag_maps_map"
android:layout_marginLeft="15dp"
android:layout_marginBottom="50dp"

49
app/src/main/res/layout/activity_register.xml
View File

@@ -63,31 +63,38 @@
android:textColor="@color/input_register"
android:textColorHint="@color/input_register_hint" />
<Button
android:id="@+id/btn_register"
android:layout_width="wrap_content"
android:layout_height="40dp"
<LinearLayout
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/input_register_password"
android:layout_marginBottom="20dp"
android:layout_marginTop="20dp"
android:background="#ffea7f8a"
android:minWidth="120dp"
android:text="@string/btn_start_register"
android:textColor="@color/white" />
android:orientation="horizontal"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_register"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight=".4"
android:background="#ffea7f8a"
android:minWidth="120dp"
android:text="@string/btn_start_register"
android:textColor="@color/white" />
<TextView
android:id="@+id/lbl_login_policy"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight=".4"
android:gravity="end"
android:ellipsize="end"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/input_register" />
</LinearLayout>
<TextView
android:id="@+id/lbl_login_policy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignTop="@+id/btn_register"
android:gravity="right"
android:text="@string/lbl_login_policy"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/input_register" />
<TextView
android:id="@+id/lbl_login_usesocialnet"

2
app/src/main/res/layout/activity_start.xml
View File

@@ -30,6 +30,7 @@
android:text="@string/btn_start_login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/bg_common_trans"
android:layout_weight="1"
android:onClick="gotoLogin" />
@@ -38,6 +39,7 @@
android:text="@string/btn_start_register"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:backgroundTint="@color/bg_common_trans"
android:layout_weight="1"
android:onClick="gotoRegister" />

3
app/src/main/res/layout/activity_view_report.xml
View File

@@ -310,8 +310,7 @@
android:layout_margin="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:clickable="true"
android:src="@android:drawable/ic_menu_search" />
android:clickable="true" />
</RelativeLayout>
<LinearLayout

22
app/src/main/res/layout/layout_toolbar.xml
View File

@@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/MyRiskAheadToolbar"
app:popupTheme="@style/Theme.AppCompat.Light.NoActionBar"
android:elevation="4dp"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" />
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:theme="@style/MyRiskAheadToolbar"
app:popupTheme="@style/Theme.AppCompat.Light.NoActionBar"
android:elevation="4dp"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" />

12
app/src/main/res/layout/progress_circle.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:layout_height="match_parent">
<ProgressBar
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true" />
</RelativeLayout>

2
app/src/main/res/menu/menu_common.xml
View File

@@ -6,6 +6,8 @@
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_help" android:title="@string/menu_action_help"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_feedback" android:title="@string/menu_action_feedback"
android:orderInCategory="100" app:showAsAction="never" />
<item android:id="@+id/menu_action_exit" android:title="@string/menu_action_exit"
android:orderInCategory="100" app:showAsAction="never" />

26
app/src/main/res/values-de/strings.xml
View File

@@ -30,7 +30,6 @@
<string name="menu_action_about">Info</string>
<string name="menu_action_help">Hilfe &amp; Kontakt</string>
<string name="menu_action_exit">Beenden</string>
<string name="menu_action_refresh">Karte aktualisieren</string>
<string name="lbl_main_txt1">Wir haben aktuell &#8230;</string>
<string name="lbl_main_txt2">&#8230; gemeldete Vorfälle</string>
@@ -148,8 +147,6 @@
<string name="btn_reportwf_reportnow">Jetzt melden!</string>
<string name="btn_reportwf_next">Weiter</string>
<string name="menu_send_feedback">Feedback senden</string>
<string name="txt_reportwf_newincidenttitle">Neuen Vorfall anlegen?</string>
<string name="txt_reportwf_newincidenttext">Willst du alle gemachten Eingaben zurücksetzen und einen neuen Vorfall erstellen?</string>
<string name="txt_subs_youbought">Du hast gekauft</string>
@@ -206,6 +203,29 @@
<string name="txt_top10_reportedinc">gemeldete Vorfälle</string>
<string name="txt_top10_membersince">Mitglied seit</string>
<string name="menu_action_feedback">Feedback</string>
<string name="txt_feedback_title">Feedback</string>
<string name="txt_feedback_message">Sende uns Verbesserungsvorschläge, Lob und Kritik um uns dabei zu helfen RiskAhead zu verbessern.</string>
<string name="txt_feedback_hint">Trage dein Feedback hier ein</string>
<string name="txt_feedback_sendbtn">Senden</string>
<string name="txt_feedback_cancelbtn">Abbrechen</string>
<string name="txt_feedback_response">Danke für dein Feedback!</string>
<string name="txt_rate_title">Bewerte RiskAhead</string>
<string name="txt_rate_message">Wenn dir diese App gefällt, nimm doch bitte einen Moment Zeit diese App zu bewerten. Danke für deine Unterstützung!</string>
<string name="txt_rate_retenowbtn">Jetzt bewerten!</string>
<string name="txt_rate_laterbtn">Später</string>
<string name="txt_rate_neverbtn">Niemals</string>
<string name="txt_share_title">Teilen?</string>
<string name="txt_share_message">Danke für deinen Eintrag. Möchtest du diesen Vorfall außerhalb von RiskAhead mit anderen Menschen teilen?</string>
<string name="txt_share_hint">Vorsicht, neuer Vorfall!\n</string>
<string name="txt_share_hint2">Was</string>
<string name="txt_share_hint3">Wo</string>
<string name="txt_share_page">Für mehr Details: www.riskahead.de</string>
<string name="txt_share_acttitle">Vorfall teilen…</string>
<string name="txt_viewreport_noinput">Keine Angaben</string>
<string name="txt_backpressed_msg">Drücke erneut Zurück um die RiskAhead zu schließen</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>

11
app/src/main/res/values/colors.xml
View File

@@ -6,13 +6,22 @@
<color name="bg_common">#1175b7</color>
<color name="bg_common_trans">#9e1175b7</color>
<color name="main_button">#50626262</color>
<color name="main_button_pressed">#e4474747</color>
<color name="bg_common_2">#0461a8</color>
<color name="common_text">#333333</color>
<color name="actionbar_text">#fdfdfd</color>
<color name="text_light_grey">#aa4b4b4b</color>
<color name="white">#ffffff</color>
<color name="txt_main">#b3d1e6</color>
<color name="black">#000000</color>
<color name="white">#f5f5f5</color>
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#888888</color>

24
app/src/main/res/values/strings.xml
View File

@@ -31,7 +31,6 @@
<string name="menu_action_about">About</string>
<string name="menu_action_help">Help &amp; Contact</string>
<string name="menu_action_exit">Exit</string>
<string name="menu_action_refresh">Refresh Map</string>
<string name="lbl_main_txt1">We have currently &#8230;</string>
<string name="lbl_main_txt2">&#8230; reported incidents</string>
@@ -151,7 +150,6 @@
<string name="btn_reportwf_reportnow">Report NOW!</string>
<string name="btn_reportwf_next">Next</string>
<string name="menu_send_feedback">Send Feedback</string>
<string name="txt_reportwf_newincidenttitle">Create new incident?</string>
<string name="txt_reportwf_newincidenttext">Do you want to reset all values and create a new incident?</string>
@@ -209,6 +207,28 @@
<string name="txt_top10_reportedinc">reported incidents</string>
<string name="txt_top10_membersince">Member since</string>
<string name="menu_action_feedback">Feedback</string>
<string name="txt_feedback_title">FeedBack</string>
<string name="txt_feedback_message">Give us your feedback to help us improve RiskAhead</string>
<string name="txt_feedback_hint">Enter Feedback here</string>
<string name="txt_feedback_sendbtn">Send</string>
<string name="txt_feedback_cancelbtn">Cancel</string>
<string name="txt_feedback_response">Thank you for your feedback!</string>
<string name="txt_rate_title">Rate RiskAhead</string>
<string name="txt_rate_message">If you enjoy using RiskAhead, please take a moment to rate it. Thanks for your support!</string>
<string name="txt_rate_retenowbtn">Rate Now!</string>
<string name="txt_rate_laterbtn">Later</string>
<string name="txt_rate_neverbtn">Never</string>
<string name="txt_share_title">Share?</string>
<string name="txt_share_message">Thank you for your entry. Do you want to share this incident?</string>
<string name="txt_share_hint">Attention, new incident!\n</string>
<string name="txt_share_hint2">What</string>
<string name="txt_share_hint3">Where</string>
<string name="txt_share_page">For more Details: www.riskahead.net</string>
<string name="txt_share_acttitle">Share incident…</string>
<string name="txt_viewreport_noinput">No Value</string>
<string name="txt_backpressed_msg">Tap back button again in order to exit RiskAhead</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>

3
app/src/main/res/xml/settings.xml
View File

@@ -8,18 +8,21 @@
<org.deke.risk.riskahead.helper.ValidatedEditTextPreference
android:key="usernamePref"
android:title="@string/txt_settings_username"
android:inputType="textCapSentences"
android:summary="@string/txt_settings_username_sum"
android:dialogTitle="@string/txt_settings_username_sum" />
<EditTextPreference
android:key="namePref"
android:title="@string/txt_settings_name_title"
android:inputType="textCapSentences"
android:summary="@string/txt_settings_name_sum"
android:dialogTitle="@string/txt_settings_name_sum" />
<EditTextPreference
android:key="surnamePref"
android:title="@string/txt_settings_surname_title"
android:inputType="textCapSentences"
android:summary="@string/txt_settings_surname_sum"
android:dialogTitle="@string/txt_settings_surname_sum" />