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

Changed Rest-Calls to new API,

Browse Source 
Many bugfixes and some improvements (especially on the map),
Some minor design changes,
Removed MainActivity from Menu
This commit is contained in:
Dennis Thiessen
2017-05-28 00:02:10 +02:00
parent 41bbc671ca
commit b79b5d7f3f
53 changed files with 1163 additions and 1783 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,138 +1,158 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/bg_login"
android:gravity="center"
android:orientation="vertical"
android:padding="20dp"
tools:context=".LoginActivity">
<TextView
android:id="@+id/lbl_login_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="54dp"
android:background="@color/bg_common"
android:textColor="@color/md_white_1000"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:text="@string/lbl_login_title"
android:textSize="20sp"
android:textStyle="bold"
android:typeface="sans" />
<EditText
android:id="@+id/input_register_email"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_login_title"
android:layout_marginTop="20dp"
android:background="@color/white"
android:hint="@string/input_register_email_hint"
android:inputType="textEmailAddress"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
<EditText
android:id="@+id/input_register_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_below="@+id/input_register_email"
android:layout_marginTop="5dp"
android:background="@color/white"
android:hint="@string/input_register_password_hint"
android:inputType="textPassword"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
<Button
android:id="@+id/btn_login"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/input_register_password"
android:layout_marginBottom="5dip"
android:layout_marginTop="20dip"
android:background="@color/btn_login_bg"
android:minWidth="120dp"
android:text="@string/btn_start_login"
android:textColor="@color/white" />
<Button
android:id="@+id/btn_switchtoregistration"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/btn_login"
android:layout_marginBottom="10dip"
android:background="#ffea7f8a"
android:minWidth="120dp"
android:text="@string/btn_start_register"
android:textColor="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_below="@+id/btn_switchtoregistration"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_height="wrap_content">
android:text="@string/lbl_login_title"
android:textSize="20sp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/lbl_login_title"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingBottom="20dp">
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_email"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_register_email"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/input_register_email_hint"
android:inputType="textEmailAddress"
android:padding="10dp"
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_password"
android:layout_below="@+id/input_layout_email"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_register_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:hint="@string/input_register_password_hint"
android:inputType="textPassword"
android:padding="10dp"
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login"
android:layout_width="fill_parent"
android:layout_height="50dp"
android:layout_below="@+id/input_layout_password"
android:layout_marginBottom="5dip"
android:layout_marginTop="20dip"
bootstrap:bootstrapText="@string/btn_start_login"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_switchtoregistration"
android:layout_width="fill_parent"
android:layout_height="50dp"
android:layout_below="@+id/btn_login"
android:layout_marginBottom="5dip"
bootstrap:bootstrapText="@string/btn_start_register"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true" />
<LinearLayout
android:layout_width="match_parent"
android:layout_below="@+id/btn_switchtoregistration"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_height="wrap_content"
android:id="@+id/linearLayout3">
<TextView
android:id="@+id/lbl_login_resendPW"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:textColor="@color/bg_common"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
<TextView
android:id="@+id/lbl_login_resendPW"
android:id="@+id/lbl_login_usesocialnet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/lbl_login_resendPW"
android:textAppearance="?android:attr/textAppearanceSmall" />
</LinearLayout>
android:layout_above="@+id/lay_social"
android:layout_centerHorizontal="true"
android:textColor="@color/bg_common"
android:text="@string/lbl_login_usesocialnet" />
<TextView
android:id="@+id/lbl_login_usesocialnet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnGP"
android:layout_centerHorizontal="true"
android:text="@string/lbl_login_usesocialnet" />
<LinearLayout
android:id="@+id/lay_social"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content">
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragment.GooglePlusButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_googleplus_button" />
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragment.TwitterButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_twitter_button" />
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_facebook_button" />
</LinearLayout>
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragment.GooglePlusButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnTW"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_googleplus_button" />
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragment.TwitterButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnFB"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_twitter_button" />
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_facebook_button" />
</RelativeLayout>

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

@@ -1,140 +0,0 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/black"
tools:context=".MainActivity">
<include
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_below="@id/toolbar"
android:contentDescription="@null"
android:id="@+id/imageView"
android:scaleType="centerCrop" />
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="30dp"
android:gravity="center"
android:padding="5dp"
android:background="@color/main_button"
android:id="@+id/linearLayout">
<TextView
android:id="@+id/lbl_profile_points"
android:text="@string/lbl_main_txt1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
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"
android:textSize="40sp"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/lbl_profile_numberposts"
android:text="@string/lbl_main_txt2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="@color/white"/>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutNotifications"
android:gravity="center"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_above="@+id/layoutFooter">
<TextView
android:id="@+id/lbl_main_notifystatus"
android:text="@string/txt_notifystatus_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white"/>
<TextView
android:id="@+id/lbl_main_notifystatus_status"
android:text="AUS"
android:layout_marginStart="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/white"
tools:ignore="HardcodedText" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<Button
android:id="@+id/btn_main_report"
android:layout_weight="1"
android:textColor="@color/white"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"
android:layout_height="80dp"
style="?android:attr/borderlessButtonStyle"
android:text="@string/btn_main_reportinc" />
<Button
android:id="@+id/btn_main_viewmap"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:paddingRight="10dp"
android:textColor="@color/white"
android:layout_width="0dp"
android:layout_height="80dp"
android:text="@string/btn_main_showmap" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

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

@@ -8,17 +8,8 @@
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.MapsActivity">
<include
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent">
@@ -49,7 +40,15 @@
android:id="@+id/pb_map_progress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true" />
android:layout_alignParentBottom="true" />
<include
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar_trans"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
</RelativeLayout>

13
app/src/main/res/layout/activity_profile.xml
View File

@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:background="@color/bg_report"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ProfileActivity">
@@ -11,7 +11,7 @@
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
layout="@layout/layout_toolbar_col"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
@@ -26,15 +26,6 @@
android:gravity="center"
android:orientation="vertical">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:alpha="0.05"
android:layout_gravity="center_horizontal"
tools:ignore="ContentDescription" />
<android.support.design.widget.TabLayout
android:id="@+id/tab_layout"
android:layout_width="match_parent"

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

