eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-10 14:20:55 +00:00
Code Activity

RCApp: show time since finishing start

Browse Source
This commit is contained in:
Peter Siegmund committed 2015-06-20 10:50:56 +02:00
1 parent 9e908b5cb5
commit e3b4f45cea
4 files changed
+37 -10
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.xml
+10 -1
View File
@@ -24,10 +24,19 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/default_margin_half"
android:layout_marginTop="@dimen/default_margin_half"
android:text="@string/finishing_started"
android:textAppearance="?textNormal"/>
<TextView
android:id="@+id/first_vessel_since"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="@dimen/default_margin_half"
android:text="@string/finishing_started_since"
android:textAppearance="?textNormal"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
mobile/com.sap.sailing.racecommittee.app/res/values-de/strings.xml
+2 -1
View File
@@ -352,7 +352,8 @@
<string name="race_summary_wind_direction_value">aus %.0f°</string>
<string name="race_summary_wind_speed">Durchschnittliche Windgeschwindigkeit</string>
<string name="record_voice">Stimme aufzeichnen</string>
<string name="finishing_started">Erstes Schiff im Ziel um #TIME#</string>
<string name="finishing_started">Erstes Schiff im Ziel um %s</string>
<string name="finishing_started_since">(%s)</string>
<string name="finishing_done">Jetzt runter</string>
<string name="finished_edit">Liste bearbeiten</string>
<string name="finished_list">Zielliste</string>
mobile/com.sap.sailing.racecommittee.app/res/values/strings.xml
+2 -1
View File
@@ -369,7 +369,8 @@
<string name="race_summary_individual_recalls">Individual Recalls</string>
<string name="race_summary_time" translatable="false">%s min</string>
<string name="record_voice">Record Voice</string>
<string name="finishing_started">First vessel in finish at #TIME#</string>
<string name="finishing_started">First vessel in finish at %s</string>
<string name="finishing_started_since">(%s)</string>
<string name="finishing_done">Down now</string>
<string name="finished_recording">Recording</string>
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/RaceFinishingFragment.java
+23 -7
View File
@@ -1,7 +1,5 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import java.text.SimpleDateFormat;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.view.LayoutInflater;
@@ -10,14 +8,21 @@ import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
import com.sap.sailing.android.shared.util.ViewHolder;
import com.sap.sailing.domain.common.racelog.Flags;
import com.sap.sailing.racecommittee.app.R;
import com.sap.sailing.racecommittee.app.ui.utils.FlagsResources;
import com.sap.sailing.racecommittee.app.utils.TimeUtils;
import com.sap.sse.common.TimePoint;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import java.text.SimpleDateFormat;
public class RaceFinishingFragment extends BaseFragment {
private SimpleDateFormat mDateFormat;
private TextView mFinishingSince;
public static RaceFinishingFragment newInstance() {
RaceFinishingFragment fragment = new RaceFinishingFragment();
Bundle args = new Bundle();
@@ -30,6 +35,9 @@ public class RaceFinishingFragment extends BaseFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View layout = inflater.inflate(R.layout.race_finishing, container, false);
mDateFormat = new SimpleDateFormat("HH:mm:ss", getResources().getConfiguration().locale);
mFinishingSince = ViewHolder.get(layout, R.id.first_vessel_since);
ImageView flag = ViewHolder.get(layout, R.id.flag);
if (flag != null) {
flag.setImageDrawable(FlagsResources.getFlagDrawable(getActivity(), Flags.BLUE.name(), 96));
@@ -55,11 +63,19 @@ public class RaceFinishingFragment extends BaseFragment {
if (getView() != null) {
TextView first_vessel = ViewHolder.get(getView(), R.id.first_vessel);
if (first_vessel != null && getRaceState() != null && getRaceState().getFinishingTime() != null) {
String vessel_time = getString(R.string.finishing_started);
SimpleDateFormat dateFormat = new SimpleDateFormat("HH:mm:ss", getResources().getConfiguration().locale);
vessel_time = vessel_time.replace("#TIME#", dateFormat.format(getRaceState().getFinishingTime().asDate()));
first_vessel.setText(vessel_time);
first_vessel.setText(getString(R.string.finishing_started, mDateFormat.format(getRaceState().getFinishingTime().asDate())));
}
}
notifyTick(MillisecondsTimePoint.now());
}
@Override
public void notifyTick(TimePoint now) {
super.notifyTick(now);
if (mFinishingSince != null) {
String timeDiff = TimeUtils.formatDurationSince(now.minus(getRaceState().getFinishingTime().asMillis()).asMillis());
mFinishingSince.setText(getString(R.string.finishing_started_since, timeDiff));
}
}
}