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

DT @17.12.2015: Sehr viele Design-Changes.. ProfileActivityFragments ebenfalls übearbeitet

Browse Source
This commit is contained in:
Dennis Thießen
2015-12-17 13:41:34 +01:00
parent c47e302d28
commit 805d75b15b
101 changed files with 1147 additions and 851 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -88,7 +88,7 @@
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragments.GooglePlusButtonFragment"
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"
@@ -98,7 +98,7 @@
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragments.TwitterButtonFragment"
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"
@@ -108,7 +108,7 @@
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragments.FacebookButtonFragment"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"

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

@@ -1,15 +1,24 @@
<android.support.v4.widget.DrawerLayout
<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:id="@+id/drawer_layout"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
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" />
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent" >
@@ -29,7 +38,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="52dp"
android:textColor="#aa999999"/>
android:textColor="#aa4b4b4b"/>
<TextView
android:id="@+id/txt_main_incidents"
@@ -46,55 +55,46 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="34dp"
android:textColor="#aa999999"/>
android:textColor="#aa4b4b4b"/>
</LinearLayout>
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:background="#d5ddff"
android:layout_width="match_parent"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="0dp">
android:layout_alignParentStart="true">
<com.beardedhen.androidbootstrap.BootstrapButton
<Button
android:id="@+id/btn_main_report"
style="@style/wrapping_button"
android:layout_width="wrap_content"
android:layout_weight="1"
android:background="#651a1111"
android:layout_marginRight="1dp"
android:paddingLeft="10dp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="20dp"
bootstrap:bootstrapText="@string/btn_main_report"
bootstrap:bootstrapBrand="danger"
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
style="?android:attr/borderlessButtonStyle"
android:text="Report Incident" />
<com.beardedhen.androidbootstrap.BootstrapButton
<Button
android:id="@+id/btn_main_viewmap"
style="@style/wrapping_button"
android:layout_width="wrap_content"
style="?android:attr/borderlessButtonStyle"
android:layout_weight="1"
android:paddingRight="10dp"
android:background="#651a1111"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
bootstrap:bootstrapText="@string/btn_main_viewmap"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_gravity="center_vertical" />
android:text="Show Map" />
</LinearLayout>
</RelativeLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff"/>
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -1,13 +1,24 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
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">
@@ -31,11 +42,6 @@
bootstrap:roundedCorners="true" />
</RelativeLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -1,14 +1,24 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/layout_bg_gradient"
tools:context=".ProfileActivity">
<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" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:animateLayoutChanges="true"
@@ -43,11 +53,4 @@
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

109
app/src/main/res/layout/activity_profile_stats.xml
View File

@@ -1,109 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="10dp"
android:background="@drawable/layout_bg"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/lbl_profile_stats"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/lbl_profile_stats"
android:textColor="#000000"
android:textStyle="bold" />
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tableLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_stats"
android:stretchColumns="1">
<TableRow>
<TextView
android:id="@+id/lbl_profile_membersince"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:text="@string/lbl_profile_member_since"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_profile_membersince"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:text="0"
android:textColor="#007197" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/lbl_profile_points"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="@string/lbl_profile_points"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_profile_points"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="0"
android:textColor="#007197" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/lbl_profile_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="@string/lbl_profile_ranking"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_profile_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="0"
android:textColor="#007197" />
</TableRow>
<TableRow>
<TextView
android:id="@+id/lbl_profile_numberposts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="@string/lbl_profile_numberposts"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_profile_numberposts"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="3dip"
android:text="0"
android:textColor="#007197" />
</TableRow>
</TableLayout>
</RelativeLayout>

62
app/src/main/res/layout/activity_profile_top10.xml
View File

@@ -1,62 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rl_main_content_2"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:layout_weight="1"
android:background="@drawable/layout_bg"
android:orientation="vertical"
android:padding="8dp">
<TextView
android:id="@+id/lbl_profile_top10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="@string/lbl_profile_top10"
android:textColor="#000000"
android:textStyle="bold" />
<TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/tableTop10"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_profile_top10"
android:stretchColumns="1">
<TableRow>
<TextView
android:id="@+id/lbl_ranking"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:text="Ranking"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:text="Name"
android:textColor="#007197" />
<TextView
android:id="@+id/txt_points"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="3dip"
android:text="Points"
android:textColor="#007197" />
</TableRow>
</TableLayout>
</RelativeLayout>

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