@@ -1,140 +1,156 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@color/bg_register"
android:gravity="center"
android:orientation="vertical"
android:padding="20dp"
tools:context=".LoginActivity">
<TextView
android:id="@+id/lbl_register_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_height="54dp"
android:background="@color/bg_common"
android:textColor="@color/md_white_1000"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:gravity="center"
android:text="@string/lbl_register_title"
android:textColor="@color/input_register"
android:textSize="20sp"
android:textStyle="bold"
android:typeface="sans" />
android:textSize="20sp" />
<EditText
android:id="@+id/input_register_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_register_title"
android:layout_marginBottom="10dp"
android:layout_marginTop="20dp"
android:background="@color/input_register_bg"
android:hint="@string/input_register_name_hint"
android:inputType="textCapWords"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_register"
android:textColorHint="@color/input_register_hint" />
<EditText
android:id="@+id/input_register_email"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/input_register_name"
android:layout_marginBottom="10dp"
android:background="@color/input_register_bg"
android:hint="@string/input_register_email_hint"
android:inputType="textEmailAddress"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_register"
android:textColorHint="@color/input_register_hint" />
<EditText
android:id="@+id/input_register_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/input_register_email"
android:layout_marginBottom="10dp"
android:background="@color/input_register_bg"
android:hint="@string/input_register_password_hint"
android:inputType="textPassword"
android:padding="10dp"
android:singleLine="true"
android:textColor="@color/input_register"
android:textColorHint="@color/input_register_hint" />
<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/input_register_password"
android:orientation="horizontal"
android:layout_height="wrap_content"
android:id="@+id/linearLayout2">
android:layout_height="match_parent"
android:layout_below="@+id/lbl_register_title"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:paddingBottom="20dp">
<Button
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_username"
android:layout_marginTop="20dp"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_register_name"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/input_register_name_hint"
android:inputType="textCapWords"
android:padding="10dp"
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_email"
android:layout_below="@+id/input_layout_username"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_register_email"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/input_register_email_hint"
android:inputType="textEmailAddress"
android:padding="10dp"
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id="@+id/input_layout_password"
android:layout_below="@+id/input_layout_email"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:id="@+id/input_register_password"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/input_register_password_hint"
android:inputType="textPassword"
android:padding="10dp"
android:maxLines="1"
android:textColor="@color/input_login"
android:textColorHint="@color/input_login_hint" />
</android.support.design.widget.TextInputLayout>
<com.beardedhen.androidbootstrap.BootstrapButton
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" />
</LinearLayout>
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_below="@id/input_layout_password"
android:layout_marginBottom="5dip"
android:layout_marginTop="20dip"
bootstrap:bootstrapText="@string/btn_start_register"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true" />
<TextView
android:id="@+id/lbl_register_switchtologin"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/bg_common"
android:textAlignment="center"
android:text="@string/txt_register_switchtologin"
android:layout_below="@+id/btn_register"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
<TextView
android:id="@+id/lbl_login_usesocialnet"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnGP"
android:layout_above="@+id/lay_social"
android:layout_centerHorizontal="true"
android:text="@string/lbl_login_usesocialnet"
android:textColor="@color/input_register" />
android:textColor="@color/bg_common"
android:text="@string/lbl_login_usesocialnet" />
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragment.GooglePlusButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnTW"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_googleplus_button" />
<LinearLayout
android:id="@+id/lay_social"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_centerHorizontal="true"
android:gravity="center"
android:layout_alignParentBottom="true"
android:layout_height="wrap_content">
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragment.TwitterButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/frag_login_btnFB"
android:layout_centerHorizontal="true"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_twitter_button" />
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragment.GooglePlusButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_googleplus_button" />
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
android:layout_marginTop="5dp"
tools:layout="@layout/fragment_facebook_button" />
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragment.TwitterButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_twitter_button" />
<TextView
android:id="@+id/lbl_register_switchtologin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:textColor="@color/input_register"
android:text="@string/txt_register_switchtologin" />
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="0dp"
android:layout_margin="1dp"
android:layout_weight="1"
android:layout_height="wrap_content"
tools:layout="@layout/fragment_facebook_button" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

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

@@ -5,12 +5,12 @@
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/layout_bg_gradient"
android:background="@color/bg_report"
tools:context=".ReportWFActivity">
<include
android:id="@+id/toolbar"
layout="@layout/layout_toolbar"
layout="@layout/layout_toolbar_col"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
@@ -30,15 +30,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" >
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:alpha="0.05"
android:layout_gravity="center_horizontal"
tools:ignore="ContentDescription" />
</FrameLayout>

14
app/src/main/res/layout/activity_settings.xml
View File

@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:background="@color/bg_report"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
@@ -11,7 +11,7 @@
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
layout="@layout/layout_toolbar_col"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
@@ -22,16 +22,6 @@
android:layout_gravity="center_horizontal"
android:layout_below="@id/toolbar">
<ImageView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:src="@drawable/logo_380"
android:id="@+id/imageView2"
android:layout_margin="5dp"
android:alpha="0.05"
android:layout_gravity="center_horizontal"
tools:ignore="ContentDescription" />
</FrameLayout>
</RelativeLayout>

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

@@ -1,48 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="org.deke.risk.riskahead.StartActivity"
android:background="#ffffff">
<ImageView
android:id="@+id/image_start_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/logo_riskahead"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:background="#00ffffff"
tools:ignore="ContentDescription" />
<LinearLayout
android:id="@+id/layoutFooter"
android:layout_height="wrap_content"
android:layout_width="fill_parent"
android:layout_alignParentBottom="true">
<Button
android:id="@+id/btn_start_login"
android:text="@string/btn_start_login"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="gotoLogin" />
<Button
android:id="@+id/btn_start_register"
android:text="@string/btn_start_register"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:onClick="gotoRegister" />
</LinearLayout>
</RelativeLayout>

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

@@ -2,7 +2,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:background="@color/bg_report"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SubscriptionsActivity">
@@ -11,7 +11,7 @@
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
layout="@layout/layout_toolbar_col"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
@@ -20,6 +20,7 @@
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_margin="0dp"
android:gravity="center"
android:padding="5dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -30,7 +31,6 @@
android:text="@string/lbl_subs_maintaining"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_margin="5dp"/>
@@ -47,6 +47,7 @@
android:text="@string/lbl_subs_helpus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_margin="5dp"
android:textColor="@color/text_light_grey"/>

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

@@ -12,7 +12,7 @@
android:id="@+id/toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
layout="@layout/layout_toolbar"
layout="@layout/layout_toolbar_col"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />

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

@@ -7,7 +7,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_fb"
android:layout_width="225dp"
android:layout_width="fill_parent"
android:layout_height="50dp"
bootstrap:bootstrapText="{fa_facebook_f} Facebook"
bootstrap:bootstrapBrand="primary"

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

