eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-25 06:58:39 +00:00
Code Activity

Keep stop tracking button visible

Browse Source
This commit is contained in:
Bennet Brunsen
2016-03-11 10:17:21 +01:00
parent 769efde846
commit 76d8eba9a7
5 changed files with 48 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_stop_button.xml → mobile/com.sap.sailing.android.tracking.app/res/layout-land/fragment_time.xml
View File
mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_hud_container.xml → mobile/com.sap.sailing.android.tracking.app/res/layout/activity_tracking.xml
+22 -17
View File
@@ -38,7 +38,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/title_page_indicator"
android:layout_above="@+id/stop_tracking_box"
android:layout_below="@id/toolbar"
android:orientation="vertical">
@@ -58,6 +58,27 @@
android:layout_weight="1"/>
</LinearLayout>
<RelativeLayout
android:id="@+id/stop_tracking_box"
android:layout_width="match_parent"
android:layout_height="100dp"
android:layout_above="@+id/title_page_indicator">
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/stop_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="10dp"
android:layout_marginTop="0dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/rounded_btn_red"
android:padding="0dp"
android:text="@string/stop_tracking"
android:textAllCaps="true"
android:textStyle="bold"/>
</RelativeLayout>
<com.viewpagerindicator.CirclePageIndicator
android:id="@+id/title_page_indicator"
android:layout_width="fill_parent"
@@ -68,20 +89,4 @@
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.android.tracking.app/res/layout/fragment_stop_button.xml → mobile/com.sap.sailing.android.tracking.app/res/layout/fragment_time.xml
+2 -25
View File
@@ -7,10 +7,8 @@
android:layout_height="wrap_content">
<RelativeLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_gravity="center"
android:layout_above="@+id/stop_tracking_box"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:paddingTop="15dp">
@@ -48,25 +46,4 @@
android:textSize="100sp"/>
</RelativeLayout>
<RelativeLayout
android:id="@+id/stop_tracking_box"
android:layout_width="fill_parent"
android:layout_height="100dp"
android:layout_alignParentBottom="true">
<com.sap.sailing.android.shared.ui.customviews.OpenSansButton
android:id="@+id/stop_tracking"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_marginBottom="10dp"
android:layout_marginTop="0dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/rounded_btn_red"
android:padding="0dp"
android:text="@string/stop_tracking"
android:textAllCaps="true"
android:textStyle="bold"/>
</RelativeLayout>
</RelativeLayout>
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/activities/TrackingActivity.java
+21 -14
View File
@@ -16,6 +16,7 @@ import android.support.v4.view.ViewPager;
import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import com.sap.sailing.android.shared.logging.ExLog;
@@ -31,8 +32,8 @@ import com.sap.sailing.android.tracking.app.services.TrackingService.GPSQualityL
import com.sap.sailing.android.tracking.app.services.TrackingService.TrackingBinder;
import com.sap.sailing.android.tracking.app.ui.fragments.CompassFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.SpeedFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.StopTrackingButtonFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.TrackingFragment;
import com.sap.sailing.android.tracking.app.ui.fragments.TrackingTimeFragment;
import com.sap.sailing.android.tracking.app.utils.AppPreferences;
import com.sap.sailing.android.tracking.app.utils.DatabaseHelper;
import com.sap.sailing.android.tracking.app.utils.ServiceHelper;
@@ -85,7 +86,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
lastSpeedIndicatorText = getString(R.string.initial_hyphen);
setContentView(R.layout.fragment_hud_container);
setContentView(R.layout.activity_tracking);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
if (toolbar != null) {
@@ -96,8 +97,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
if (getSupportActionBar() != null) {
EventInfo eventInfo = DatabaseHelper.getInstance().getEventInfoWithLeaderboardAndCompetitor(this,
checkinDigest);
EventInfo eventInfo = DatabaseHelper.getInstance().getEventInfoWithLeaderboardAndCompetitor(this, checkinDigest);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
getSupportActionBar().setHomeButtonEnabled(true);
toolbar.setNavigationIcon(R.drawable.sap_logo_64dp);
@@ -148,6 +148,14 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
});
Button stopTracking = (Button) findViewById(R.id.stop_tracking);
stopTracking.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
showStopTrackingConfirmationDialog();
}
});
replaceFragment(R.id.tracking_linear_layout, trackingFragment);
ServiceHelper.getInstance().startTrackingService(this, checkinDigest);
}
@@ -332,7 +340,7 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
public final static int VIEW_PAGER_FRAGMENT_COMPASS = 1;
public final static int VIEW_PAGER_FRAGMENT_SPEED = 2;
private StopTrackingButtonFragment stbFragment;
private TrackingTimeFragment trackingTimeFragment;
private CompassFragment cFragment;
private SpeedFragment sFragment;
@@ -343,8 +351,8 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
@Override
public Fragment getItem(int position) {
if (position == VIEW_PAGER_FRAGMENT_STOP_BUTTON) {
stbFragment = new StopTrackingButtonFragment();
return stbFragment;
trackingTimeFragment = new TrackingTimeFragment();
return trackingTimeFragment;
} else if (position == VIEW_PAGER_FRAGMENT_COMPASS) {
cFragment = new CompassFragment();
return cFragment;
@@ -377,14 +385,13 @@ public class TrackingActivity extends BaseActivity implements GPSQualityListener
}
public void showStopTrackingConfirmationDialog() {
AlertDialog dialog = new AlertDialog.Builder(this).setTitle(R.string.please_confirm)
.setMessage(R.string.do_you_really_want_to_stop_tracking).setIcon(android.R.drawable.ic_dialog_alert)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
AlertDialog dialog = new AlertDialog.Builder(this).setTitle(R.string.please_confirm).setMessage(R.string.do_you_really_want_to_stop_tracking)
.setIcon(android.R.drawable.ic_dialog_alert).setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
stopTracking();
}
}).setNegativeButton(android.R.string.no, null).create();
public void onClick(DialogInterface dialog, int whichButton) {
stopTracking();
}
}).setNegativeButton(android.R.string.no, null).create();
dialog.show();
}
mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/StopTrackingButtonFragment.java → mobile/com.sap.sailing.android.tracking.app/src/com/sap/sailing/android/tracking/app/ui/fragments/TrackingTimeFragment.java
+3 -16
View File
@@ -3,15 +3,12 @@ package com.sap.sailing.android.tracking.app.ui.fragments;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.TextView;
import com.sap.sailing.android.tracking.app.R;
import com.sap.sailing.android.tracking.app.ui.activities.TrackingActivity;
public class StopTrackingButtonFragment extends BaseFragment {
public class TrackingTimeFragment extends BaseFragment {
private final static String SIS_TRACKING_TIMER = "savedInstanceTrackingTimer";
private TextView timerView;
@@ -19,18 +16,8 @@ public class StopTrackingButtonFragment extends BaseFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
super.onCreateView(inflater, container, savedInstanceState);
ViewGroup view = (ViewGroup) inflater.inflate(R.layout.fragment_stop_button, container, false);
ViewGroup view = (ViewGroup) inflater.inflate(R.layout.fragment_time, container, false);
timerView = (TextView) view.findViewById(R.id.tracking_time_label);
Button stopTracking = (Button) view.findViewById(R.id.stop_tracking);
stopTracking.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
TrackingActivity activity = (TrackingActivity) getActivity();
activity.showStopTrackingConfirmationDialog();
}
});
return view;
}
@@ -46,7 +33,7 @@ public class StopTrackingButtonFragment extends BaseFragment {
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
if (savedInstanceState != null && timerView!= null) {
if (savedInstanceState != null && timerView != null) {
timerView.setText(savedInstanceState.getString(SIS_TRACKING_TIMER));
}
}