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

Do stuff on my own #31

Open
wants to merge 18 commits into
base: master
Choose a base branch
from
Open

Do stuff on my own #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
f14a1c7
Test
dowhep Sep 11, 2019
9ef11a5
attempt to fix ranker
dowhep Sep 11, 2019
4258ba0
Added method for getting graph points
shreystechtips Sep 11, 2019
ce59ef3
delete unnecessary things
dowhep Sep 11, 2019
4ca09d0
Yay i did it
dowhep Sep 11, 2019
a0ccaaf
updated ranking detail view
shreystechtips Sep 12, 2019
f57fdfc
Updated version to 2.0 (version code 15)
shreystechtips Sep 12, 2019
f1b04a9
Colorful
dowhep Sep 12, 2019
f7181d0
FIXED
dowhep Sep 12, 2019
5ab98f2
Fixed color
dowhep Sep 13, 2019
43a1a9f
INTROOOOOOO
dowhep Sep 13, 2019
3a7ab53
Update NRGScoutingApp.Droid.csproj
dowhep Sep 13, 2019
48a5fb3
Updated framework versions to latest
shreystechtips Oct 11, 2019
63fc663
Update NRGScoutingApp.Droid.csproj
dowhep Oct 11, 2019
f43c6f9
Merge branch 'DoStuffOnMyOwn' of https://github.com/NRG948/PracticeNR…
dowhep Oct 11, 2019
6d4732c
added linking
dowhep Oct 11, 2019
939fecd
added microchart cancel link
dowhep Oct 11, 2019
5125761
fix stuff
dowhep Oct 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,3 +39,7 @@ Thumbs.db

# dotCover
*.dotCover

Droid/google-services.json

iOS/GoogleService-Info.plist
2 changes: 1 addition & 1 deletion Droid/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using NRGScouting;