@@ -9,7 +9,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_gp"
android:layout_width="225dp"
android:layout_width="fill_parent"
android:layout_height="50dp"
bootstrap:bootstrapText="{fa_google} Google+"
bootstrap:bootstrapBrand="danger"

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

@@ -73,16 +73,13 @@
android:textColor="@color/bg_common" />
<TextView
android:layout_width="250dp"
android:layout_height="70dp"
android:layout_width="300dp"
android:layout_height="100dp"
android:background="@drawable/layout_bg"
android:hint="@string/hint_place"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/lbl_reportwf_position_detail"
android:layout_below="@+id/lbl_reportwf_1_question_2"
android:layout_centerHorizontal="true"
android:layout_marginStart="20dp"
android:layout_marginBottom="50dp"/>
android:layout_below="@+id/lbl_reportwf_1_question_2"/>
</RelativeLayout>

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

@@ -7,7 +7,7 @@
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_twitter"
android:layout_width="225dp"
android:layout_width="fill_parent"
android:layout_height="50dp"
bootstrap:bootstrapText="{fa_twitter} Twitter"
bootstrap:bootstrapBrand="info"

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

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
xmlns:android="http://schemas.android.com/apk/res/android"
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:background="@color/bg_common"
/>

7
app/src/main/res/layout/layout_toolbar.xml → app/src/main/res/layout/layout_toolbar_trans.xml
View File

@@ -3,11 +3,8 @@
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:background="@color/translucent"
/>

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

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools">
<item android:id="@+id/menu_btn_gotostart"
android:icon="@android:drawable/ic_menu_revert"
android:icon="@android:drawable/ic_input_delete"
app:showAsAction="always"
android:title="@string/lbl_reportwf_newreport" />

92
app/src/main/res/values-ar/strings.xml
View File

@@ -246,70 +246,50 @@
<string name="txt_language_title">غيِر اللغه</string>
<string-array name="cat_situation_main">
<item> حادثه او وضع مهدد</item>
<item>عنف كلامي</item>
<item>بوادر لعنف جسدي كبير</item>
<item>عنف يهدد الحياه</item>
<item>كارثه طبيعيه</item>
<item>كارثه بشريه &amp; بنيه تحتيه</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>تزوير,سرقه,سطو</item>
<item>استعمال المخدرات بشكل مفرطك شرب الكحول</item>
<item>مظاهرات,اعمال شغب,حصار طريق</item>
<item>نقاط تفتيش ومعابر رقابه</item>
<item>فساد,ابتزاز</item>
<item>أجرام, اعمال ميليشيات وارهابيين</item>
<item>غيره &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>تحرش جنسي</item>
<item>لغه مهينه او مهدده</item>
<item>استجواب,ضغط,ارغام</item>
<item>تحريض,دفع</item>
<item>غيره &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>اعتداء جنسي</item>
<item>اعتداء جسدي بشكل عام</item>
<item>شجار او عراك</item>
<item>اعتقال او قبض </item>
<item>عمل مرغوم وبالاجبار</item>
<item>غيره &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>اغتصاب</item>
<item>تعذيب,خطف,احتجاز رهائن</item>
<item>اطلاق نار</item>
<item>تفجير او عمل انتحاري</item>
<item>قتل, اعدام علني</item>
<item>عرض جثث او اجزاء جثث </item>
<item>غيره &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>درجات حراره قصوى</item>
<item>عاصفه,بركان,اعصار</item>
<item>فيضانات,تسونامي</item>
<item>زلزال, انهيارات ارضيه</item>
<item>نيران,دخان,انفجار بركاني</item>
<item>مجاعه,جفاف,طاعون حيواني </item>
<item>غيره &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>تلوث هوائي</item>
<item>انقطاع التيار الكهربائي او حادث عام</item>
<item>انهيار المباني او دمار</item>
<item>حريق على نطاق واسع</item>
<item>كارثه كيميائيه او انسكاب نفط</item>
<item>تفشي مرض او وباء</item>
<item>فوضي او فوضى سياسيه</item>
<item>غيره &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

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

@@ -6,7 +6,7 @@
<string name="lbl_login_title">Anmeldung bei RiskAhead</string>
<string name="lbl_login_resendPW">Passwort vergessen? Klicke hier</string>
<string name="lbl_login_policy"><a href="http://www.riskahead.de/terms/">Impressum</a> und <a href="http://www.riskahead.de/privacy/">Datenschutz</a></string>
<string name="lbl_login_policy"><a href="https://www.riskahead.de/terms/">Impressum</a> und <a href="https://www.riskahead.de/privacy/">Datenschutz</a></string>
<string name="lbl_login_usesocialnet">Oder verwende folgende Netzwerke</string>
<string name="lbl_register_title">Registrierung bei RiskAhead</string>
@@ -239,71 +239,52 @@
<string name="txt_about_riskahead">RiskAhead für 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>
<item>Leichte / schwere körperliche Gewalt</item>
<item>Vorfall</item>
<item>Physische Bedrohung</item>
<item>Lebensgefährliche Gewalt</item>
<item>Naturkatastrophe</item>
<item>Menschl. Katastrophe &amp; Infrastruktur</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Diebstahl, Betrug, Einbruch</item>
<item>Drogenmissbrauch z.B. Getränk</item>
<item>Protest, Unruhe, Straßenblockade</item>
<item>Checkpoint, Kontrollen</item>
<item>Korruption, Erpressung</item>
<item>Einfluss Kriminalität, Milizen, Terror</item>
<item>Sonstiges &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Sexuelle Belästigung</item>
<item>Beleidigung, Drohung</item>
<item>Nötigung/Vernehmung</item>
<item>Aufhetzung</item>
<item>Sonstiges &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Sexueller Übergriff</item>
<item>Angriff auf Person allgemein</item>
<item>Schlägerei</item>
<item>Festnahme/Gefangennahme </item>
<item>Zwangsarbeit</item>
<item>Sonstiges &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Vergewaltigung</item>
<item>Folter, Entführung, Geiselnahme</item>
<item>Schießerei</item>
<item>Explosion, Selbstmordattentat</item>
<item>Mord, Tötung, Hinrichtung</item>
<item>Leichenfund</item>
<item>Sonstiges &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Temperaturextrem</item>
<item>Wind, Sturm, Orkan, Tornado</item>
<item>Überschwemmung/-flutung, Tsunami</item>
<item>Erdbeben, Berghang Einsturz</item>
<item>Feuer, Rauch, Vulkanausbruch</item>
<item>Hungersnot, Tierplage</item>
<item>Sonstiges &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Smog Stadt</item>
<item>Stromausfall, Unfall</item>
<item>Zerstörung, Einsturzgefahr Gebäude</item>
<item>Brandkatastrophe</item>
<item>Chemiekatastrophe, Ölpest</item>
<item>Seuche, Krankheit</item>
<item>Chaos Bevölkerung, Anarchie</item>
<item>Sonstiges &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-es/strings.xml
View File