@@ -100,7 +100,7 @@
<fragment
android:id="@+id/frag_login_btnGP"
android:name="org.deke.risk.riskahead.fragments.GooglePlusButtonFragment"
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"
@@ -110,7 +110,7 @@
<fragment
android:id="@+id/frag_login_btnTW"
android:name="org.deke.risk.riskahead.fragments.TwitterButtonFragment"
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"
@@ -120,7 +120,7 @@
<fragment
android:id="@+id/frag_login_btnFB"
android:name="org.deke.risk.riskahead.fragments.FacebookButtonFragment"
android:name="org.deke.risk.riskahead.fragment.FacebookButtonFragment"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"

16
app/src/main/res/layout/activity_report.xml
View File

@@ -1,7 +1,8 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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:id="@+id/drawer_layout"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -188,14 +189,7 @@
bootstrap:roundedCorners="true" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -1,90 +1,95 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/drawer_layout"
android:background="@drawable/layout_bg_gradient"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:background="@drawable/layout_bg_gradient"
tools:context=".ReportWFActivity">
<include
android:id="@+id/toolbar"
layout="@layout/layout_toolbar"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true" />
<LinearLayout
android:id="@+id/layoutMain"
android:animateLayoutChanges="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/toolbar"
android:animateLayoutChanges="true"
android:orientation="vertical">
<LinearLayout
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="vertical">
android:layout_weight="1">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/fragment_reportwf"
android:layout_gravity="center_horizontal"
android:layout_weight="1" />
</LinearLayout>
<LinearLayout
android:id="@+id/layoutStatus"
android:background="#0f4845ff"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:gravity="center_horizontal"
android:animateLayoutChanges="true"
android:layout_weight="0">
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center_horizontal" />
<com.beardedhen.androidbootstrap.AwesomeTextView
android:id="@+id/atvStatus"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:padding="5dp"
android:textSize="50dp"
android:visibility="invisible"
bootstrap:bootstrapBrand="success"
bootstrap:fontAwesomeIcon="fa_check_circle_o" />
</RelativeLayout>
<LinearLayout
android:id="@+id/layoutStatus"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="0"
android:animateLayoutChanges="true"
android:gravity="center_horizontal"
android:orientation="horizontal">
</LinearLayout>
<LinearLayout
android:id="@+id/layoutFooter"
android:gravity="center"
android:background="@color/bg_common"
android:layout_height="50dp"
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:gravity="center">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_reportnow"
bootstrap:bootstrapText="Report NOW!"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="40dp"
android:layout_weight="1"
android:paddingRight="1dp"
bootstrap:bootstrapBrand="danger"
android:layout_weight="1" />
bootstrap:bootstrapText="Report NOW!" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_reportwf_next"
bootstrap:bootstrapText="Continue"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_height="40dp"
android:layout_weight="1"
bootstrap:bootstrapBrand="success"
android:layout_weight="1" />
bootstrap:bootstrapText="Continue" />
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

29
app/src/main/res/layout/activity_reportlist.xml
View File

@@ -1,29 +0,0 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:background="#8ae6e6e6"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:orientation="vertical">
<ListView
android:id="@+id/lv_reportlist_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>

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

