eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-30 15:57:11 +00:00
Code Activity

introduced aborting flag input possibility to running and finishing

Browse Source 
fragment
This commit is contained in:
Armin Zamani committed 2013-04-08 14:38:09 +02:00
1 parent 4541f3067b
commit d6c6bfa551
5 files changed
+112 -19
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

mobile/com.sap.sailing.racecommittee.app/res/layout/race_finishing_view.xml
+2 -2
View File
@@ -146,7 +146,7 @@
android:textAppearance="@style/TextAppearance.Welter.TitleLabel" />
<ImageButton
android:id="@+id/novemberButton"
android:id="@+id/abortingFlagButton"
android:layout_width="140dp"
android:layout_height="80dp"
android:contentDescription="@string/abort_running_race"
@@ -154,7 +154,7 @@
android:src="@drawable/ap_november_flag" />
<TextView
android:id="@+id/novemberButtonLabel"
android:id="@+id/abortingFlagButtonLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
mobile/com.sap.sailing.racecommittee.app/res/layout/race_running_view.xml
+4 -4
View File
@@ -192,8 +192,8 @@
android:text="@string/choose_blue_flag"
android:textAppearance="@style/TextAppearance.Welter.TitleLabel" />
<!-- <ImageButton
android:id="@+id/novemberButton"
<ImageButton
android:id="@+id/abortingFlagButton"
android:layout_width="140dp"
android:layout_height="80dp"
android:contentDescription="@string/abort_running_race"
@@ -201,13 +201,13 @@
android:src="@drawable/ap_november_flag" />
<TextView
android:id="@+id/novemberButtonLabel"
android:id="@+id/abortingFlagButtonLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:layout_marginTop="2dp"
android:text="@string/abort_running_race"
android:textAppearance="@style/TextAppearance.Welter.TitleLabel" /> -->
android:textAppearance="@style/TextAppearance.Welter.TitleLabel" />
</LinearLayout>
<!-- END SELECTION SECTION -->
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/AbortTypeSelectionDialog.java
+66
View File
@@ -0,0 +1,66 @@
package com.sap.sailing.racecommittee.app.ui.fragments.dialogs;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.logging.ExLog;
import android.app.FragmentManager;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.widget.ImageButton;
public class AbortTypeSelectionDialog extends RaceDialogFragment {
private ImageButton apFlag;
private ImageButton novemberFlag;
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.race_choose_ap_november_view, container);
return view;
}
@Override
public void onActivityCreated(Bundle savedInstanceState) {
super.onActivityCreated(savedInstanceState);
getDialog().setTitle(getText(R.string.ap_or_november));
apFlag = (ImageButton) getView().findViewById(R.id.choose_ap_flag_button);
novemberFlag = (ImageButton) getView().findViewById(R.id.choose_november_flag_button);
apFlag.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
ExLog.i(ExLog.RACE_CHOOSE_ABORT_AP, getRace().getId().toString(), getActivity());
showAbortModeDialog(Flags.AP, "dialogAPFlag");
}
});
novemberFlag.setOnClickListener(new OnClickListener() {
public void onClick(View arg0) {
ExLog.i(ExLog.RACE_CHOOSE_ABORT_NOVEMBER, getRace().getId().toString(), getActivity());
showAbortModeDialog(Flags.NOVEMBER, "dialogNovemberFlag");
}
});
}
private void showAbortModeDialog(Flags abortingFlag, String dialogName) {
FragmentManager fragmentManager = getFragmentManager();
RaceDialogFragment fragment = new AbortModeSelectionDialog();
Bundle args = getParameterBundle();
args.putString(AppConstants.FLAG_KEY, abortingFlag.name());
fragment.setArguments(args);
fragment.show(fragmentManager, dialogName);
this.dismiss();
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/FinishingRaceFragment.java
+19 -13
View File
@@ -5,6 +5,7 @@ import java.util.Date;
import java.util.List;
import android.app.AlertDialog;
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -25,17 +26,21 @@ import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.domain.common.MaxPointsReason;
import com.sap.sailing.domain.common.impl.Util;
import com.sap.sailing.domain.common.impl.Util.Pair;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.racecommittee.app.AppConstants;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.logging.ExLog;
import com.sap.sailing.racecommittee.app.ui.adapters.finishing.CompetitorPositioningListAdapter;
import com.sap.sailing.racecommittee.app.ui.adapters.finishing.CompetitorsAdapter;
import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.AbortModeSelectionDialog;
import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
public class FinishingRaceFragment extends RaceFragment {
private TextView countUpTextView;
protected TextView nextFlagCountdown;
private ImageButton novemberFlagButton;
private ImageButton abortingFlagButton;
private ImageButton blueFlagButton;
private DragSortListView positioningListView;
@@ -67,7 +72,7 @@ public class FinishingRaceFragment extends RaceFragment {
nextFlagCountdown = (TextView) getView().findViewById(R.id.nextFlagCountdown);
blueFlagButton = (ImageButton) getView().findViewById(R.id.blueFlagButton);
novemberFlagButton = (ImageButton) getView().findViewById(R.id.novemberButton);
abortingFlagButton = (ImageButton) getView().findViewById(R.id.abortingFlagButton);
competitors = new ArrayList<Competitor>();
Util.addAll(getRace().getCompetitors(), competitors);
@@ -123,10 +128,10 @@ public class FinishingRaceFragment extends RaceFragment {
}
});
novemberFlagButton.setOnClickListener(new OnClickListener() {
abortingFlagButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showChooseAPNovemberDialog();
showNovemberModeDialog();
ExLog.i(ExLog.FLAG_NOVEMBER, getRace().getId().toString(), getActivity());
}
});
@@ -291,16 +296,17 @@ public class FinishingRaceFragment extends RaceFragment {
private String getFormattedTimePart(int timePart) {
return (timePart < 10) ? "0" + timePart : String.valueOf(timePart);
}
protected void showNovemberModeDialog() {
FragmentManager fragmentManager = getFragmentManager();
private void showChooseAPNovemberDialog() {
// FragmentManager fragmentManager = getFragmentManager();
//
// RaceChooseAPNovemberDialog fragment = new RaceChooseAPNovemberDialog();
//
// Bundle args = getParameterBundle();
// fragment.setArguments(args);
//
// fragment.show(fragmentManager, "dialogAPNovemberMode");
RaceDialogFragment fragment = new AbortModeSelectionDialog();
Bundle args = getParameterBundle();
args.putString(AppConstants.FLAG_KEY, Flags.NOVEMBER.name());
fragment.setArguments(args);
fragment.show(fragmentManager, "dialogNovemberMode");
}
private void showRemoveBlueFlagDialog() {
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RunningRaceFragment.java
+21
View File
@@ -1,6 +1,7 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import android.app.AlertDialog;
import android.app.FragmentManager;
import android.content.DialogInterface;
import android.os.Bundle;
import android.view.LayoutInflater;
@@ -14,6 +15,8 @@ import com.sap.sailing.domain.base.impl.MillisecondsTimePoint;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.logging.ExLog;
import com.sap.sailing.racecommittee.app.ui.fragments.RaceFragment;
import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.AbortTypeSelectionDialog;
import com.sap.sailing.racecommittee.app.ui.fragments.dialogs.RaceDialogFragment;
public class RunningRaceFragment extends RaceFragment {
@@ -36,6 +39,13 @@ public class RunningRaceFragment extends RaceFragment {
showDisplayBlueFlagDialog();
}
});
ImageButton abortingFlagButton = (ImageButton) getView().findViewById(R.id.abortingFlagButton);
abortingFlagButton.setOnClickListener(new OnClickListener() {
public void onClick(View v) {
showChooseAPNovemberDialog();
}
});
}
private void showDisplayBlueFlagDialog() {
@@ -83,4 +93,15 @@ public class RunningRaceFragment extends RaceFragment {
return String.format(timePattern, hoursString, minutesString, secondsString);
}
private void showChooseAPNovemberDialog() {
FragmentManager fragmentManager = getFragmentManager();
RaceDialogFragment fragment = new AbortTypeSelectionDialog();
Bundle args = getParameterBundle();
fragment.setArguments(args);
fragment.show(fragmentManager, "dialogAPNovemberMode");
}
}