@@ -246,70 +246,50 @@
<string name="txt_language_title">Cambiar Idioma</string>
<string-array name="cat_situation_main">
<item>Situación o Incidente Peligroso</item>
<item>Violencia Verbal</item>
<item>Violencia Física Ligera o Grave</item>
<item>Riesgo de Muerte por Violencia</item>
<item>Catástrofe Natural</item>
<item>Catástrofe Humana &amp; Infraestructura</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Estafa, Robo o Asalto</item>
<item>Abuso de drogas y bebidas alteradas</item>
<item>Manifestación, Motín o Camino bloqueado</item>
<item>Punto de Control</item>
<item>Corrupción, Extorsión</item>
<item>Milicias, Terrorismo</item>
<item>Otros &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Acoso Sexual</item>
<item>Insulto, Amenaza</item>
<item>Interrogación/Coerción</item>
<item>Incitamiento</item>
<item>Otros &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Asalto Sexual</item>
<item>Ataque Físico en general</item>
<item>Riña, Pelea</item>
<item>Arresto, Captura </item>
<item>Trabajo Forzado</item>
<item>Otros &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Violación</item>
<item>Tortura, Secuestro, Rehenes</item>
<item>Disparos</item>
<item>Bomba, Ataque Suicida</item>
<item>Homicidio, Asesinato, Ejecución Pública</item>
<item>Hallazgo de cádaveres</item>
<item>Otros &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Temperaturas Extremas</item>
<item>Tormenta, Huracán, Tornado</item>
<item>Inundación, Tsunami</item>
<item>Seísmo, Terremoto</item>
<item>Fuego, Humo, Erupción Volcánica</item>
<item>Hambruna, Sequía, Plagua Animal </item>
<item>Otros &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Polución Aérea</item>
<item>Fallida Energética o Accidente General</item>
<item>Derrumbamiento o Destrucción de Edificios</item>
<item>Incendio</item>
<item>Desastre Químico o Derrame de Petróleo</item>
<item>Enfermedad, Brote o Epidemia</item>
<item>Caos, Anarquía</item>
<item>Otros &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-et/strings.xml
View File

@@ -247,70 +247,50 @@
<string name="txt_language_title">Muuda keelt</string>
<string-array name="cat_situation_main">
<item>Ähvardav intsident või situatsioon</item>
<item>Verbaalne vägivald</item>
<item>Kerge kuni raske füüsiline vägivald</item>
<item>Eluohtlik vägivald</item>
<item>Looduskatastroof</item>
<item>Inimkatastroofid &amp; infrastruktuur</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Pettus, Vargus, Rööv või Murdvargus</item>
<item>Narkomaania nt. uimastid</item>
<item>Meeleavaldus, mäss või tee blokaad</item>
<item>Kontrollpunktid, Kontrollid</item>
<item>Korruptsioon, väljapressimine</item>
<item>Kuritegevus, sõjaline või terroristlik tegevus</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Seksuaalne ahistamine</item>
<item>Solvav või ähvardav kõnepruuk</item>
<item>Ülekuulamine, Survestamine või Sundimine</item>
<item>Õhutus</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Seksuaalne rünnak</item>
<item>Füüsiline rünnak üldiselt</item>
<item>kaklus või lööming</item>
<item>Vahistamine või kinnipidamine</item>
<item>Sunnitöö</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Vägistamine</item>
<item>Piinamine, inimrööv, pantvangi võtmine</item>
<item>Tulistamine</item>
<item>Pommi või suitsiidi rünnak</item>
<item>Mõrv,avalik hukkamine</item>
<item>Surnukeha või selle osade näitamine </item>
<item>Muu &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Äärmuslikud temperatuurid</item>
<item>Torm, orkaan, tornaado</item>
<item>Üleujutus, tsunami</item>
<item>Maavärin, maalihe</item>
<item>Tulekahju, suits, vulkaanipurse</item>
<item>Nälg, põud, loomakatk </item>
<item>Muu &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Õhusaaste</item>
<item>Voolukatkestus või üldine õnnetus</item>
<item>Hoonete varingud või häving</item>
<item>Laia leviulatusega tulekahju</item>
<item>Keemiline katastroof või õlileke</item>
<item>Haiguspuhang või epideemia</item>
<item>Kaos, Anarhia</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-fi/strings.xml
View File

@@ -249,70 +249,50 @@
<string name="txt_language_title">Vaihda kieltä</string>
<string-array name="cat_situation_main">
<item> Uhkaava tapaus tai tilanne</item>
<item>Verbaalinen väkivalta</item>
<item>Kevyestä kovaan fyysistä väkivaltaa</item>
<item>Hengenvaarallista väkivaltaa</item>
<item>Luonnonkatastrofi</item>
<item>Ihmisvahingot &amp; Infrastruktuuri</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Huijaus, Varkaus, Pahoinpitely tai Murtovarkaus</item>
<item>Huumeiden väärinkäyttö esim. Drinkin terästäminen</item>
<item>Mielenosoitus, Mellakka tai Tiesulku</item>
<item>Tarkastuspisteitä, Tarkastuksia</item>
<item>Korruptiota, Kiristystä</item>
<item>Rikos, Armeija - tai Terroristi-aktiviteettia </item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Seksuaalinen Ahdistelu</item>
<item>Loukkaavaa tai Uhkaavaa Kielenkäyttöä</item>
<item>Kuulustelu, Painostus tai Pakottaminen</item>
<item>Yllyttäminen</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Seksuaalinen ahdistelu</item>
<item>Fyysinen väkivalta</item>
<item>Tappelu tai joukkotappelu</item>
<item>Pidätys tai sieppaus </item>
<item>Pakkotyö</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Raiskaus</item>
<item>Kidutus, Kidnappaus, Panttivangin ottaminen</item>
<item>Ampuminen</item>
<item>Pommi tai Itsemurhahyökkäys</item>
<item>Murha, Julkinen Teloitus</item>
<item>Näkyvillä ruumis tai ruumiinosia </item>
<item>Muu &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Äärilämpötiloja</item>
<item>Myrsky, Hurrikaani, Tornado</item>
<item>Tulvimista, Tsunami</item>
<item>Maanjäristys, Maanvyöry</item>
<item>Tuli, Savu, Tulivuorenpurkaus</item>
<item>Nälänhätä, Kuivuus, Karjarutto </item>
<item>Muu &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Ilmansaaste</item>
<item>Sähkökatkos tai Onnettomuus</item>
<item>Romahtavia rakennuksia tai Tuhoutuminen</item>
<item>Laajalle levinnyt tulipalo</item>
<item>Kemiallinen onnettomuus tai Öljyvuoto</item>
<item>Taudin leviäminen tai Epidemia</item>
<item>Kaaos, Anarkia</item>
<item>Muu &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-fr/strings.xml
View File