@@ -1,14 +1,24 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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:id="@+id/drawer_layout"
android:background="@color/bg_common_2"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
<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" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -22,7 +32,6 @@
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:padding="8dp"
android:background="@drawable/layout_bg"
android:orientation="vertical">
<TextView
@@ -34,6 +43,7 @@
<EditText
android:id="@+id/txt_settings_username"
android:text="test"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_username"
@@ -96,42 +106,25 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_main_content_2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="10dp"
android:layout_marginBottom="20dp"
android:padding="4dp"
android:background="@drawable/layout_bg"
android:orientation="vertical">
<TextView
android:id="@+id/lbl_settings_password"
android:text="@string/lbl_settings_password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp" />
android:layout_marginTop="10dp"
android:layout_below="@+id/txt_settings_email"
android:layout_alignLeft="@+id/txt_settings_email"
android:layout_alignStart="@+id/txt_settings_email" />
<EditText
android:id="@+id/txt_settings_password"
android:inputType="textPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/lbl_settings_password" />
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:layout_centerInParent="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"
android:layout_below="@+id/txt_settings_password" />
android:ems="8"
android:layout_below="@+id/lbl_settings_password"
android:layout_alignLeft="@+id/lbl_settings_password"
android:layout_alignStart="@+id/lbl_settings_password" />
</RelativeLayout>
<LinearLayout
@@ -142,23 +135,26 @@
android:layout_width="match_parent"
android:layout_marginBottom="0dp">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_req_password"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
bootstrap:bootstrapText="@string/btn_settings_req_password"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true"/>
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_settings_change"
bootstrap:bootstrapText="@string/btn_settings_change"
android:minWidth="180dp"
android:layout_width="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content"
bootstrap:bootstrapBrand="primary"
bootstrap:roundedCorners="true" />
bootstrap:roundedCorners="true"/>
</LinearLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -1,13 +1,24 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
android:background="#8ae6e6e6"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SubscriptionsActivity">
<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" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -106,17 +117,8 @@
</TableLayout>
</RelativeLayout>
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -1,14 +1,24 @@
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
<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:id="@+id/drawer_layout"
android:background="#8ae6e6e6"
android:id="@+id/main_layout"
android:background="@drawable/layout_bg_gradient"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ViewReportActivity">
<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" />
<LinearLayout
android:id="@+id/layoutMain"
android:layout_below="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
@@ -234,11 +244,4 @@
</LinearLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffffff" />
</android.support.v4.widget.DrawerLayout>
</RelativeLayout>

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

@@ -4,7 +4,7 @@
xmlns:fb="http://schemas.android.com/apk/res-auto"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.fragments.FacebookButtonFragment">
tools:context="org.deke.risk.riskahead.fragment.FacebookButtonFragment">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_fb"

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

@@ -5,7 +5,7 @@
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.fragments.GooglePlusButtonFragment">
tools:context="org.deke.risk.riskahead.fragment.GooglePlusButtonFragment">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_gp"

143
app/src/main/res/layout/fragment_profile_stats.xml Normal file
View File

@@ -0,0 +1,143 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:padding="10dp"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:gravity="center"
android:layout_centerInParent="true">
<TextView
android:id="@+id/lbl_main_txt1"
android:text="You have currently..."
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#aa999999"/>
<TextView
android:id="@+id/txt_profile_points"
android:text="0"
android:layout_centerHorizontal="true"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/lbl_main_txt1"
android:textSize="30sp" />
<TextView
android:id="@+id/llb_fff"
android:text="points"
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:paddingLeft="5dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#aa999999"
android:textSize="15sp"
android:layout_alignBottom="@+id/txt_profile_points"
android:layout_toRightOf="@+id/txt_profile_points"
android:layout_toEndOf="@+id/txt_profile_points" />
<TextView
android:id="@+id/lbl_main_txt2"
android:text="from a total of..."
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="10dp"
android:layout_below="@id/txt_profile_points"
android:textColor="#aa999999"/>
<TextView
android:id="@+id/txt_profile_numberposts"
android:text="0"
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
android:layout_below="@id/lbl_main_txt2"
android:textSize="30sp"
android:layout_marginTop="10dp"
/>
<TextView
android:id="@+id/llb_ffff"
android:text="reported incidents"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#aa999999"
android:textSize="15sp"
android:paddingLeft="5dp"
android:layout_alignBottom="@+id/txt_profile_numberposts"
android:layout_toRightOf="@+id/txt_profile_numberposts"
android:layout_toEndOf="@+id/txt_profile_numberposts" />
<TextView
android:id="@+id/lbl_main_txt3"
android:text="and your rank is..."
android:layout_width="wrap_content"
android:layout_centerHorizontal="true"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:layout_marginTop="10dp"
android:layout_below="@id/txt_profile_numberposts"
android:textColor="#aa999999"/>
<TextView
android:id="@+id/txt_profile_ranking"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="30sp"
android:layout_centerHorizontal="true"
android:layout_below="@+id/lbl_main_txt3"
android:layout_marginTop="10dp"
/>
<TextView
android:id="@+id/lbl_main_txt4"
android:text="You are supporting RiskAhead since"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="50dp"
android:layout_above="@+id/txt_profile_membersince"
android:layout_centerHorizontal="true"
android:textColor="#aa999999"/>
<TextView
android:id="@+id/txt_profile_membersince"
android:text="0"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="20sp"
android:layout_marginTop="10dp"
android:layout_centerHorizontal="true"
android:layout_above="@+id/lbl_main_txt5"
/>
<TextView
android:id="@+id/lbl_main_txt5"
android:text="Thank you!"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="10dp"
android:textColor="#aa999999"/>
</RelativeLayout>
</RelativeLayout>

