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

fixed dependent start time panel text (into "short reverse")

Browse Source
This commit is contained in:
Peter Siegmund
2016-03-23 12:09:38 +01:00
parent f4298d7119
commit c503a8edd6
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mobile/com.sap.sailing.racecommittee.app/res/layout/race_panel_time_normal.xml
+7 -5
View File
@@ -11,6 +11,8 @@
android:id="@+id/timer_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/side_padding"
android:layout_marginRight="@dimen/side_padding"
android:layout_marginTop="@dimen/header_margin_top"
android:gravity="center"
android:singleLine="true"
@@ -30,8 +32,8 @@
android:layout_height="wrap_content"
android:layout_above="@id/time_marker"
android:layout_centerHorizontal="true"
android:baselineAligned="false"
android:layout_marginBottom="@dimen/side_padding">
android:layout_marginBottom="@dimen/side_padding"
android:baselineAligned="false">
<RelativeLayout
@@ -45,9 +47,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/linked_locked_area"
android:textColor="?attr/white"
android:textSize="@dimen/panel_button_caption_size"
android:layout_toRightOf="@+id/linked_locked_area"
tools:text="@string/time_start"/>
<LinearLayout
@@ -80,9 +82,9 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toRightOf="@+id/start_time_container"
android:layout_centerVertical="true"
android:layout_marginLeft="@dimen/side_padding"
android:layout_centerVertical="true">
android:layout_toRightOf="@+id/start_time_container">
<TextView
android:id="@+id/current_time"
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/panels/TimePanelFragment.java
+5 -6
View File
@@ -1,5 +1,9 @@
package com.sap.sailing.racecommittee.app.ui.fragments.panels;
import static com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderResult.ResolutionFailed.NO_START_TIME_SET;
import java.text.SimpleDateFormat;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@@ -31,10 +35,6 @@ import com.sap.sse.common.TimePoint;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import java.text.SimpleDateFormat;
import static com.sap.sailing.domain.abstractlog.race.analyzing.impl.StartTimeFinderResult.ResolutionFailed.NO_START_TIME_SET;
public class TimePanelFragment extends BasePanelFragment {
public final static String TOGGLED = "toggled";
@@ -156,8 +156,7 @@ public class TimePanelFragment extends BasePanelFragment {
if (mLinkedRace && mHeaderTime != null && result.getResolutionFailed() == NO_START_TIME_SET) {
SimpleRaceLogIdentifier identifier = Util.get(result.getRacesDependingOn(), 0);
ManagedRace race = DataManager.create(getActivity()).getDataStore().getRace(identifier);
mHeaderTime
.setText(getString(R.string.minutes_after_long, result.getStartTimeDiff().asMinutes(), RaceHelper.getRaceName(race, " / ")));
mHeaderTime.setText(getString(R.string.minutes_after_long, result.getStartTimeDiff().asMinutes(), RaceHelper.getShortReverseRaceName(race, " / ", getRace())));
}
}
}