@@ -244,70 +244,50 @@
<string name="txt_language_title">Changer Langue</string>
<string-array name="cat_situation_main">
<item>Incident ou situation menaçante</item>
<item>Violence verbale</item>
<item>Violence légère à lourde</item>
<item>Violence mortelle</item>
<item>Catastrophe naturelle</item>
<item>Catastrophe humaine &amp; Infrastructure</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Fraude, vol, cambriolage, ???</item>
<item>prévention de la toxicomanie ou ????</item>
<item>Démonstration, émeute ou barrage routier</item>
<item>Point de contrôle, Contrôles</item>
<item>Corruption, Extortion</item>
<item>Crime, activités militaires ou terroristes</item>
<item>autre &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Harcèlement sexuel</item>
<item>Langage insultant ou menaçant</item>
<item>Interrogatoire, pression ou contrainte</item>
<item>Incitement</item>
<item>Autre &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>agression sexuelle</item>
<item>attaque physique généralisée</item>
<item>combat ou rixe</item>
<item>Arrestation ou capture </item>
<item>travail forcé</item>
<item>autre &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Viol</item>
<item>Torture, Kidnapping, prise d\'otage</item>
<item>Fusillade</item>
<item>Bombe ou attentat</item>
<item>Meurtre, exécution publique</item>
<item>Affichage de cadavre ou de parties de cadavre </item>
<item>autre &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Températures extrêmes</item>
<item>Tempête, ouragan, tornade</item>
<item>Innondation, Tsunami</item>
<item>Tremblement de terre, glissement de terrain</item>
<item>Feu, fumée, irruption volcanique</item>
<item>Famine, sécheresse, peste animal </item>
<item>autre &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Pollution de l\'air</item>
<item>Panne de courant ou accident général</item>
<item>Effondrement de bâtiment ou destruction</item>
<item>Feu généralisé</item>
<item>Catastrophe chimique ou déversement de pétrole</item>
<item>Maladie déclenchement ou épidémie</item>
<item>Chaos, Anarchie</item>
<item>autre &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-lv/strings.xml
View File

@@ -247,70 +247,50 @@
<string name="txt_language_title">Mainīt valodu</string>
<string-array name="cat_situation_main">
<item>Bīstams incidents vai stāvoklis</item>
<item>Verbālā vardarbība</item>
<item>Viegla līdz smaga fiziskā vardarbība</item>
<item>Dzīvībai bīstama vardarbība</item>
<item>Dabas katastrofa</item>
<item>Cilvēku izraisīta katastrofa &amp; Infrastruktūra</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Krāpšana, zādzība, laupīšana vai ielaušanās</item>
<item>Sazāļošana, piem., dzēriena sazāļošana</item>
<item>Demonstrācija, dumpis vai ceļu blokāde</item>
<item>Kontrolpunkti, kontroles</item>
<item>Korupcija, izspiešana</item>
<item>Noziegums, zemessardzes vai terositu darbības</item>
<item>Cits &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Seksuāla uzmākšanās</item>
<item>Aizskaroša vai apdraudoša valoda</item>
<item>Pratināšana, piespiešana vai apspiešana</item>
<item>Kūdīšana</item>
<item>Cits &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Seksuāls uzbrukums</item>
<item>Fizisks uzbrukums</item>
<item>Cīņa vai tracis</item>
<item>Arests vai sagūstīšana </item>
<item>Piespiedu darbs</item>
<item>Cits &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Izvarošana</item>
<item>Spīdzināšana, nolaupīšana, ķīlnieku sagūstīšana</item>
<item>Apšaude</item>
<item>Spridzekļu vai pašnāvnieku uzbrukums</item>
<item>Slepkavība, publisks nāvessods</item>
<item>Līķu vai ķermeņa daļu izstādīšana </item>
<item>Cits &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Ekstremālas gaisa temperatūras</item>
<item>Vētra, orkāns, viesuļvētra</item>
<item>Plūdi, cunami</item>
<item>Zemestrīce, nogruvums</item>
<item>Ugunsgrēks, dūmi, vulkāna izvirdums</item>
<item>Bads, sausums, dzīvnieku mēris </item>
<item>Cits &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Gaisa piesārņojums</item>
<item>Enerģijas pārtraukums vai nelaimes gadījums</item>
<item>Ēkas sabrukšana vai izpostīšana</item>
<item>Plašs ugunsgrēks</item>
<item>Ķīmiskā katastrofa vai naftas noplūde</item>
<item>Slimības uzliesmojums vai epidēmija</item>
<item>Haoss, anarhija</item>
<item>Cits &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

94
app/src/main/res/values-mn/strings.xml
View File

