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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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