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

DT @27.01.2016: 1.8 release

Browse Source
This commit is contained in:
Dennis Thießen
2016-01-27 17:53:31 +01:00
parent f9fada790c
commit 4daba8037c
24 changed files with 535 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,30 +64,23 @@
android:text="@string/btn_start_login"
android:textColor="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_below="@+id/btn_login"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_height="wrap_content">
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="0dp"
android:ellipsize="end"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:layout_weight=".5"
android:textAppearance="?android:attr/textAppearanceSmall" />
<TextView
android:id="@+id/lbl_login_policy"
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" />
</LinearLayout>

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

@@ -81,16 +81,7 @@
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>

9
app/src/main/res/layout/activity_report_wf.xml
View File

@@ -82,6 +82,15 @@
android:clickable="true"
android:src="@android:drawable/ic_dialog_map" />
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentLeft="true"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:layout_gravity="center_horizontal" />
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"

17
app/src/main/res/layout/activity_subscriptions.xml
View File

@@ -6,7 +6,6 @@
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SubscriptionsActivity">
<include
@@ -21,12 +20,11 @@
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_margin="0dp"
android:padding="10dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_profile_numberposts"
android:text="@string/lbl_subs_maintaining"
@@ -36,6 +34,13 @@
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_margin="5dp"/>
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_gravity="center_horizontal" />
<TextView
android:id="@+id/lbl_profile_ranking"
android:text="@string/lbl_subs_helpus"
@@ -45,6 +50,12 @@
android:layout_margin="5dp"
android:textColor="@color/text_light_grey"/>
<View
android:layout_width="fill_parent"
android:layout_height="1dip"
android:layout_marginBottom="10dp"
android:background="#464b4b4b" />
<TableLayout
android:id="@+id/tbl_billing"
android:layout_width="match_parent"

81
app/src/main/res/layout/dialog_about.xml Normal file
View File

@@ -0,0 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:background="@color/tw__transparent"
android:padding="20dp"
android:layout_height="match_parent">
<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="@string/txt_about_riskahead"
android:id="@+id/lbl_about_name"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Version: 1.7.1"
android:id="@+id/lbl_about_version"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/txt_about_developedby"
android:id="@+id/lbl_about_developer" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Dennis Thießen"
android:id="@+id/tv_developer2"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Kevin-Chris Gründel"
android:id="@+id/tv_developer3"
android:layout_gravity="center_horizontal" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:autoLink="web"
android:textSize="10sp"
android:text="@string/txt_about_homepage"
android:id="@+id/txt_about_homepage"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:layout_marginTop="3dp"
android:textSize="10sp"
android:text="@string/txt_about_privacy"
android:id="@+id/txt_about_privacy"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:autoLink="web"
android:layout_marginTop="3dp"
android:textSize="10sp"
android:text="@string/txt_about_terms"
android:id="@+id/txt_about_terms" />
</LinearLayout>

0
app/src/main/res/layout/progress_circle.xml → app/src/main/res/layout/dialog_progresscircle.xml
View File

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

@@ -8,6 +8,8 @@
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_language" android:title="@string/menu_action_language"
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" />

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

@@ -230,6 +230,17 @@
<string name="txt_notifystatus_deactivated">AUS</string>
<string name="txt_map_zoomoutpremium">Hole dir die Premium-Mitgliedschaft um die ganze Karte zu sehen!</string>
<string name="txt_register_privacy">Bitte bestätige, dass du mit der Registrierung bei RiskAhead die <a href="http://www.riskahead.de">Datenschutzbestimmungen</a> und <a href="http://www.riskahead.de">Nutzungsbedingungen</a> gelesen hast und damit einverstanden bist.</string>
<string name="txt_register_privacy_text">Mit der Auswahl dieser Kontrollbox erkläre ich mich mit den Datenschutz- und Nutzungsbedingungen einverstanden</string>
<string name="txt_register_privacy_title">Deine Privatsphäre ist uns sehr wichtig</string>
<string name="txt_about_developedby">Entwickelt von</string>
<string name="txt_about_privacy">Datenschutzerklärung: <a href="http://www.riskahead.de/en/privacy/">http://www.riskahead.de/en/privacy/</a></string>
<string name="txt_about_terms">Nutzungsbedingungen: <a href="http://www.riskahead.de/en/terms/">http://www.riskahead.de/en/terms/</a></string>
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
<string name="txt_about_riskahead">RiskAhead for Android</string>
<string name="menu_action_language">Sprache</string>
<string name="txt_language_title">Ändere Sprache</string>
<string-array name="cat_situation_main">
<item>Allgemeiner Vorfall/Situation</item>
<item>Mündliche Gewalt</item>

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

@@ -24,9 +24,9 @@
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#888888</color>
<color name="input_register">#afafaf</color>
<color name="input_register_bg">#3b4148</color>
<color name="input_register_hint">#5e6266</color>
<color name="input_register_hint">#8c9094</color>
<color name="btn_login_bg">#1175b7</color>
</resources>

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

@@ -237,6 +237,17 @@
<string name="txt_notifystatus_deactivated">OFF</string>
<string name="txt_map_zoomoutpremium">Get Premiuim to view the Full Map!</string>
<string name="txt_register_privacy">Please confirm that you have read our <a href="http://www.riskahead.de">Privacy Policy</a> and <a href="http://www.riskahead.de">Terms of Service</a> and you accept these by using RiskAhead.</string>
<string name="txt_register_privacy_text">By checking this checkbox I hereby confirm that I accept the terms of service and privacy policy</string>
<string name="txt_register_privacy_title">Your privacy is very important to us</string>
<string name="txt_about_developedby">Dveloped from</string>
<string name="txt_about_privacy">Privacy Policy: <a href="http://www.riskahead.de/en/privacy/">http://www.riskahead.de/en/privacy/</a></string>
<string name="txt_about_terms">Terms of Service: <a href="http://www.riskahead.de/en/terms/">http://www.riskahead.de/en/terms/</a></string>
<string name="txt_about_homepage">Website: <a href="http://www.riskahead.net">http://www.riskahead.net</a></string>
<string name="txt_about_riskahead">RiskAhead for Android</string>
<string name="menu_action_language">Language</string>
<string name="txt_language_title">Change Language</string>
<string-array name="cat_situation_main">
<item> A Threatening Incident or Situation</item>
<item>Verbal Violence</item>