@@ -249,72 +249,50 @@
<string name="txt_language_title">Хэл солих</string>
<string-array name="cat_situation_main">
<item> Аюултай нөхцөл байдал</item>
<item>Сэтгэл зүйн хүчирхийлэл</item>
<item>Хөнгөнөөс хүнд хүртэлх бие махбодийн хүчирхийлэл</item>
<item>Амь насанд аюултай хүчирхийлэл</item>
<item>Байгалийн гамшиг</item>
<item>Хүний буруутай үйлдлээс үүдэлтэй гамшиг &amp; Дэд бүтэц</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>залилан, хулгай, халдлага, орон байрны хулгай</item>
<item>Хар тамхи</item>
<item>Жагсаал цуглаан, үймээн, замд саад учруулах</item>
<item>Шалган нэвтрүүлэх цэг, Хяналт</item>
<item>Авилга, Сүрдүүлэг</item>
<item>Гэмт хэрэг, Цэргийн эсвэл тероррист үйл ажиллагаа</item>
<item>Бусад &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Бэлгийн дарамт</item>
<item>Доромжлох эсвэл хэл ярианд занал хийх </item>
<item>Байцаах, Дарамт буюу албадлага</item>
<item>Турхиралт</item>
<item>Бусад &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Бэлгийн дарамт үзүүлэхээр завдах</item>
<item>Бие мах бодийн дайралт</item>
<item>Зодоон </item>
<item>Баривчилгаа </item>
<item>Албадан хөдөлмөрлүүлэх</item>
<item>Бусад&#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Хүчингийн хэрэг</item>
<item>Эрүү шүүлт, хүн хулгайлах, барьцаалах</item>
<item>Буудалцах</item>
<item>Тэсрэх бөмбөг буюу амиа хорлох довтолгоо</item>
<item>Аллага, цаазаар авах</item>
<item>Цогцсын хэсэг</item>
<item>Бусад &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Хэт их температур</item>
<item>Шуурга, хар салхи</item>
<item>Үер, цунами</item>
<item>Газар хөдлөлт, хөрсний нуралт</item>
<item>Гал, утаа, галт уулын дэлбэрэлт</item>
<item>Өлсгөлөн, ган, тарваган тахал </item>
<item>Бусад &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Агаарын бохирдол</item>
<item>Цахилгаан тасрах буюу ерөнхий осол</item>
<item>Барилгын нуралт буюу устгал</item>
<item>Өргөн хүрээтэй гал түймэр</item>
<item>Химийн осол буюу газрын тос алдагдах</item>
<item>Халдварт өвчин гарах буюу тархах</item>
<item>Эмх замбараагүй байдал</item>
<item>Бусад &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-nl/strings.xml
View File

@@ -247,70 +247,50 @@
<string name="txt_language_title">Verander Taal</string>
<string-array name="cat_situation_main">
<item>Een dreigend Incident of Situatie</item>
<item>Verbaal geweld</item>
<item>Licht tot Zwaar Lichamelijk Geweld</item>
<item>Levensbedreigend Geweld</item>
<item>Natuurramp</item>
<item>Menselijke Rampen &amp; Infrastructuur</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Oplichting, Diefstal, Beroving of Inbraak</item>
<item>Drugs Misbruik bijv. Drugs in drankje</item>
<item>Demonstratie, Rellen of Wegversperring</item>
<item>Controlepost, Controle</item>
<item>Corruptie, Afpersing</item>
<item>Criminaliteit, Militie or Terrorist Activiteiten</item>
<item>Anders &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Sexuele Overlast</item>
<item>Beledigend of dreigende taal</item>
<item>Ondervraging, onder druk zetten of dwang</item>
<item>Aansporing</item>
<item>Anders &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Sexuele Aanval</item>
<item>Fysieke Aanval in het algemeen</item>
<item>Een Gevecht of vechtpartij</item>
<item>Arrestatie of Gevangenneming</item>
<item>Gedwongen Arbeid</item>
<item>Anders &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Verkrachting</item>
<item>Marteling, ontvoering, gijzeling</item>
<item>Beschieting</item>
<item>Bom of Zelfmoord Aanval</item>
<item>Moord, Publieke Executie</item>
<item>Tentoonstelling van lijk of lijkdelen</item>
<item>Anders &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Extreme Temperaturen</item>
<item>Storm, Orkaan, Tornado</item>
<item>Overstroming, Tsunami</item>
<item>Aardbeving, Aardverschuiving</item>
<item>Brand, Rook, Vulkaanuitbarsting</item>
<item>Hongersnood, Droogte, Dieren plaag </item>
<item>Anders &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Luchtvervuiling</item>
<item>Stroomstoring of Algemeen Ongeval</item>
<item>Instortende of Slopen Gebouwen</item>
<item>Wijdverspreide brand</item>
<item>Chemische of olieramp</item>
<item>Ziekte-uitbraak of epidemie</item>
<item>Chaos, anarchie</item>
<item>Anders &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-pl/strings.xml
View File

@@ -247,70 +247,50 @@
<string name="txt_language_title">Zmień język</string>
<string-array name="cat_situation_main">
<item>Niebezpieczne zdarzenie lub sytuacja</item>
<item>Przemoc słowna</item>
<item>Lekka lub poważna przemoc fizyczna</item>
<item>Przemoc zagrażająca życiu</item>
<item>Klęska żywiołowa</item>
<item>Zagrożenie wywołane przez ludzi &amp; Infrastruktura</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Oszustwo, kradzież, napad lub włamanie</item>
<item>Narkotyki, np. podawane w drinkach</item>
<item>Demonstracje lub blokady drogowe</item>
<item>Rewizje, kontrole</item>
<item>Korupcja, wymuszenia</item>
<item>Przestępcy, terroryści, bojówki</item>
<item>Inne &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Sexual Harassment</item>
<item>Insulting or Threatening Language</item>
<item>Interrogation, Pressuring or Coercing</item>
<item>Incitement</item>
<item>Other &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Molestowanie</item>
<item>Ogólne ataki fizyczne</item>
<item>Bójka</item>
<item>Aresztowanie lub schwytanie</item>
<item>Praca przymusowa</item>
<item>Inne &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Gwałt</item>
<item>Torturowanie, porwanie, zakładnicy</item>
<item>Strzelanina</item>
<item>Atak bombowy lub samobójczy</item>
<item>Morderstwo, publiczna egzekucja</item>
<item>Pokazywanie martwych ciał</item>
<item>Inne &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Skrajne temperatury</item>
<item>Burza, huragan, tornado</item>
<item>Powódź, tsunami</item>
<item>Trzęsienie ziemi, osunięcie ziemi</item>
<item>Ogień, dym, erupcja wulkanu</item>
<item>Głód, susza, zaraza zwierzęca </item>
<item>Inne &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Zanieczyszczenie powietrza</item>
<item>Brak energii lub ogólny wypadek</item>
<item>Zawalenie lub zniszczenie budynku</item>
<item>Rozległy pożar</item>
<item>Katastrofa chemiczna lub wyciek ropy</item>
<item>Epidemia</item>
<item>Chaos, anarchia</item>
<item>Inne &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-pt/strings.xml
View File

