DT @12.09.2015: Refactored, report activity extended
This commit is contained in:
@@ -8,20 +8,21 @@
|
||||
android:orientation="vertical"
|
||||
tools:context=".LoginActivity">
|
||||
|
||||
<TextView android:text="@string/txt_welcome_login"
|
||||
<TextView
|
||||
android:id="@+id/lbl_login_title"
|
||||
android:text="@string/lbl_login_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textSize="20sp"
|
||||
android:typeface="sans"
|
||||
android:textStyle="bold"
|
||||
android:id="@+id/hello" />
|
||||
android:textStyle="bold" />
|
||||
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_email"
|
||||
android:hint="@string/hint_email"
|
||||
android:id="@+id/input_register_email"
|
||||
android:hint="@string/input_register_email_hint"
|
||||
android:inputType="textEmailAddress"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -31,11 +32,11 @@
|
||||
android:textColor="@color/input_login"
|
||||
android:textColorHint="@color/input_login_hint"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_below="@+id/hello" />
|
||||
android:layout_below="@+id/lbl_login_title" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_password"
|
||||
android:hint="@string/hint_password"
|
||||
android:id="@+id/input_register_password"
|
||||
android:hint="@string/input_register_password_hint"
|
||||
android:inputType="textPassword"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -44,73 +45,70 @@
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/input_login"
|
||||
android:textColorHint="@color/input_login_hint"
|
||||
android:layout_below="@+id/input_email"
|
||||
android:layout_below="@+id/input_register_email"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_marginTop="5dp" />
|
||||
|
||||
<!-- Login Button -->
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_register"
|
||||
android:text="@string/btn_start_login"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dip"
|
||||
android:layout_marginTop="20dip"
|
||||
android:id="@+id/btnSignUp"
|
||||
android:background="@color/btn_login_bg"
|
||||
android:text="@string/btn_login"
|
||||
android:textColor="@color/btn_login"
|
||||
android:minWidth="120dp"
|
||||
android:layout_below="@+id/input_password"
|
||||
android:layout_below="@+id/input_register_password"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_login_policy"
|
||||
android:text="@string/lbl_login_policy"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:gravity="end"
|
||||
android:id="@+id/txt_policy"
|
||||
android:text="@string/txt_policy"
|
||||
android:layout_alignTop="@+id/txt_resend_password"
|
||||
android:layout_alignTop="@+id/lbl_login_resendPW"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true" />
|
||||
|
||||
<TextView
|
||||
android:text="@string/txt_useFBorGP"
|
||||
android:id="@+id/lbl_login_usesocialnet"
|
||||
android:text="@string/lbl_login_usesocialnet"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/textView"
|
||||
android:layout_above="@+id/fragment_btn_gp"
|
||||
android:layout_above="@+id/frag_login_btnGP"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnGP"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.GooglePlusButtonFragment"
|
||||
android:id="@+id/fragment_btn_gp"
|
||||
tools:layout="@layout/fragment_googleplus_button"
|
||||
android:layout_above="@+id/fragment_btn_tw"
|
||||
android:layout_above="@+id/frag_login_btnTW"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="5dp"/>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnTW"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.TwitterButtonFragment"
|
||||
android:id="@+id/fragment_btn_tw"
|
||||
tools:layout="@layout/fragment_twitter_button"
|
||||
android:layout_above="@+id/fragment_btn_fb"
|
||||
android:layout_above="@+id/frag_login_btnFB"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="5dp"
|
||||
/>
|
||||
android:layout_marginTop="5dp"/>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnFB"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.FacebookButtonFragment"
|
||||
android:id="@+id/fragment_btn_fb"
|
||||
tools:layout="@layout/fragment_facebook_button"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
@@ -118,14 +116,14 @@
|
||||
android:layout_marginTop="5dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_login_resendPW"
|
||||
android:text="@string/lbl_login_resendPW"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:onClick="onClick"
|
||||
android:clickable="true"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:text="@string/txt_resend_password"
|
||||
android:id="@+id/txt_resend_password"
|
||||
android:layout_below="@+id/btnSignUp"
|
||||
android:layout_below="@+id/btn_register"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
|
||||
|
||||
@@ -9,54 +9,54 @@
|
||||
tools:context=".MainActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView1"
|
||||
android:id="@+id/lbl_main_txt1"
|
||||
android:text="@string/lbl_main_txt1"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="We have currently ..."
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="52dp"
|
||||
android:textColor="@color/white"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/txt_incidents"
|
||||
android:id="@+id/txt_main_incidents"
|
||||
android:text="0"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="0"
|
||||
android:layout_marginTop="38dp"
|
||||
android:layout_below="@+id/textView1"
|
||||
android:layout_below="@+id/lbl_main_txt1"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView2"
|
||||
android:id="@+id/lbl_main_txt2"
|
||||
android:text="@string/lbl_main_txt2"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceLarge"
|
||||
android:text="... reported incidents"
|
||||
android:layout_marginTop="34dp"
|
||||
android:textColor="@color/white"
|
||||
android:layout_below="@+id/txt_incidents"
|
||||
android:layout_below="@+id/txt_main_incidents"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/textView3"
|
||||
android:id="@+id/lbl_main_share"
|
||||
android:text="@string/lbl_main_share"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:text="Contribute and share your information"
|
||||
android:layout_above="@+id/LinearLayout02"
|
||||
android:layout_above="@+id/ll_01"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginBottom="26dp" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/LinearLayout02"
|
||||
android:id="@+id/ll_01"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="fill_parent"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
@@ -67,23 +67,24 @@
|
||||
android:layout_marginBottom="43dp">
|
||||
|
||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||
android:id="@+id/btn_report"
|
||||
android:id="@+id/btn_main_report"
|
||||
android:text="@string/btn_main_report"
|
||||
android:layout_weight="1"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Report" android:layout_weight="1"
|
||||
bootstrap:bb_icon_left="fa-map-marker"
|
||||
bootstrap:bb_type="danger"
|
||||
bootstrap:bb_roundedCorners="true" />
|
||||
|
||||
<com.beardedhen.androidbootstrap.BootstrapButton
|
||||
android:id="@+id/btn_view_map"
|
||||
android:id="@+id/btn_main_viewmap"
|
||||
android:text="@string/btn_main_viewmap"
|
||||
android:paddingLeft="@dimen/activity_horizontal_margin"
|
||||
android:paddingRight="@dimen/activity_horizontal_margin"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" android:layout_weight="1"
|
||||
android:text="View Map"
|
||||
bootstrap:bb_icon_left="fa-info"
|
||||
bootstrap:bb_type="primary"
|
||||
bootstrap:bb_roundedCorners="true"/>
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
tools:context="org.deke.risk.riskahead.MapsActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:id="@+id/map"
|
||||
android:id="@+id/frag_maps_map"
|
||||
tools:context=".MapsActivity"
|
||||
android:name="com.google.android.gms.maps.SupportMapFragment" />
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -8,53 +8,47 @@
|
||||
tools:context="org.deke.risk.riskahead.ProfileActivity">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_centerInParent="true"
|
||||
android:layout_marginLeft="20dp"
|
||||
android:layout_marginRight="20dp"
|
||||
android:gravity="center"
|
||||
android:orientation="vertical" >
|
||||
|
||||
<TextView
|
||||
android:text="@string/lbl_profile_title"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/welcome"
|
||||
android:textSize="20dp" />
|
||||
android:textSize="20dp"
|
||||
android:layout_gravity="center_horizontal" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/name"
|
||||
android:id="@+id/txt_profile_name"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:textColor="@color/lbl_name"
|
||||
android:textSize="24dp" />
|
||||
android:textSize="24dp"
|
||||
android:layout_gravity="center_horizontal" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/email"
|
||||
android:layout_width="wrap_content"
|
||||
android:id="@+id/txt_profile_email"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="13dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btnLogout"
|
||||
android:id="@+id/btn_profile_logout"
|
||||
android:text="@string/btn_profile_logout"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="40dip"
|
||||
android:background="@color/btn_logut_bg"
|
||||
android:text="@string/btn_logout"
|
||||
android:textAllCaps="false"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="15dp" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/test"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:textColor="@color/lbl_name"
|
||||
android:textSize="24dp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
@@ -9,8 +9,8 @@
|
||||
tools:context=".LoginActivity">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/hello"
|
||||
android:text="@string/txt_welcome_register"
|
||||
android:id="@+id/lbl_register_title"
|
||||
android:text="@string/lbl_register_title"
|
||||
android:textColor="@color/input_register"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -21,109 +21,108 @@
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_full_name"
|
||||
android:id="@+id/input_register_name"
|
||||
android:hint="@string/input_register_name_hint"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/input_register_bg"
|
||||
android:hint="@string/hint_name"
|
||||
android:padding="10dp"
|
||||
android:singleLine="true"
|
||||
android:inputType="textCapWords"
|
||||
android:textColor="@color/input_register"
|
||||
android:textColorHint="@color/input_register_hint"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_below="@+id/hello" />
|
||||
android:layout_below="@+id/lbl_register_title" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_email"
|
||||
android:id="@+id/input_register_email"
|
||||
android:hint="@string/input_register_email_hint"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/input_register_bg"
|
||||
android:hint="@string/hint_email"
|
||||
android:inputType="textEmailAddress"
|
||||
android:padding="10dp"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/input_register"
|
||||
android:textColorHint="@color/input_register_hint"
|
||||
android:layout_below="@+id/input_full_name"/>
|
||||
android:layout_below="@+id/input_register_name"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_password"
|
||||
android:id="@+id/input_register_password"
|
||||
android:hint="@string/input_register_password_hint"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:background="@color/input_register_bg"
|
||||
android:hint="@string/hint_password"
|
||||
android:inputType="textPassword"
|
||||
android:padding="10dp"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/input_register"
|
||||
android:textColorHint="@color/input_register_hint"
|
||||
android:layout_below="@+id/input_email" />
|
||||
android:layout_below="@+id/input_register_email" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_register"
|
||||
android:text="@string/btn_start_register"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="40dp"
|
||||
android:layout_marginTop="20dp"
|
||||
android:layout_marginBottom="20dp"
|
||||
android:minWidth="120dp"
|
||||
android:id="@+id/btnSignUp"
|
||||
android:background="#ffea7f8a"
|
||||
android:text="@string/btn_register"
|
||||
android:textColor="@color/white"
|
||||
android:layout_below="@+id/input_password"
|
||||
android:layout_below="@+id/input_register_password"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentStart="true" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_login_policy"
|
||||
android:text="@string/lbl_login_policy"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="right"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="@color/input_register"
|
||||
android:id="@+id/txt_policy"
|
||||
android:text="@string/txt_policy"
|
||||
android:layout_alignTop="@+id/btnSignUp"
|
||||
android:layout_alignTop="@+id/btn_register"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentEnd="true" />
|
||||
|
||||
<TextView
|
||||
android:text="@string/txt_useFBorGP"
|
||||
android:id="@+id/lbl_login_usesocialnet"
|
||||
android:text="@string/lbl_login_usesocialnet"
|
||||
android:textColor="@color/input_register"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/textView"
|
||||
android:layout_above="@+id/fragment_btn_gp"
|
||||
android:layout_above="@+id/frag_login_btnGP"
|
||||
android:layout_centerHorizontal="true" />
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnGP"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.GooglePlusButtonFragment"
|
||||
android:id="@+id/fragment_btn_gp"
|
||||
tools:layout="@layout/fragment_googleplus_button"
|
||||
android:layout_above="@+id/fragment_btn_tw"
|
||||
android:layout_above="@+id/frag_login_btnTW"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="5dp"/>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnTW"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.TwitterButtonFragment"
|
||||
android:id="@+id/fragment_btn_tw"
|
||||
tools:layout="@layout/fragment_twitter_button"
|
||||
android:layout_above="@+id/fragment_btn_fb"
|
||||
android:layout_above="@+id/frag_login_btnFB"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="5dp"
|
||||
/>
|
||||
android:layout_marginTop="5dp"/>
|
||||
|
||||
<fragment
|
||||
android:id="@+id/frag_login_btnFB"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:name="org.deke.risk.riskahead.fragments.FacebookButtonFragment"
|
||||
android:id="@+id/fragment_btn_fb"
|
||||
tools:layout="@layout/fragment_facebook_button"
|
||||
android:layout_alignParentBottom="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
|
||||
@@ -9,12 +9,109 @@
|
||||
tools:context=".ReportActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
android:layout_height="match_parent"
|
||||
android:padding="20dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_report_short"
|
||||
android:text="@string/lbl_report_short"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignLeft="@+id/input_report_short"
|
||||
android:layout_alignStart="@+id/input_report_short"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_report_short"
|
||||
android:hint="@string/input_report_short_hint"
|
||||
android:inputType="text"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/input_login"
|
||||
android:textColorHint="@color/input_login_hint"
|
||||
android:layout_marginTop="20dp"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_report_long"
|
||||
android:text="@string/lbl_report_long"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_below="@+id/input_report_short" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/input_report_long"
|
||||
android:hint="@string/input_report_long_hint"
|
||||
android:inputType="textMultiLine"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="top|left"
|
||||
android:padding="10dp"
|
||||
android:singleLine="true"
|
||||
android:textColor="@color/input_login"
|
||||
android:textColorHint="@color/input_login_hint"
|
||||
android:layout_below="@+id/lbl_report_long"
|
||||
android:scrollbars="vertical"
|
||||
android:minLines="5"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_report_category"
|
||||
android:text="@string/lbl_report_category"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_below="@+id/input_report_long" />
|
||||
|
||||
<Spinner
|
||||
android:id="@+id/dd_report_category"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/lbl_report_category"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_report_date"
|
||||
android:text="@string/lbl_report_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_below="@+id/dd_report_category" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/lbl_report_time"
|
||||
android:text="@string/lbl_report_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="10dp"
|
||||
android:layout_above="@+id/txt_report_time"
|
||||
android:layout_alignLeft="@+id/txt_report_time"
|
||||
android:layout_alignStart="@+id/txt_report_time"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/txt_report_date"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="date"
|
||||
android:ems="10"
|
||||
android:layout_below="@+id/lbl_report_date"
|
||||
android:layout_alignLeft="@+id/lbl_report_date"
|
||||
android:layout_alignStart="@+id/lbl_report_date"
|
||||
android:focusable="false"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/txt_report_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="time"
|
||||
android:ems="10"
|
||||
android:layout_alignBottom="@+id/txt_report_date"
|
||||
android:layout_toRightOf="@+id/txt_report_date"
|
||||
android:layout_toEndOf="@+id/txt_report_date"
|
||||
android:focusable="false"/>
|
||||
|
||||
<TextView android:text="Report Activity!" android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content" />
|
||||
|
||||
</RelativeLayout>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
tools:context=".SettingsActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
|
||||
@@ -8,9 +8,9 @@
|
||||
android:background="#ffffff">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/image_start_logo"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/imageView"
|
||||
android:src="@drawable/logo_riskahead"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
@@ -18,24 +18,24 @@
|
||||
android:background="#00ffffff" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/LinearLayout02"
|
||||
android:id="@+id/ll_01"
|
||||
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="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/btn_login"
|
||||
android:id="@+id/btn_start_login"
|
||||
android:layout_weight="1"
|
||||
android:onClick="gotoLogin"/>
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_start_register"
|
||||
android:text="@string/btn_start_register"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/btn_register"
|
||||
android:id="@+id/btn_start_register"
|
||||
android:layout_weight="1"
|
||||
android:onClick="gotoRegister"/>
|
||||
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
tools:context=".SubscriptionsActivity">
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/content"
|
||||
android:id="@+id/rl_main_content"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
|
||||
@@ -1,34 +1,42 @@
|
||||
<resources>
|
||||
<string name="app_name">RiskAhead</string>
|
||||
<string name="facebook_app_id">658657714234846</string>
|
||||
<string name="txt_welcome_register">Register to RiskAhead</string>
|
||||
<string name="txt_welcome_login">Log-in to RiskAhead</string>
|
||||
<string name="txt_resend_password">Forgot your password?\nClick here</string>
|
||||
|
||||
<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_resendPW">Forgot your password?\nClick here</string>
|
||||
<string name="lbl_login_policy"><a href="test.com">Terms of Service</a> and\n<a href="test.com">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="input_register_name_hint">Full Name</string>
|
||||
<string name="input_register_email_hint">E-Mail</string>
|
||||
<string name="input_register_password_hint">Password</string>
|
||||
|
||||
<string name="action_about">About</string>
|
||||
<string name="txt_policy"><a href="test.com">Terms of Service</a> and\n<a href="test.com">Privacy Policy</a></string>
|
||||
<string name="hint_full_name">Full Name</string>
|
||||
<string name="hint_email">E-Mail</string>
|
||||
<string name="hint_password">Password</string>
|
||||
|
||||
<string name="status_signing_in">Signing in...</string>
|
||||
<string name="status_signing_out">Signing out...</string>
|
||||
|
||||
<string name="login_with_gp">Log in with Google+</string>
|
||||
<string name="logout_with_gp">Log out from Google+</string>
|
||||
<string name="login_with_fb">Log in with Facebook</string>
|
||||
<string name="logout_with_fb">Log out from Facebook</string>
|
||||
<string name="txt_welcome_signin">In order to use our service please create an account or login with your Facebook or G+ Account</string>
|
||||
<string name="txt_useFBorGP">Or use following social networks to sign in</string>
|
||||
|
||||
<string name="title_activity_start">RiskAhead</string>
|
||||
<string name="btn_login">Login</string>
|
||||
<string name="btn_register">Register</string>
|
||||
<string name="title_activity_entrance">Risk Ahead</string>
|
||||
<string name="hint_name">Full Name</string>
|
||||
<string name="btn_logout">Logout</string>
|
||||
<string name="welcome">Welcome</string>
|
||||
|
||||
<string name="btn_profile_logout">Logout</string>
|
||||
<string name="lbl_profile_title">Welcome</string>
|
||||
|
||||
<string name="drawer_open">Open navigation drawer</string>
|
||||
<string name="drawer_close">Close navigation drawer</string>
|
||||
|
||||
<string name="settings_user">Account</string>
|
||||
<string name="settings_logout">Logout</string>
|
||||
|
||||
<string name="find">Find</string>
|
||||
<string name="hint">Enter Place</string>
|
||||
|
||||
@@ -43,9 +51,29 @@
|
||||
<string name="app_label">Label</string>
|
||||
<string name="search_hint">Location</string>
|
||||
<string name="search_settings">search settings</string>
|
||||
<string name="title_activity_report">ReportActivity</string>
|
||||
|
||||
<string name="hello_world">Hello world!</string>
|
||||
<string name="title_activity_settings">SettingsActivity</string>
|
||||
<string name="title_activity_subscriptions">SubscriptionsActivity</string>
|
||||
|
||||
<string name="lbl_main_txt1">We have currently ...</string>
|
||||
<string name="lbl_main_txt2">... reported incidents</string>
|
||||
<string name="lbl_main_share">Contribute and share your information</string>
|
||||
<string name="btn_main_report">Report</string>
|
||||
<string name="btn_main_viewmap">View Map</string>
|
||||
|
||||
<string name="title_activity_report">ReportActivity</string>
|
||||
<string name="input_report_short_hint">short description</string>
|
||||
<string name="input_report_long_hint">long descpription</string>
|
||||
<string name="lbl_report_short">Title</string>
|
||||
<string name="lbl_report_long">Description</string>
|
||||
<string name="lbl_report_category">Crime Category</string>
|
||||
<string name="lbl_report_time">Time (hh:mm)</string>
|
||||
<string name="lbl_report_date">Date (dd-mm-yyyy) of incident</string>
|
||||
|
||||
<string-array name="incident_categories">
|
||||
<item>Personal</item>
|
||||
<item>Property</item>
|
||||
<item>Political</item>
|
||||
</string-array>
|
||||
|
||||
</resources>
|
||||
|
||||
Reference in New Issue
Block a user