Worked on layouting for the finishing fragment view in the RCC App

This commit is contained in:
Armin Zamani committed 2013-04-06 16:08:34 +02:00
1 parent aa0c113d3c
commit f7476a3823
4 files changed
+39 -29

No files matched your search

@@ -57,18 +57,19 @@
<TextView
android:id="@+id/textPositioning"
android:layout_width="300dp"
android:layout_width="350dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
android:text="@string/positionings"
android:textSize="12pt"
android:textStyle="bold"
android:layout_marginRight="30dp" />
android:layout_marginRight="30dp"
android:layout_marginLeft="10dp" />
<TextView
android:id="@+id/textCompetitors"
android:layout_width="300dp"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:gravity="center_vertical|center_horizontal"
@@ -85,11 +86,12 @@
<com.mobeta.android.dslv.DragSortListView
android:id="@+id/listViewPositioningList"
android:layout_width="300dp"
android:layout_width="350dp"
android:layout_height="match_parent"
android:layout_gravity="left"
android:verticalSpacing="5dp"
android:layout_marginRight="30dp"
android:layout_marginLeft="10dp"
dslv:drag_enabled="true"
dslv:collapsed_height="2dp"
dslv:drag_scroll_start="0.33"
@@ -101,7 +103,7 @@
<ListView
android:id="@+id/gridViewCompetitors"
android:layout_width="200dp"
android:layout_width="250dp"
android:layout_height="match_parent"
android:verticalSpacing="5dp"
android:layout_gravity="left"
@@ -121,7 +123,7 @@
<!-- SELECTION SECTION -->
<LinearLayout
android:layout_width="275dp"
android:layout_width="225dp"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical" >
@@ -1,16 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/Welter.Grid.Competitor.Cell"
android:layout_width="fill_parent"
android:layout_height="50dp" android:id="@+id/Welter.Grid.Competitor.Cell"
android:gravity="center_horizontal"
android:layout_height="70dp"
android:gravity="center_vertical"
android:background="@drawable/list_selector"
android:paddingLeft="6dip"
android:orientation="vertical">
<TextView android:id="@+id/Welter.Grid.Competitor.Cell.txtTitle"
android:padding="5dp" android:textColor="@drawable/text_selector"
android:textSize="9pt"
android:layout_width="wrap_content" android:layout_height="50dp">
</TextView>
android:orientation="horizontal">
<TextView
android:id="@+id/Welter.Grid.Competitor.Cell.txtTitle"
android:layout_width="fill_parent"
android:layout_height="70dp"
android:gravity="left|center_vertical"
android:padding="5dp"
android:textColor="@drawable/text_selector"
android:textSize="9pt"
android:textIsSelectable="false" />
</LinearLayout>
@@ -2,36 +2,34 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/Welter.Cell.Positioning"
android:layout_width="fill_parent"
android:layout_height="60dp"
android:layout_height="50dp"
android:background="@drawable/list_selector"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingLeft="6dip" >
android:orientation="horizontal" >
<ImageView
android:id="@id/drag_handle"
android:layout_width="50dp"
android:layout_height="match_parent"
android:layout_height="fill_parent"
android:layout_weight="0"
android:background="@drawable/drag_symbol"
android:contentDescription="@string/drag_handle_description" />
<TextView
android:id="@+id/Welter.Cell.Positioning.columnOne.txtTitle"
android:layout_marginLeft="10dp"
android:layout_width="20dp"
android:layout_height="match_parent"
android:layout_marginLeft="5dp"
android:layout_width="70dp"
android:layout_height="fill_parent"
android:gravity="center_horizontal|center_vertical"
android:padding="5dp"
android:textColor="@drawable/text_selector"
android:textSize="9pt"
android:textIsSelectable="false" />
<TextView
android:id="@+id/Welter.Cell.Positioning.columnTwo.txtTitle"
android:layout_width="220dp"
android:layout_height="match_parent"
android:gravity="center_horizontal|center_vertical"
android:layout_width="215dp"
android:layout_height="fill_parent"
android:gravity="left|center_vertical"
android:padding="5dp"
android:textColor="@drawable/text_selector"
android:textSize="9pt"
@@ -216,14 +216,21 @@ public class FinishingRaceFragment extends RaceFragment implements TickListener
protected void setMaxPointsReasonForItem(Pair<Competitor, MaxPointsReason> item, CharSequence maxPointsReasonName) {
MaxPointsReason maxPointsReason = MaxPointsReason.valueOf(maxPointsReasonName.toString());
item = new Pair<Competitor, MaxPointsReason>(item.getA(), maxPointsReason);
Pair<Competitor, MaxPointsReason> newItem = new Pair<Competitor, MaxPointsReason>(item.getA(), maxPointsReason);
int currentIndexOfItem = positionedCompetitors.indexOf(item);
replaceItemInPositioningList(currentIndexOfItem, item, newItem);
if (!maxPointsReason.equals(MaxPointsReason.NONE)) {
setCompetitorToBottomOfPositioningList(item);
setCompetitorToBottomOfPositioningList(newItem);
}
getRace().getState().setFinishPositioningListChanged(positionedCompetitors);
}
private void replaceItemInPositioningList(int currentIndexOfItem, Pair<Competitor, MaxPointsReason> item, Pair<Competitor, MaxPointsReason> newItem) {
positioningAdapter.remove(item);
positioningAdapter.insert(newItem, currentIndexOfItem);
}
private void setCompetitorToBottomOfPositioningList(Pair<Competitor, MaxPointsReason> item) {
int currentIndex = positionedCompetitors.indexOf(item);
int lastIndex = positionedCompetitors.size() - 1;