@@ -261,70 +261,50 @@ Não foi possível recuperar as configurações do perfil
<string-array name="cat_situation_main">
<item> Um incidente ou situação de ameaça</item>
<item>Violência Verbal</item>
<item>Violência Física</item>
<item>Ameaça de morte </item>
<item>Disastre natural</item>
<item>Disastre humano &amp; Infraestrutura</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Fraude, furto, roubo ou agressão</item>
<item>Abuso de Drogas bebida </item>
<item>Demonstração, motim, manifestação ou bloqueio rodoviário</item>
<item>Postos de controle, Controles</item>
<item>Corrupção, Extorção</item>
<item>Crime, Milicia ou atividades terroristas</item>
<item>Outro&#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Abuso Sexual</item>
<item>Linguagem insultuosa e ameaçando</item>
<item>Interrogatório, pressionar ou coagir</item>
<item>Inciamento</item>
<item>Outro &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Agressão sexual</item>
<item>Ataque fisico em geral</item>
<item>Uma briga, Luta</item>
<item>Prender ou capturar</item>
<item>Trabalho Forçado</item>
<item>Outro &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Estrupo</item>
<item>Tortura, Sequestro, Refens</item>
<item>Tiroteio</item>
<item>Ataque suicida, Bombas</item>
<item>Execução Publica, assassinato</item>
<item>Exibição de corpos </item>
<item>Outros &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Temperaturas extremas</item>
<item>Tempestade, Furacão, Tornado</item>
<item>Inundação, Tsunami</item>
<item>Terremoto, Deslizamento</item>
<item>Fogo,Fumaça, Erupção Vulcanica</item>
<item>Fome, seca, peste animal</item>
<item>Outro &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Poluição do Ar</item>
<item>Falha de energia ou General Accident</item>
<item>Edifícios em colapso ou destruição</item>
<item>Fogo generalizado</item>
<item>Derramento de oléo ou desastre químico</item>
<item>Surto ou epidemia da doença</item>
<item>Caos, anarquia</item>
<item>Outro &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-ru/strings.xml
View File

@@ -245,70 +245,50 @@
<string name="txt_language_title">изменить язык</string>
<string-array name="cat_situation_main">
<item>Угрожающее происшествие или ситуация</item>
<item>Словесная перепалка</item>
<item>Виды физического насилия</item>
<item>Угроза для жизни</item>
<item>Природная катастрофа</item>
<item>Техногенная катастрофа&amp;</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>кража,грабеж,воровство</item>
<item>злоупотребление наркотиками</item>
<item>демонстрации,бунты </item>
<item>контрольные пункты</item>
<item>коррупция или вымогательство</item>
<item>криминал или активность террористов</item>
<item>другое &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>сексуальное насилие</item>
<item>оскорбление или словесная угроза</item>
<item>оказание давление или принуждение</item>
<item>подстрекательство</item>
<item>другое &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>сексуальное насилие</item>
<item>физическое нападение</item>
<item>драка или ссора</item>
<item>арест или захват заложников </item>
<item>принудительный труд</item>
<item>другое &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>изнасилование</item>
<item>пытка,похищение,захват заложников</item>
<item>стрельба</item>
<item>взрыв или атака смертника</item>
<item>убийство, публичная казнь</item>
<item>труп или части тела</item>
<item>другое &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>экстремальная температура</item>
<item>шторм,буря,торнадо</item>
<item>затопление или цунами</item>
<item>землетрясение</item>
<item>огонь,дым,извержение вулкана</item>
<item>голод,засуха </item>
<item>другое &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>загрязнение воздуха</item>
<item>перебои с электричеством</item>
<item>разрушение зданий</item>
<item>пожар</item>
<item>химическая катастрофа</item>
<item>вспышка заболевания или эпидемия</item>
<item>хаос и анархия</item>
<item>другое &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

92
app/src/main/res/values-tr/strings.xml
View File

@@ -247,70 +247,50 @@
<string name="txt_language_title">Dili değiştir</string>
<string-array name="cat_situation_main">
<item>Tehdit edici olay ya da durum</item>
<item>Sözlü Şiddet</item>
<item>Hafif-Ağır Fiziksel Şiddet</item>
<item>Hayatı Tehdit Eden Şiddet</item>
<item>Doğal Felaket</item>
<item>İnsani Felaketler &amp; Altyapı</item>
<item>Threat</item>
<item>Physical</item>
<item>Life-Threatening</item>
<item>Disaster</item>
</string-array>
<string-array name="cat_situation_sub_general">
<item>Sahtecilik, Hırsızlık ya da Saldırı</item>
<item>Madde Bağımlılığı, örn. alkol</item>
<item>Gösteri, Ayaklanma ya da Yol Kapama</item>
<item>Kontrol noktası, Kontroller</item>
<item>Yolsuzluk, Haraca Bağlama</item>
<item>Cürüm, Milis ya da Terör Faaliyetleri</item>
<item>Diğer &#8230;</item>
<string-array name="cat_situation_sub_threat">
<item>Robbery</item>
<item>Drug related</item>
<item>Strike/Riot</item>
<item>Checkpoint/Blockade</item>
<item>Corruption/Extorsion</item>
</string-array>
<string-array name="cat_situation_sub_verbal">
<item>Cinsel Taciz</item>
<item>Hakaret ya da Tehditvari Dile Başvurma</item>
<item>Sorgulama, Baskı ya da Zorlama</item>
<item>Tahrik</item>
<item>Diğer &#8230;</item>
<string-array name="cat_situation_sub_physical">
<item>Mugging</item>
<item>Sexual Assault</item>
<item>Physical Attack</item>
<item>Fight</item>
<item>Arrest/Capture</item>
<item>Forced Labour</item>
</string-array>
<string-array name="cat_situation_sub_force">
<item>Cinsel Saldırı</item>
<item>Fiziksel Saldırı</item>
<item>Kavga ya da Arbede</item>
<item>Tutuklama ya da Alıkoyma </item>
<item>Zorunlu Çalışma</item>
<item>Diğer &#8230;</item>
<string-array name="cat_situation_sub_lifethreat">
<item>Rape</item>
<item>Kidnapping/Hostage</item>
<item>Shooting</item>
<item>Bombing</item>
<item>Murder</item>
<item>Dead body</item>
</string-array>
<string-array name="cat_situation_sub_force_serious">
<item>Tecavüz</item>
<item>İşkence, Adam Kaçırma, Rehine Alma</item>
<item>Ateş Açma</item>
<item>Bomba ya da İntihar Saldırısı</item>
<item>Cinayet, İnfaz</item>
<item>CCesedin ya da ceset parçalarının gösterilmesi</item>
<item>Diğer &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_nature">
<item>Aşırı Sıcaklık</item>
<item>Fırtına, Kasırga, Hortum</item>
<item>Sel, Tsunami</item>
<item>Deprem, Toprak Kayması</item>
<item>Yangın, Duman, Volkanik Patlama</item>
<item>Açlık, Kıtlık, Hayvan Vebası </item>
<item>Başka &#8230;</item>
</string-array>
<string-array name="cat_situation_sub_infrastructure">
<item>Hava kirliliği</item>
<item>Güç kesintisi ya da kaza</item>
<item>Bina çökmesi ya da yıkımı</item>
<item>Geniş alan yayılmış yangın</item>
<item>Kimyasal felaket ya da petrol sızıntısı</item>
<item>Felaket başlangıcı ya da epidemik</item>
<item>Kaos, Anarşi</item>
<item>Diğer &#8230;</item>
<string-array name="cat_situation_sub_disaster">
<item>Heat Wave</item>
<item>Cyclone/Tornado</item>
<item>Flood</item>
<item>Earthquake</item>
<item>Wild Fire</item>
<item>Volcano</item>
<item>Tsunami</item>
<item>Fire</item>
<item>Chemical/Oil Spill</item>
<item>Epidemic</item>
<item>Chaos/Anarchy</item>
</string-array>
<string-array name="cat_time_main">

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

