mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-30 15:57:11 +00:00
# Added button to FinishedRaceFragment for repositioning
# RaceDialogFragment now implements TickListener
This commit is contained in:
1 parent
e66f7ff58a
commit
d1be9dc589
8 files changed
+62
-8
No files matched your search
@@ -102,5 +102,21 @@
|
||||
android:ems="10"
|
||||
android:visibility="invisible" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="80dp"
|
||||
android:layout_weight="0.2"
|
||||
android:orientation="vertical">
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonPositioning"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:text="Change positioning"
|
||||
android:textSize="14pt"
|
||||
android:gravity="center_vertical|center_horizontal"
|
||||
android:ems="10" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
-2
@@ -61,6 +61,4 @@ public abstract class RaceFragment extends Fragment implements TickListener {
|
||||
return args;
|
||||
}
|
||||
|
||||
public abstract void notifyTick();
|
||||
|
||||
}
|
||||
+5
@@ -99,4 +99,9 @@ public class AbortModeSelectionDialog extends RaceDialogFragment {
|
||||
}
|
||||
this.dismiss();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void notifyTick() {
|
||||
|
||||
}
|
||||
}
|
||||
+5
@@ -63,4 +63,9 @@ public class AbortTypeSelectionDialog extends RaceDialogFragment {
|
||||
fragment.show(fragmentManager, dialogName);
|
||||
this.dismiss();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void notifyTick() {
|
||||
|
||||
}
|
||||
}
|
||||
+5
@@ -442,4 +442,9 @@ public class CourseDesignDialogFragment extends RaceDialogFragment {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void notifyTick() {
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
+16
-1
@@ -5,11 +5,13 @@ import java.io.Serializable;
|
||||
import com.sap.sailing.racecommittee.app.AppConstants;
|
||||
import com.sap.sailing.racecommittee.app.data.OnlineDataManager;
|
||||
import com.sap.sailing.racecommittee.app.domain.ManagedRace;
|
||||
import com.sap.sailing.racecommittee.app.utils.TickListener;
|
||||
import com.sap.sailing.racecommittee.app.utils.TickSingleton;
|
||||
|
||||
import android.app.DialogFragment;
|
||||
import android.os.Bundle;
|
||||
|
||||
public class RaceDialogFragment extends DialogFragment {
|
||||
public abstract class RaceDialogFragment extends DialogFragment implements TickListener {
|
||||
|
||||
public static Bundle createArguments(ManagedRace race) {
|
||||
Bundle arguments = new Bundle();
|
||||
@@ -30,6 +32,19 @@ public class RaceDialogFragment extends DialogFragment {
|
||||
String.format("Unable to obtain ManagedRace from datastore on start of race fragment."));
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
super.onStart();
|
||||
TickSingleton.INSTANCE.registerListener(this);
|
||||
notifyTick();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
super.onStop();
|
||||
TickSingleton.INSTANCE.unregisterListener(this);
|
||||
}
|
||||
|
||||
public ManagedRace getRace() {
|
||||
return managedRace;
|
||||
|
||||
+13
@@ -8,7 +8,9 @@ import java.util.Date;
|
||||
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.domain.common.TimePoint;
|
||||
@@ -48,6 +50,17 @@ public class FinishedRaceFragment extends RaceFragment {
|
||||
finishTimeView.setText(getFinishTimeText());
|
||||
timeLimitView.setText(getTimeLimitText());
|
||||
protestStartTimeView.setText(getProtestStartTimeText());
|
||||
|
||||
Button positioningButton = (Button) getView().findViewById(R.id.buttonPositioning);
|
||||
positioningButton.setOnClickListener(new OnClickListener() {
|
||||
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
PositioningFragment fragment = new PositioningFragment();
|
||||
fragment.setArguments(PositioningFragment.createArguments(getRace()));
|
||||
fragment.show(getFragmentManager(), null);
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
private CharSequence getProtestStartTimeText() {
|
||||
|
||||
+2
-5
@@ -24,11 +24,10 @@ 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.RaceDialogFragment;
|
||||
|
||||
public class PositioningFragment extends RaceFragment {
|
||||
public class PositioningFragment extends RaceDialogFragment {
|
||||
|
||||
|
||||
private DragSortListView positioningListView;
|
||||
private ListView competitorListView;
|
||||
private DragSortController dragSortController;
|
||||
@@ -225,8 +224,6 @@ public class PositioningFragment extends RaceFragment {
|
||||
positioningAdapter.notifyDataSetChanged();
|
||||
}
|
||||
|
||||
|
||||
|
||||
@Override
|
||||
public void notifyTick() {
|
||||
|
||||
|
||||
Reference in new issue
Block a user