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>