@@ -1,8 +1,8 @@
<resources>
<color name="bg_login">#c7c7c7</color>
<color name="bg_register">#2e3237</color>
<color name="bg_login">#ffffff</color>
<color name="bg_register">#ffffff</color>
<color name="bg_report">#f5f5f5</color>
<color name="bg_common">#1175b7</color>
@@ -11,19 +11,21 @@
<color name="bg_common_2">#0461a8</color>
<color name="common_text">#333333</color>
<color name="actionbar_text">#fdfdfd</color>
<color name="actionbar_text">#000000</color>
<color name="text_light_grey">#aa4b4b4b</color>
<color name="black">#000000</color>
<color name="white">#f5f5f5</color>
<color name="translucent">#609e9e9e</color>
<color name="input_login">#222222</color>
<color name="input_login_hint">#999999</color>
<color name="input_register">#afafaf</color>
<color name="input_login_hint">#5b5b5b</color>
<color name="input_register">#181818</color>
<color name="input_register_bg">#3b4148</color>
<color name="input_register_hint">#8c9094</color>
<color name="input_register_hint">#5b5b5b</color>
<color name="btn_login_bg">#1175b7</color>
</resources>

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

@@ -6,12 +6,12 @@
<string name="btn_start_login">Login</string>
<string name="btn_start_register">Register</string>
<string name="lbl_login_title">Log-in to RiskAhead</string>
<string name="lbl_login_title">Log in</string>
<string name="lbl_login_resendPW">Forgot your password? Click here</string>
<string name="lbl_login_policy"><a href="https://www.riskahead.de/terms/">Terms of Service</a> and <a href="https://www.riskahead.de/privacy/">Privacy Policy</a></string>
<string name="lbl_login_usesocialnet">Or use following social networks to sign in</string>
<string name="lbl_register_title">Register to RiskAhead</string>
<string name="lbl_register_title">Register</string>
<string name="input_register_name_hint">Username</string>
<string name="input_register_email_hint">E-Mail</string>
<string name="input_register_password_hint">Password</string>

42
app/src/main/res/values/styles.xml
View File

@@ -8,48 +8,28 @@
<style name="MyRiskAheadTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:textViewStyle">@style/App_TextViewStyle</item>
<item name="android:editTextStyle">@style/App_EditTextStyle</item>
<!-- ...and here we setting appcompat’s color theme attrs -->
<item name="colorPrimary">@color/bg_common</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<item name="colorAccent">#02A8F3</item>
</style>
<style name="MyRiskAheadToolbar" parent="Theme.AppCompat.NoActionBar">
<!-- android:textColorPrimary is the color of the title text
in the Toolbar, in the Theme.AppCompat theme: -->
<item name="android:textColorPrimary">@color/actionbar_text</item>
<item name="colorPrimary">@color/bg_common</item>
<item name="colorPrimaryDark">@color/bg_common_2</item>
<!-- android:textColorPrimaryInverse is the color of the title
text in the Toolbar, in the Theme.AppCompat.Light theme: -->
<!-- <item name="android:textColorPrimaryInverse">@color/abc_primary_text_material_light</item> -->
<!-- android:actionMenuTextColor is the color of the text of
action (menu) items in the Toolbar, at least in the
Theme.AppCompat theme.
For some reason, they already get the textColorPrimary
when running on API 21, but not on older versions of
Android, so this is only necessary to support older
Android versions.-->
<item name="actionMenuTextColor">@color/abc_primary_text_material_light</item>
<!-- android:textColorSecondary is the color of the menu
overflow icon (three vertical dots) -->
<item name="android:textColorSecondary">@color/actionbar_text</item>
<!-- This would set the toolbar's background color,
but setting this also changes the popup menu's background,
even if we define popupTheme for our <Toolbar> -->
<!-- <item name="android:background">@color/color_primary</item> -->
<style name="MyRiskAheadToolbar" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:textColorPrimary">@color/bg_common</item>
<item name="android:textColorSecondary">@color/bg_common</item>
<item name="windowActionBarOverlay">true</item>
<item name="actionMenuTextColor">@color/bg_common</item>
</style>
<style name="App_EditTextStyle" parent="@android:style/Widget.EditText">
<item name="android:textColor">@color/common_text</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
<item name="android:textColor">@color/actionbar_text</item>
</style>
<style name="App_TextViewStyle" parent="@android:style/Widget.TextView">
<item name="android:textColor">@color/common_text</item>
<item name="android:fontFamily" tools:targetApi="jelly_bean">sans-serif</item>
<item name="android:textColor">@color/black</item>
<item name="android:textSize">14sp</item>
</style>
</resources>

2
app/src/main/res/xml/searchable.xml
View File

@@ -3,10 +3,8 @@
android:label="@string/app_name"
android:hint="@string/search_hint"
android:searchSettingsDescription="@string/search_settings"
android:searchSuggestAuthority="org.deke.risk.riskahead.helper.PlaceProvider"
android:searchSuggestIntentAction="android.intent.action.VIEW"
android:searchSuggestSelection=" ?"
android:searchSuggestThreshold="2" >
</searchable>