Implemented StartActivity and partially HomeFragment

Implemented StartActivity and partially HomeFragment. Additional
extractions.
This commit is contained in:
Bennet Brunsen committed 2015-03-19 15:56:31 +01:00
1 parent a0c366c429
commit dee326c71c
40 files changed
+910 -286

No files matched your search

@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="#00FFFFFF" />
<stroke
android:width="0.5dip"
android:color="#ffffff" />
<corners
android:bottomLeftRadius="5dip"
android:bottomRightRadius="5dip"
android:topLeftRadius="5dip"
android:topRightRadius="5dip" />
</shape>
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/white_less_transparent" />
<stroke
android:width="1dp"
android:color="@color/white" />
<corners
android:bottomLeftRadius="5dip"
android:bottomRightRadius="5dip"
android:topLeftRadius="5dip"
android:topRightRadius="5dip" />
</shape>
@@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<solid android:color="@color/sap_yellow" />
<corners
android:bottomLeftRadius="5dip"
android:bottomRightRadius="5dip"
android:topLeftRadius="5dip"
android:topRightRadius="5dip" />
</shape>
Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

@@ -1,158 +0,0 @@
<?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="match_parent"
android:background="@color/black"
android:orientation="vertical"
android:paddingLeft="0dp"
android:paddingRight="0dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/mark_header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="left"
android:background="@color/black_transparent"
android:gravity="center"
android:paddingBottom="7dp"
android:paddingLeft="10dp"
android:paddingTop="7dp"
android:textColor="@color/white"
android:textSize="10sp" />
<fragment xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/map"
android:name="com.google.android.gms.maps.MapFragment"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
<!-- Begin of detailed mark information -->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="15dp"
android:paddingLeft="10dp"
android:paddingRight="7dp"
android:paddingTop="15dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/signal_accuracy_indicator_view_description"
android:textColor="@color/white"
android:textSize="16sp" />
<!-- Empty view to right align the following element -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/marker_gps_accuracy"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/white"
android:textSize="16sp"
android:textStyle="bold" />
</LinearLayout>
<View style="@style/Divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="15dp"
android:paddingLeft="10dp"
android:paddingRight="7dp"
android:paddingTop="15dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/longitude"
android:textColor="@color/white"
android:textSize="16sp" />
<!-- Empty view to right align the following element -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/marker_gps_longitude"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<View style="@style/Divider" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingBottom="15dp"
android:paddingLeft="10dp"
android:paddingRight="7dp"
android:paddingTop="15dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/latitude"
android:textColor="@color/white"
android:textSize="16sp" />
<!-- Empty view to right align the following element -->
<View
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_weight="1" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/marker_gps_latitude"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/white"
android:textSize="16sp" />
</LinearLayout>
<View style="@style/Divider" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
android:id="@+id/marker_set_position_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:background="@drawable/rounded_btn_yellow"
android:text="@string/set_position"
android:textSize="14sp"
android:textStyle="bold" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansButton
android:id="@+id/marker_reset_position_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="15dp"
android:background="@drawable/rounded_btn_transparent"
android:text="@string/reset_position"
android:textSize="14sp"
android:textStyle="bold" />
</LinearLayout>
@@ -1,32 +0,0 @@
<?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="match_parent"
android:background="@color/black_transparent"
android:orientation="vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp">
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="18dp"
android:text="@string/course_type"
android:textSize="18sp" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:text="@string/marks"
android:textSize="18sp" />
<View
style="@style/Divider"
/>
<ListView
android:id="@+id/listMarks"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</LinearLayout>
@@ -1,45 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" >
<LinearLayout android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="10dp">
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:singleLine="true"
android:textSize="16sp"/>
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
</com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar" />
</RelativeLayout>
@@ -1,74 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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" >
<ImageView
android:id="@+id/homeBackground"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentBottom="true"
android:contentDescription="@string/empty"
android:scaleType="centerCrop"
android:src="@drawable/working_title" />
<RelativeLayout
android:id="@+id/bottomLayout"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:background="@+color/black_transparent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true">
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:gravity="center"
android:text="@string/scan_hint"
android:textColor="@color/white" />
</RelativeLayout>
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/scanQr"
android:layout_width="fill_parent"
android:layout_height="80dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:layout_above="@+id/noQrCode"
android:background="@drawable/rounded_btn_yellow"
android:textAllCaps="true"
android:textStyle="bold"
android:text="@string/scan_qr" />
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/noQrCode"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/bottomLayout"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:background="@drawable/rounded_btn_white"
android:textColor="@color/black"
android:text="@string/no_qr_code" />
<ListView
android:id="@+id/listRegatta"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/scanQr"
android:layout_alignParentTop="true"
android:divider="@android:color/white"
android:dividerHeight="1dp" >
</ListView>
</RelativeLayout>
@@ -1,87 +0,0 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
<com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/ThemeOverlay.AppCompat.ActionBar" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="0dp" >
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:singleLine="true"
android:textSize="16sp" />
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/toolbar_subtitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:lines="1"
android:singleLine="true"
android:textSize="12sp" />
</LinearLayout>
</com.sap.sailing.android.shared.ui.customviews.OpenSansToolbar>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/title_page_indicator"
android:layout_below="@id/toolbar"
android:orientation="vertical" >
<RelativeLayout
android:id="@+id/tracking_linear_layout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:padding="0dp" >
</RelativeLayout>
<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1" />
</LinearLayout>
<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/title_page_indicator"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:paddingBottom="10dp"
android:background="@color/black"
android:paddingTop="10dp" />
<!-- <FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/toolbar" >
<FrameLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent" />
<FrameLayout
android:id="@+id/hud_content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout> -->
</RelativeLayout>
@@ -1,45 +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">
<ImageView
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="10dp"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:layout_centerVertical="true"
android:contentDescription="@string/empty"
android:src="@drawable/yellow_arrow_right"
android:textColor="@color/white" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/mark_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginTop="15dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white" />
<com.sap.sailing.android.tracking.app.customviews.OpenSansTextView
android:id="@+id/mark_set"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_below="@+id/mark_name"
android:layout_marginTop="10dp"
android:layout_marginBottom="15dp"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white" />
</RelativeLayout>
@@ -1,39 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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="50dp"
android:background="@color/colorPrimary"
tools:ignore="Overdraw" >
<ImageView
android:id="@+id/nextPage"
android:layout_width="22dp"
android:layout_height="22dp"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignParentTop="true"
android:contentDescription="@string/empty"
android:src="@drawable/yellow_arrow_right"
android:layout_marginTop="13dp"
android:layout_marginBottom="10dp"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:textColor="@color/white" />
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:id="@+id/regattaName"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/nextPage"
android:layout_toStartOf="@+id/nextPage"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:singleLine="true"
android:textColor="@color/white" />
</RelativeLayout>
@@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<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"
android:background="@color/colorPrimary"
tools:ignore="Overdraw">
<View
android:id="@+id/top_bar"
android:layout_width="fill_parent"
android:layout_height="4dp"
android:layout_alignParentTop="true"
android:background="@color/sap_yellow" />
<com.sap.sailing.android.shared.ui.customviews.OpenSansTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/top_bar"
android:padding="14dp"
android:textSize="18sp"
android:background="@color/colorPrimary"
android:textColor="@color/white"
android:text="@string/your_regattas" />
</RelativeLayout>
@@ -37,7 +37,6 @@
<string name="existing_image">Auswählen</string>
<string name="take_photo">Foto aufnehmen</string>
<string name="add_photo_select">Foto</string>
<string name="please_wait">Bitte warten</string>
<string name="checking_in">Checke ein..</string>
<string name="checking_out">Checke aus..</string>
<string name="getting_event">Hole Event-Daten..</string>
@@ -53,12 +52,9 @@
<string name="days">Tage</string>
<string name="hour">Stunde</string>
<string name="day">Tag</string>
<string name="longitude">Breitengrad</string>
<string name="latitude">Längengrad</string>
<string name="please_listen_to_announcements">Bitte achten Sie auf die Durchsagen</string>
<string name="no_qr_code">Sie haben keinen QR-Code?</string>
<string name="scan_qr">QR-Code scannen</string>
<string name="your_regattas">Ihre Regattas:</string>
<string name="close">Schließen</string>
<string name="thank_you_you_successfully_participated">Vielen Dank, Sie haben erfolgreich an der Regatta teilgenommen.\n\nIhr SAP Sailing Team</string>
<string name="tracking_colon">Tracke:</string>
@@ -71,15 +67,10 @@
<string name="show_leaderboard">Leaderboard</string>
<string name="desc_regatta_user_image">Benutzerdefiniertes Bild für Regatta</string>
<string name="desc_add_photo_button">Foto hinzufügen Button</string>
<string name="error_invalid_qr_code">Ungültiger QR-Code</string>
<string name="error_while_receiving_server_data">Fehler beim Empfang vom Server</string>
<string name="info_already_checked_in_this_qr_code">Bereits für diese Regatta eingecheckt</string>
<string name="warning">Warnung</string>
<string name="gps_turned_off">GPS ist nicht aktiviert. Bitte aktivieren Sie den Standortzugriff (GPS) in Ihren Android-Einstellungen!</string>
<string name="set_position">Position setzen</string>
<string name="reset_position">Position zurücksetzen</string>
<string name="knots">Knoten</string>
<string name="preferences">Einstellungen</string>
<string name="course_type">Kurstyp</string>
<string name="marks">Kursmarkierungen</string>
</resources>
@@ -3,7 +3,6 @@
<color name="white">#FFFFFF</color>
<color name="white_transparent">#55FFFFFF</color>
<color name="white_less_transparent">#CCFFFFFF</color>
<color name="black_transparent">#55000000</color>
<color name="green">#00FF00</color>
<color name="gray">#333333</color>
<color name="darker_gray">#242424</color>
@@ -18,13 +18,11 @@
<string name="title_activity_tracking">Tracking</string>
<string name="please_confirm">Please confirm</string>
<string name="do_you_really_want_to_stop_tracking">Do you really want to stop tracking?</string>
<string name="checkin_digest" translatable="false">CheckinDigest</string>
<string name="add_team_photo">Add Team Photo</string>
<string name="do_you_want_to_choose_existing_img_or_take_a_new_one">Do you want to use an existing image or take a new one?</string>
<string name="existing_image">Existing</string>
<string name="take_photo">Take Photo</string>
<string name="add_photo_select">Photo</string>
<string name="please_wait">Please wait</string>
<string name="checking_in">Checking in..</string>
<string name="checking_out">Checking out..</string>
<string name="getting_event">Getting event informatiopn..</string>
@@ -40,10 +38,7 @@
<string name="hour">Hour</string>
<string name="minute">Minute</string>
<string name="day">Day</string>
<string name="longitude">Longitude</string>
<string name="latitude">Latitude</string>
<string name="please_listen_to_announcements">Please listen to the announcements</string>
<string name="your_regattas">Your Regattas:</string>
<string name="close">Close</string>
<string name="thank_you_you_successfully_participated">Thank you, you have successfully taken part in the regatta.\n\nYour SAP Sailing Team</string>
<string name="tracking_colon">Tracking:</string>
@@ -53,17 +48,12 @@
<string name="speed_over_ground">Speed over Ground</string>
<string name="none">None</string>
<string name="show_leaderboard">Leader board</string>
<string name="error_invalid_qr_code">Invalid QR-Code</string>
<string name="error_while_receiving_server_data">Error while receiving server data</string>
<string name="info_already_checked_in_this_qr_code">Already checked in to this regatta</string>
<string name="warning">Warning</string>
<string name="gps_turned_off">GPS is turned off. Please turn on location access (GPS) in your Android Settings!</string>
<string name="set_position">Set Position</string>
<string name="reset_position">Reset Position</string>
<string name="knots">knots</string>
<string name="preferences">Preferences</string>
<string name="course_type">Course Type</string>
<string name="marks">Marks</string>
<string name="initial_timer_text_zerozero" translatable="false">00:00:00</string>
<string name="initial_hyphen" translatable="false">-</string>
@@ -45,10 +45,4 @@
<item name="android:layout_marginRight">6dp</item>
</style>
<style name="Divider">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item>
<item name="android:background">?android:attr/listDivider</item>
</style>
</resources>