Skip to content
This repository has been archived by the owner on Sep 30, 2022. It is now read-only.

Commit

Permalink
Cleaned up listview look
Browse files Browse the repository at this point in the history 
-extra lines don't appear
- removed debuggin console.writelines
  • Loading branch information
@shreystechtips
shreystechtips committed Feb 8, 2019
1 parent f5be6df commit 790ebc7
Show file tree
Hide file tree
Showing 9 changed files with 22 additions and 72 deletions.
6 changes: 5 additions & 1 deletion NRGScoutingApp/Pages/Main Landing/Matches.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,11 @@
</Grid.ColumnDefinitions>
<StackLayout x:Name="matchesView" Orientation="Vertical" HorizontalOptions="FillAndExpand" Grid.Row="0" Grid.Column="0">
<SearchBar x:Name="searchBar" Placeholder="Match Number" TextChanged="SearchBar_OnTextChanged"/>
<ListView x:Name="listView" Margin="0,0,0,0" ItemTapped="Handle_ItemTapped" HasUnevenRows="true">
<ListView x:Name="listView"
Margin="0,0,0,0"
ItemTapped="Handle_ItemTapped"
HasUnevenRows="true"
Footer="">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
Expand Down
6 changes: 5 additions & 1 deletion NRGScoutingApp/Pages/Main Landing/PitScouting.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,11 @@
</Grid.ColumnDefinitions>
<StackLayout x:Name="scoutView" Orientation="Vertical" HorizontalOptions="FillAndExpand" Grid.Row="0" Grid.Column="0">
<SearchBar x:Name="searchBar" Placeholder="Team Name" TextChanged="SearchBar_OnTextChanged"/>
<ListView x:Name="listView" Margin="0,0,0,0" ItemTapped="teamClicked" HasUnevenRows="true"/>
<ListView x:Name="listView"
Margin="0,0,0,0"
ItemTapped="teamClicked"
HasUnevenRows="true"
Footer=""/>
</StackLayout>
<Label x:Name="sadNoPit" HorizontalOptions="CenterAndExpand" VerticalOptions="CenterAndExpand" HorizontalTextAlignment="Center" Grid.Row="0" Grid.Column="0" Text=":( No Notes.&#x0a;
Add Notes and Come Back" FontAttributes="Bold" TextColor="Gray" FontSize="Large"/>
Expand Down
1 change: 0 additions & 1 deletion NRGScoutingApp/Pages/Main Landing/PitScouting.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ protected override void OnAppearing()
setListView(App.Current.Properties["matchEventsString"].ToString());
}


void newPit(object sender, System.EventArgs e)
{
Navigation.PushAsync(new MatchEntryStart(false));
Expand Down
16 changes: 3 additions & 13 deletions NRGScoutingApp/Pages/Main Landing/Rankings.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,8 @@
Grid.Column="0"
VerticalOptions="CenterAndExpand"
ItemTapped="teamClicked"
HasUnevenRows="true">
HasUnevenRows="true"
Footer="">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
Expand All @@ -56,15 +57,4 @@
</Grid>
</StackLayout>
</ContentPage.Content>
</ContentPage>


<!-- <ContentPage.ToolbarItems>
<ToolbarItem Text="Overall" Clicked="overallRank" Order="Primary"/>
<ToolbarItem Text="Hatch" Clicked="pick1Rank" Order="Secondary"/>
<ToolbarItem Text="Cargo" Clicked="pick2Rank" Order="Secondary"/>
<ToolbarItem Text="Climb" Clicked="climbRank" Order="Secondary"/>
<ToolbarItem Text="Lvl. 1" Clicked="drop1Rank" Order="Secondary"/>
<ToolbarItem Text="Lvl. 2" Clicked="drop2Rank" Order="Secondary"/>
<ToolbarItem Text="Lvl. 3" Clicked="drop3Rank" Order="Secondary"/>
</ContentPage.ToolbarItems>-->
</ContentPage>
43 changes: 0 additions & 43 deletions NRGScoutingApp/Pages/Main Landing/Rankings.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ public Rankings()

MatchFormat.CHOOSE_RANK_TYPE rankChoice;


//Initializes the ranking object
Ranker mainRank = new Ranker(App.Current.Properties["matchEventsString"].ToString());

Expand Down Expand Up @@ -56,48 +55,6 @@ void rankTypeDelta(object sender, System.EventArgs e)
updateEvents();
}

//void overallRank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.overallRank;
// updateEvents();
//}

//void pick1Rank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.drop1;
// updateEvents();
//}

//void pick2Rank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.drop2;
// updateEvents();
//}

//void climbRank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.climb;
// updateEvents();
//}

//void drop1Rank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.drop1;
// updateEvents();
//}

//void drop2Rank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.drop2;
// updateEvents();
//}

//void drop3Rank(object sender, System.EventArgs e)
//{
// rankChoice = MatchFormat.CHOOSE_RANK_TYPE.drop3;
// updateEvents();
//}

protected override void OnAppearing()
{
updateEvents();
Expand Down
3 changes: 2 additions & 1 deletion NRGScoutingApp/Pages/Matches/MatchEvents.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@
ItemTapped="eventTapped"
HorizontalOptions="FillAndExpand"
VerticalOptions="CenterAndExpand"
Grid.Row="0" Grid.Column="0" HasUnevenRows="true">
Grid.Row="0" Grid.Column="0" HasUnevenRows="true"
Footer="">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
Expand Down
3 changes: 0 additions & 3 deletions NRGScoutingApp/Pages/Matches/NewMatchStart.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -226,9 +226,6 @@ async void cubeClicked(object sender, System.EventArgs e)
}
}



//TODO: Call Parse Method for match number called and figure out the pickNum and dropNum values and set them
private void timerValueSetter()
{
if (!App.Current.Properties.ContainsKey("lastItemPicked"))
Expand Down
11 changes: 6 additions & 5 deletions NRGScoutingApp/Pages/Rankings/RankingsDetailView.xaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@
Grid.Row="1" Grid.Column="1"/>
<Label Text="" x:Name="score6" TextColor="Black" FontSize="12"
Grid.Row="1" Grid.Column="2"/>

</Grid>
<ScrollView>
<ListView x:Name="listView" Margin="0,0,0,0" ItemTapped="matchTapped" HasUnevenRows="true">
<ListView x:Name="listView"
Margin="0,0,0,0"
ItemTapped="matchTapped"
HasUnevenRows="true"
Footer="">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
Expand All @@ -46,7 +48,6 @@
</DataTemplate>
</ListView.ItemTemplate>
</ListView>
</ScrollView>
</StackLayout>
</StackLayout>
</ContentPage.Content>
</ContentPage>
5 changes: 1 addition & 4 deletions NRGScoutingApp/Pages/Rankings/RankingsDetailView.xaml.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections.Generic;
using Xamarin.Forms;
using System.Linq;
using Xamarin.Forms.Xaml;

namespace NRGScoutingApp
{
Expand All @@ -21,10 +22,6 @@ public RankingsDetailView(String[] times)

void setScoreValues(String[] times)
{
foreach (string s in times)
{
Console.WriteLine(s);
}
score0.Text = ConstantVars.scoreBaseVals[0] + times[0];
score1.Text = ConstantVars.scoreBaseVals[1] + times[1];
score2.Text = ConstantVars.scoreBaseVals[2] + times[2];
Expand Down

0 comments on commit 790ebc7

Please sign in to comment.