18
app/src/main/res/layout/fragment_reportlist.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<ListView
android:id="@+id/lv_reportlist_list"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</RelativeLayout>

6
app/src/main/res/layout/activity_reportlist_lvrow.xml → app/src/main/res/layout/fragment_reportlist_row.xml
View File

@@ -6,6 +6,12 @@
android:padding="5dp"
android:weightSum="1">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:id="@+id/ic_reportlist_row"/>
<LinearLayout
android:orientation="horizontal"

17
app/src/main/res/layout/fragment_top10list.xml Normal file
View File

@@ -0,0 +1,17 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/layoutContent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
android:background="@drawable/layout_bg_gradient"
android:orientation="vertical">
<ListView
android:id="@+id/lv_top10list"
android:layout_below="@id/txt_profile_ranking"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>

79
app/src/main/res/layout/fragment_top10list_row.xml Normal file
View File

@@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="#00000000"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:weightSum="3">
<TextView
android:id="@+id/txt_top10_rank"
android:text="#0"
android:textColor="@color/md_black_1000"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="30sp"
android:layout_marginTop="10dp"
android:paddingRight="20dp"
android:layout_weight="0"
/>
<LinearLayout
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="3">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#a6000000"
android:id="@+id/txt_top10_name"
android:text="Member name"
android:textSize="16dp"
android:typeface="serif" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Reported Incidents"
android:id="@+id/txt_top10_numberOfIncidents"
android:typeface="serif" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#b9000000"
android:text="Member since"
android:id="@+id/txt_top10_membersince"
android:typeface="serif" />
</LinearLayout>
<TextView
android:id="@+id/txt_top10_points"
android:text="0"
android:textColor="@color/md_black_1000"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="30sp"
android:layout_marginTop="10dp"
android:layout_weight="0"
/>
<TextView
android:id="@+id/llb_fff"
android:text="pts"
android:layout_width="wrap_content"
android:paddingLeft="5dp"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="#aa999999"
android:textSize="15sp"
android:layout_gravity="center" />
</LinearLayout>

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

@@ -3,7 +3,7 @@
android:layout_width="match_parent"
xmlns:bootstrap="http://schemas.android.com/apk/res-auto"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.fragments.TwitterButtonFragment">
tools:context="org.deke.risk.riskahead.fragment.TwitterButtonFragment">
<com.beardedhen.androidbootstrap.BootstrapButton
android:id="@+id/btn_login_twitter"

11
app/src/main/res/layout/layout_toolbar.xml Normal file
View File

@@ -0,0 +1,11 @@
<?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" />

28
app/src/main/res/layout/listview_item_row.xml
View File

@@ -1,28 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/activatedBackgroundIndicator"
android:minHeight="?android:attr/listPreferredItemHeightSmall"
android:padding="10dp">
<ImageView
android:id="@+id/imageViewIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:paddingRight="10dp" />
<TextView
android:id="@+id/textViewName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/imageViewIcon"
android:paddingRight="10dp"
android:text="Folder name here."
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:textColor="#000000" />
</RelativeLayout>