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

DT @22.08.2015: Refactoring, implementing search.. but still buggy

Browse Source
This commit is contained in:
Dennis Thießen
2015-08-22 14:33:53 +02:00
parent 5fb9f53be3
commit 00cc821499
20 changed files with 1002 additions and 649 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6,12 +6,21 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
<RelativeLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Welcome!"
android:id="@+id/textView2"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:layout_marginTop="52dp" />
</RelativeLayout>
<ListView
android:id="@+id/navList"

30
app/src/main/res/layout/activity_maps.xml Normal file
View File

@@ -0,0 +1,30 @@
<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.MapsActivity">
<RelativeLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<fragment 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:id="@+id/map"
tools:context=".MapsActivity"
android:name="com.google.android.gms.maps.SupportMapFragment" />
</RelativeLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffeeee"/>
</android.support.v4.widget.DrawerLayout>

21
app/src/main/res/layout/fragment_user_info.xml → app/src/main/res/layout/activity_user_config.xml
View File

@@ -1,8 +1,13 @@
<FrameLayout 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" tools:context="org.deke.risk.riskahead.fragments.UserInfo">
<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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="org.deke.risk.riskahead.UserConfigActivity">
<LinearLayout
android:id="@+id/content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_centerInParent="true"
@@ -52,4 +57,12 @@
</LinearLayout>
</FrameLayout>
<ListView
android:id="@+id/navList"
android:layout_width="200dp"
android:layout_height="match_parent"
android:layout_gravity="start"
android:background="#ffeeee"/>
</android.support.v4.widget.DrawerLayout>

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

@@ -1,29 +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"
tools:context="org.deke.risk.riskahead.fragments.MapFragment">
<Button
android:id="@+id/btn_show"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/find"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true" />
<EditText
android:id="@+id/et_place"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:hint="@string/hint"
android:inputType="text"
android:layout_toLeftOf="@id/btn_show" />
<fragment
android:id="@+id/location_map"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@+id/et_place"
class="com.google.android.gms.maps.SupportMapFragment" />
</RelativeLayout>