eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-23 22:19:13 +00:00
Code Activity

Merge branch 'ubilabs--tracking_app--develop' into ubilabs--tracking_app--master

Browse Source
This commit is contained in:
Bennet Brunsen
2016-01-29 14:04:40 +01:00
parent 850b5c2aea 87919c530c
commit cf25ce90fa
9 changed files with 20 additions and 210 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.shared/res/drawable/qr_button.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- pressed -->
<item android:drawable="@drawable/qr_button_pressed" android:state_pressed="true" />
<!-- default -->
<item android:drawable="@drawable/rounded_btn_yellow" />
</selector>
mobile/com.sap.sailing.android.shared/res/drawable/qr_button_pressed.xml
+10
View File
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/yellow_button_pressed"/>
<corners
android:bottomLeftRadius="5dip"
android:bottomRightRadius="5dip"
android:topLeftRadius="5dip"
android:topRightRadius="5dip"/>
</shape>
mobile/com.sap.sailing.android.shared/res/layout/fragment_home.xml
+1 -1
View File
@@ -42,7 +42,7 @@
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="10dp"
android:background="@drawable/rounded_btn_yellow"
android:background="@drawable/qr_button"
android:text="@string/scan_qr"
android:textAllCaps="true"
android:textSize="18sp"
mobile/com.sap.sailing.android.shared/res/values/colors.xml
+1
View File
@@ -46,4 +46,5 @@
<color name="sap_blue">#008FCC</color>
<color name="gray">#333333</color>
<color name="colorPrimary">@color/gray</color>
<color name="yellow_button_pressed">#D6B363</color>
</resources>
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_container.xml
-45
View File
@@ -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.tracking.app.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.tracking.app.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>
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_home.xml
-74
View File
@@ -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.tracking.app.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.tracking.app.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.tracking.app.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>
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml
-87
View File
@@ -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.tracking.app.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.tracking.app.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>
mobile/com.sap.sailing.buoy.positioning/res/drawable/position_send_button_pressed.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/button_pressed"/>
<solid android:color="@color/yellow_button_pressed"/>
<corners
android:bottomLeftRadius="5dip"
mobile/com.sap.sailing.buoy.positioning/res/values/colors.xml
-2
View File
@@ -11,6 +11,4 @@
<color name="colorPrimaryDark">@color/colorPrimary</color>
<color name="colorAccent">@color/green</color>
<color name="button_pressed">#D6B363</color>
</resources>