namespace NRGScoutingApp.Droid {
[Activity (Label = "NRGScoutingApp.Droid", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = true, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
[Activity (Label = "NRGScoutingApp.Droid", Icon = "@drawable/icon", Theme = "@style/MyTheme", MainLauncher = false, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation)]
public class MainActivity : global::Xamarin.Forms.Platform.Android.FormsAppCompatActivity {
App app;
protected override void OnCreate (Bundle bundle) {
Expand Down
253 changes: 159 additions & 94 deletions Droid/NRGScoutingApp.Droid.csproj
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Droid/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.NRG.ScoutingApp.NRG_Scouting" android:versionCode="10" android:versionName="1.6.5" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.NRG.ScoutingApp.NRG_Scouting" android:versionCode="15" android:versionName="2.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="28" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />
Expand Down
3,543 changes: 1,778 additions & 1,765 deletions Droid/Resources/Resource.designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

Binary file added Droid/Resources/drawable/Logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Droid/Resources/drawable/splash_screen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8" ?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<color android:color="@android:color/white"/>
</item>
<item>
<bitmap
android:src="@drawable/Logo"
android:tileMode="disabled"
android:gravity="center"/>
</item>
</layer-list>
8 changes: 7 additions & 1 deletion Droid/Resources/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
<style name="TodoActionBar.MenuTextStyle" parent="style/TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textSize">20sp</item>
</style>
<color name="ListViewSelected">#ffffff</color>
<style name="MyTheme.Splash" parent ="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowBackground">@drawable/splash_screen</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
</style>

<color name="ListViewSelected">#ffffff</color>
<color name="ListViewHighlighted">#ffffff</color>
</resources>
40 changes: 40 additions & 0 deletions Droid/SplashActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Android.App;
using Android.Content;
using Android.OS;
using Android.Runtime;
using Android.Views;
using Android.Widget;
using NRGScoutingApp.Droid;

namespace NRGScouting
{
[Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
public class SplashActivity : Activity
{
protected override void OnCreate(Bundle savedInstanceState)
{
base.OnCreate(savedInstanceState);

// Create your application here
}
protected override void OnResume()
{
base.OnResume();
Task startupWork = new Task(() => { Startup(); });
startupWork.Start();
}

async void Startup()
{
StartActivity(new Intent(Application.Context, typeof(MainActivity)));

}
public override void OnBackPressed() { }

}
}
8 changes: 8 additions & 0 deletions Droid/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SkiaSharp" publicKeyToken="0738eb9f132ed756" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.68.0.0" newVersion="1.68.0.0" />
</dependentAssembly>
<dependentAssembly>
<assemblyIdentity name="SkiaSharp.Views.Android" publicKeyToken="0738eb9f132ed756" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.68.0.0" newVersion="1.68.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
56 changes: 31 additions & 25 deletions Droid/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,38 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="monoandroid81" />
<package id="Plugin.CurrentActivity" version="2.1.0.2" targetFramework="monoandroid81" />
<package id="Microcharts" version="0.7.1" targetFramework="monoandroid81" />
<package id="Microcharts.Forms" version="0.7.1" targetFramework="monoandroid81" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="monoandroid81" />
<package id="Plugin.CurrentActivity" version="2.1.0.4" targetFramework="monoandroid81" />
<package id="Plugin.Permissions" version="3.0.0.12" targetFramework="monoandroid81" />
<package id="Rg.Plugins.Popup" version="1.1.4.168" targetFramework="monoandroid81" />
<package id="Rg.Plugins.Popup" version="1.2.0.223" targetFramework="monoandroid81" />
<package id="SkiaSharp" version="1.68.0" targetFramework="monoandroid81" />
<package id="SkiaSharp.Views" version="1.68.0" targetFramework="monoandroid81" />
<package id="SkiaSharp.Views.Forms" version="1.68.0" targetFramework="monoandroid81" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="monoandroid81" />
<package id="System.ValueTuple" version="4.5.0" targetFramework="monoandroid81" />
<package id="Xam.Plugin.Connectivity" version="3.2.0" targetFramework="monoandroid80" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.CustomTabs" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Design" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v4" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.1" targetFramework="monoandroid81" />
<package id="Xamarin.Essentials" version="1.1.0" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="3.6.0.264807" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.1.1.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.1.1.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.1.1.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Annotations" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Compat" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.UI" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.Utils" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.CustomTabs" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Design" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Fragment" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Media.Compat" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Transition" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v4" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.CardView" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.MediaRouter" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.Palette" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="28.0.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Essentials" version="1.3.1" targetFramework="monoandroid81" />
<package id="Xamarin.Forms" version="4.2.0.848062" targetFramework="monoandroid81" />
<package id="Xamarin.Plugins.Clipboard" version="2.2.1" targetFramework="monoandroid81" />
</packages>
8 changes: 6 additions & 2 deletions MobileAppService/NRGScoutingApp.MobileAppService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,15 @@

<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<ReleaseVersion>1.6.5</ReleaseVersion>
<ReleaseVersion>2.0</ReleaseVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<PackageReference Include="Microcharts" Version="0.7.1" />
<PackageReference Include="Microcharts.Forms" Version="0.7.1" />
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3"><PrivateAssets Condition="'%(PackageReference.Version)' == ''">all</PrivateAssets>
<Publish Condition="'%(PackageReference.Version)' == ''">true</Publish>
</PackageReference>
<PackageReference Include="Swashbuckle.AspNetCore.SwaggerUI" Version="1.1.0" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.1.0" />
<PackageReference Include="Rg.Plugins.Popup" Version="1.1.4.168" />
Expand Down
2 changes: 1 addition & 1 deletion NRGScoutingApp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ Global
SolutionGuid = {5D08523F-70D7-41E2-B656-B2C13AAE7A31}
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
version = 1.6.5
version = 2.0
Policies = $0
$0.DotNetNamingPolicy = $1
$1.DirectoryNamespaceAssociation = PrefixedHierarchical
Expand Down
41 changes: 41 additions & 0 deletions NRGScoutingApp/Helper Classes/CSVRanker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,50 @@
using System;
using System.Collections.Generic;
using Microcharts;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using SkiaSharp;

namespace NRGScoutingApp {
public class CSVRanker {
//ORDERL Team,Match Num,Side,Avg. Hatch,Num Hatch,Avg. Cargo,Num Cargo,Climb,Lvl1,Lvl2,Lvl3,Cargoship
private JObject match;



public Entry graphCalc(JObject match)
{
this.match = match;
SKColor c;
int total = (int)(numCalc((int)MatchFormat.CHOOSE_RANK_TYPE.pick1) + numCalc((int)MatchFormat.CHOOSE_RANK_TYPE.pick2));
int lvl = (int)(total / 5);
switch (lvl)
{
case 0:
c = SKColor.Parse("#0000F0");
break;
case 1:
c = SKColor.Parse("#00F0F0");
break;
case 2:
c = SKColor.Parse("#00F000");
break;
case 3:
c = SKColor.Parse("#F0F000");
break;
default:
c = SKColor.Parse("#F00000");
break;
}
Console.WriteLine(total);
return new Entry(total)
{
Color = c,
Label = match["matchNum"].ToString(),
ValueLabel = total.ToString()
};
}

public string matchCalc (JObject match) {
this.match = match;
String total;
Expand Down Expand Up @@ -103,6 +141,8 @@ private String dropCalc (int levelEnum) {

}


//Number of Game Pieces
private double numCalc (int sortType) {
int total = 0;
int reps = 0;
Expand All @@ -124,6 +164,7 @@ private double numCalc (int sortType) {
return total;
}

//Avg game piece time
private String pickCalc (int sortType) {
double total = 0;
int reps = 0;
Expand Down
2 changes: 2 additions & 0 deletions NRGScoutingApp/Helper Classes/Ranker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,6 +253,8 @@ public Dictionary<string, double> getOverallData () {
return data;
}



//Returns average data for drop level passed through (enum int is passed through sortType)
public Dictionary<string, double> getDropData (int levelEnum) {
Dictionary<string, double> totalData = new Dictionary<string, double> ();
Expand Down
1 change: 0 additions & 1 deletion NRGScoutingApp/NRGScoutingApp.projitems
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,6 @@
</ItemGroup>
<ItemGroup>
<Folder Include="$(MSBuildThisFileDirectory)Helper Classes\" />
<Folder Include="$(MSBuildThisFileDirectory)Pages\Matches\" />
<Folder Include="$(MSBuildThisFileDirectory)Pages\Data Handling\" />
<Folder Include="$(MSBuildThisFileDirectory)Pages\Tab Groups\" />
<Folder Include="$(MSBuildThisFileDirectory)Pages\Pit Scouting\" />
Expand Down
2 changes: 1 addition & 1 deletion NRGScoutingApp/NRGScoutingApp.shproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<ProjectGuid>{81F276C2-6F61-4860-86CB-EA7F6D086DFB}</ProjectGuid>
<ReleaseVersion>1.6.5</ReleaseVersion>
<ReleaseVersion>2.0</ReleaseVersion>
</PropertyGroup>
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
Expand Down
3 changes: 2 additions & 1 deletion NRGScoutingApp/Pages/Data Handling/ExportDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ async void copyClicked (object sender, System.EventArgs e) {
}

async private Task pasteRequest () {
String temp = exportText.Replace ("&", "and");
String temp = "";
var s = new WebClient ();
String action = "";
while (String.IsNullOrWhiteSpace (action)) {
Expand All @@ -84,6 +84,7 @@ async private Task pasteRequest () {
await DisplayAlert ("Oops!", "No " + ConstantVars.exportTypes[3] + " data", "OK");
}
}
temp = temp.Replace("&", "and");

try {
WebRequest req = WebRequest.Create ("http://pastebin.com/api/api_post.php");
Expand Down
6 changes: 5 additions & 1 deletion NRGScoutingApp/Pages/Main Landing/Rankings.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="NRGScoutingApp.Rankings" xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core" ios:Page.UseSafeArea="true" Title="Rankings" Icon="ic_leader.png" ios:NavigationPage.PrefersLargeTitles="true">
<ContentPage xmlns="http://xamarin.com/schemas/2014/forms" xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml" x:Class="NRGScoutingApp.Rankings" xmlns:ios="clr-namespace:Xamarin.Forms.PlatformConfiguration.iOSSpecific;assembly=Xamarin.Forms.Core"
ios:Page.UseSafeArea="true" Title="Rankings" Icon="ic_leader.png" ios:NavigationPage.PrefersLargeTitles="true">

<ContentPage.Content>
<StackLayout>
<Grid MinimumHeightRequest="150" HorizontalOptions="CenterAndExpand" RowSpacing="0" ColumnSpacing="0" Margin="0" VerticalOptions="StartAndExpand">
Expand Down Expand Up @@ -49,8 +51,10 @@
</StackLayout>
<Label x:Name="sadNoMatch" HorizontalOptions="CenterAndExpand" HorizontalTextAlignment="Center" VerticalOptions="CenterAndExpand" Grid.Row="0" Grid.Column="0" Text=":( No Matches.&#x0a;Add a Match and Come Back" FontAttributes="Bold" TextColor="Gray" FontSize="Large" />
</Grid>

</StackLayout>
</ContentPage.Content>

</ContentPage><!--
<ContentPage.ToolbarItems>
<ToolbarItem Icon="ic_settings.png" Clicked="settingsClicked"/>
Expand Down
3 changes: 3 additions & 0 deletions NRGScoutingApp/Pages/Main Landing/Rankings.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Xamarin.Essentials;
using Xamarin.Forms;


namespace NRGScoutingApp {
/*ADD Ranking Chooser Replacement for iOS
*like a picker acts as the distribution center to choose the type
Expand All @@ -14,8 +15,10 @@ public partial class Rankings : INotifyPropertyChanged {
public Rankings () {
InitializeComponent ();
rankPicker.SelectedIndex = 0;

}


public static string teamSend;
private List<RankStruct> rankList;
public static List<string> pitTeams;
Expand Down
Loading