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

Merge branch 'master' into ubilabs--tracking_app--master

Browse Source
This commit is contained in:
Axel Uhl committed 2015-08-13 17:19:57 +02:00
2 parents 496a53b752 edd86f0f74
commit 0fbe9da733
10 files changed
+304 -37
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_schedule_course_map.xml
+7 -1
View File
@@ -2,4 +2,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" />
android:orientation="vertical">
<include
android:id="@+id/header"
layout="@layout/race_schedule_course_header"/>
</LinearLayout>
mobile/com.sap.sailing.racecommittee.app/res/layout/race_schedule_course_marks.xml
+6 -1
View File
@@ -5,9 +5,14 @@
android:layout_height="match_parent"
android:orientation="vertical">
<include
android:id="@+id/header"
layout="@layout/race_schedule_course_header"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_below="@id/header">
<LinearLayout
android:id="@+id/header_bar"
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/dialogs/ProtestTimeDialogFragment.java
+9 -7
View File
@@ -6,6 +6,7 @@ import java.util.Date;
import java.util.List;
import android.content.Context;
import android.os.Build;
import android.os.Bundle;
import android.support.v7.app.AlertDialog;
import android.util.SparseBooleanArray;
@@ -105,14 +106,15 @@ public class ProtestTimeDialogFragment extends AttachedDialogFragment {
timePicker = (TimePicker) view.findViewById(R.id.protest_time_time_time_picker);
setupTimePicker(timePicker);
ViewGroup.LayoutParams layoutParams = racesList.getLayoutParams();
layoutParams.height = 49 * races.size();
int screenHeight = (int)(ScreenHelper.on(getActivity()).getScreenHeight() * 0.65);
if (layoutParams.height > screenHeight) {
layoutParams.height = screenHeight;
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
// TODO: @Samuel -> please check, why we did this, because I can't remember
ViewGroup.LayoutParams layoutParams = racesList.getLayoutParams();
layoutParams.height = 49 * races.size();
int screenHeight = (int)(ScreenHelper.on(getActivity()).getScreenHeight() * 0.65);
if (layoutParams.height > screenHeight) {
layoutParams.height = screenHeight;
}
}
view.setLayoutParams(layoutParams);
return view;
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentMarks.java
+31 -14
View File
@@ -1,5 +1,10 @@
package com.sap.sailing.racecommittee.app.ui.fragments.raceinfo;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import android.content.DialogInterface;
import android.content.Loader;
import android.graphics.drawable.NinePatchDrawable;
@@ -13,14 +18,21 @@ import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.LinearLayout;
import android.widget.Toast;
import com.h6ah4i.android.widget.advrecyclerview.animator.SwipeDismissItemAnimator;
import com.h6ah4i.android.widget.advrecyclerview.decoration.ItemShadowDecorator;
import com.h6ah4i.android.widget.advrecyclerview.draggable.RecyclerViewDragDropManager;
import com.h6ah4i.android.widget.advrecyclerview.swipeable.RecyclerViewSwipeManager;
import com.h6ah4i.android.widget.advrecyclerview.touchguard.RecyclerViewTouchActionGuardManager;
import com.h6ah4i.android.widget.advrecyclerview.utils.WrapperAdapterUtils;
import com.sap.sailing.domain.base.*;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.base.ControlPoint;
import com.sap.sailing.domain.base.ControlPointWithTwoMarks;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.Mark;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.ControlPointWithTwoMarksImpl;
import com.sap.sailing.domain.base.impl.CourseDataImpl;
import com.sap.sailing.domain.base.impl.WaypointImpl;
@@ -43,11 +55,6 @@ import com.sap.sailing.racecommittee.app.utils.BitmapHelper;
import com.sap.sse.common.Util;
import com.sap.sse.common.impl.MillisecondsTimePoint;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
public class CourseFragmentMarks extends CourseFragment implements MarkClick, ElementLongClick, EventListener {
private RecyclerViewDragDropManager mDragDropManager;
@@ -86,6 +93,17 @@ public class CourseFragmentMarks extends CourseFragment implements MarkClick, El
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.race_schedule_course_marks, container, false);
LinearLayout headerText = ViewHelper.get(view, R.id.header_text);
if (headerText != null) {
headerText.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
openMainScheduleFragment();
}
});
}
mHistoryCourse = (RecyclerView) view.findViewById(R.id.previous_course);
if (mHistoryCourse != null) {
LinearLayoutManager layoutManager = new LinearLayoutManager(getActivity());
@@ -102,7 +120,7 @@ public class CourseFragmentMarks extends CourseFragment implements MarkClick, El
mGuardManager.setEnabled(true);
mDragDropManager = new RecyclerViewDragDropManager();
NinePatchDrawable drawable = (NinePatchDrawable) BitmapHelper.getDrawable(getActivity(),R.drawable.material_shadow_z3);
NinePatchDrawable drawable = (NinePatchDrawable) BitmapHelper.getDrawable(getActivity(), R.drawable.material_shadow_z3);
mDragDropManager.setDraggingItemShadowDrawable(drawable);
mSwipeManager = new RecyclerViewSwipeManager();
@@ -126,8 +144,7 @@ public class CourseFragmentMarks extends CourseFragment implements MarkClick, El
mCurrentCourse.setItemAnimator(new SwipeDismissItemAnimator());
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
mCurrentCourse
.addItemDecoration(new ItemShadowDecorator((NinePatchDrawable) BitmapHelper.getDrawable(getActivity(), R.drawable.material_shadow_z1)));
mCurrentCourse.addItemDecoration(new ItemShadowDecorator((NinePatchDrawable) BitmapHelper.getDrawable(getActivity(), R.drawable.material_shadow_z1)));
}
mGuardManager.attachRecyclerView(mCurrentCourse);
@@ -471,13 +488,13 @@ public class CourseFragmentMarks extends CourseFragment implements MarkClick, El
getRaceState().setCourseDesign(MillisecondsTimePoint.now(), courseDesign);
saveChangedCourseDesignInCache(courseDesign);
switch (getArguments().getInt(START_MODE, 0)) {
case 1:
case 1:
// sendIntent(AppConstants.INTENT_ACTION_SHOW_MAIN_CONTENT);
break;
break;
default:
openMainScheduleFragment();
break;
default:
openMainScheduleFragment();
break;
}
}
mobile/com.sap.sailing.racecommittee.app/src/com/sap/sailing/racecommittee/app/ui/fragments/raceinfo/CourseFragmentName.java
+2 -1
View File
@@ -7,6 +7,7 @@ import android.view.ViewGroup;
import android.widget.LinearLayout;
import android.widget.ListView;
import com.sap.sailing.android.shared.util.ViewHelper;
import com.sap.sailing.domain.base.CourseBase;
import com.sap.sailing.domain.base.impl.CourseDataImpl;
import com.sap.sailing.racecommittee.app.AppConstants;
@@ -32,7 +33,7 @@ public class CourseFragmentName extends CourseFragment implements CourseNameAdap
mListView = (ListView) layout.findViewById(R.id.listView);
LinearLayout headerText = (LinearLayout) layout.findViewById(R.id.header_text);
LinearLayout headerText = ViewHelper.get(layout, R.id.header_text);
if (headerText != null) {
headerText.setOnClickListener(new View.OnClickListener() {