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

Attempts to fix android linking and updates #32

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

Attempts to fix android linking and updates #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
bc92fe6
Updated Versions and added linking options
shreystechtips Oct 11, 2019
d932f4a
Changed SDKversion and MultiDex
shreystechtips Oct 15, 2019
a23d99e
fixed styles, maybe
shreystechtips Oct 15, 2019
bf6eb2a
Merge remote-tracking branch 'origin/FixAndroidLinking' into FixAndro…
shreystechtips Oct 15, 2019
aa9077d
Update styles.xml
shreystechtips Oct 15, 2019
84bd061
Update styles.xml
shreystechtips Oct 15, 2019
86e83e1
Update styles.xml
shreystechtips Oct 15, 2019
1b2f76b
change to fix stuff?
shreystechtips Oct 15, 2019
1692403
using environment variables for API key
shreystechtips Oct 15, 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
119 changes: 63 additions & 56 deletions Droid/NRGScoutingApp.Droid.csproj
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion 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" />
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="29" />
<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
9,262 changes: 4,638 additions & 4,624 deletions Droid/Resources/Resource.designer.cs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions Droid/Resources/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<style name="MyTheme" parent="MyTheme.Base">
</style>
<!-- Base theme applied no matter what API -->
<style name="MyTheme.Base" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="MyTheme.Base" parent="@style/Theme.AppCompat.Light.DarkActionBar">
<!--If you are using revision 22.1 please use just windowNoTitle. Without android:-->
<item name="windowNoTitle">true</item>
<!--We will be using the toolbar so no need to show ActionBar-->
Expand Down Expand Up @@ -42,4 +42,4 @@
</style>
<color name="ListViewSelected">#ffffff</color>
<color name="ListViewHighlighted">#ffffff</color>
</resources>
</resources>
50 changes: 25 additions & 25 deletions Droid/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,32 +1,32 @@
<?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="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="System.Numerics.Vectors" 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>
4 changes: 3 additions & 1 deletion MobileAppService/NRGScoutingApp.MobileAppService.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.3" />
<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
6 changes: 3 additions & 3 deletions MobileAppService/Properties/launchSettings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"MasterDetail.MobileAppService": {
"NRGScoutingApp.MobileAppService": {
"commandName": "Project",
"launchBrowser": true,
"launchUrl": "http://localhost:5000/api/values",
"environmentVariables": {
"ASPNETCORE_ENVIRONMENT": "Development"
}
},
"applicationUrl": "https://localhost:5001;http://localhost:5000"
}
}
}
7 changes: 7 additions & 0 deletions NRGScoutingApp/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
using Xamarin.Forms;

namespace NRGScoutingApp {

public sealed class PreserveAttribute : System.Attribute
{
public bool AllMembers;
public bool Conditional;
}

public partial class App : Application {
public static bool UseMockDataStore = true;
public static string BackendUrl = "https://localhost:5000";
Expand Down
1 change: 1 addition & 0 deletions NRGScoutingApp/Helper Classes/ConstantVars.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
namespace NRGScoutingApp {
[Preserve(AllMembers = true)]
public class ConstantVars {
/*
* IMPORTANT NOTE:
Expand Down
1 change: 1 addition & 0 deletions NRGScoutingApp/Helper Classes/MatchFormat.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
using Newtonsoft.Json.Linq;

namespace NRGScoutingApp {
[Preserve(AllMembers = true)]
public class MatchFormat {
//Object to store all params
public class EntryParams {
Expand Down
1 change: 1 addition & 0 deletions NRGScoutingApp/Helper Classes/Ranker.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using Xamarin.Forms;

namespace NRGScoutingApp {
[Preserve(AllMembers = true)]
public class Ranker {
// not used because switch case only accept constant variables
private readonly int CLIMB_LVL_1_INDEX = 0;
Expand Down
1 change: 1 addition & 0 deletions NRGScoutingApp/Models/Item.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

namespace NRGScoutingApp
{
[Preserve(AllMembers = true)]
public class Item
{
public string Id { get; set; }
Expand Down
5 changes: 3 additions & 2 deletions NRGScoutingApp/Pages/Data Handling/ExportDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,7 @@ async private Task pasteRequest () {

req.Method = "POST";
req.ContentType = "application/x-www-form-urlencoded";

string postData = "api_option=" + "paste" + "&api_paste_code=" + temp + "&api_dev_key=" + "add_api_key";
string postData = "api_option=" + "paste" + "&api_paste_code=" + temp + "&api_dev_key=" + Environment.GetEnvironmentVariable("PASTEBIN_KEY");
byte[] byteArray = Encoding.UTF8.GetBytes (postData);
req.ContentLength = byteArray.Length;

Expand All @@ -104,6 +103,8 @@ async private Task pasteRequest () {

String ret = await reader.ReadToEndAsync ();
CrossClipboard.Current.SetText (ret);
Console.WriteLine(ret);
Console.WriteLine(Environment.GetEnvironmentVariable("PASTEBIN_KEY"));
await DisplayAlert ("Success", "Pastebin Link Copied to Clipboard", "OK");
} catch {
await DisplayAlert ("Error", "No Internet!", "OK");
Expand Down
16 changes: 8 additions & 8 deletions iOS/NRGScoutingApp.iOS.csproj
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"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Xamarin.Forms.3.6.0.264807\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.264807\build\Xamarin.Forms.props')" />
<Import Project="..\packages\Xamarin.Forms.4.2.0.848062\build\Xamarin.Forms.props" Condition="Exists('..\packages\Xamarin.Forms.4.2.0.848062\build\Xamarin.Forms.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
Expand Down Expand Up @@ -109,22 +109,22 @@
<HintPath>..\packages\Xamarin.Plugins.Clipboard.2.2.1\lib\Xamarin.iOS10\Plugin.Clipboard.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json">
<HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
<HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\netstandard2.0\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Core">
<HintPath>..\packages\Xamarin.Forms.3.6.0.264807\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.2.0.848062\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform">
<HintPath>..\packages\Xamarin.Forms.3.6.0.264807\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.2.0.848062\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Platform.iOS">
<HintPath>..\packages\Xamarin.Forms.3.6.0.264807\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.2.0.848062\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Forms.Xaml">
<HintPath>..\packages\Xamarin.Forms.3.6.0.264807\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
<HintPath>..\packages\Xamarin.Forms.4.2.0.848062\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
</Reference>
<Reference Include="Xamarin.Essentials">
<HintPath>..\packages\Xamarin.Essentials.1.1.0\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
<HintPath>..\packages\Xamarin.Essentials.1.3.1\lib\xamarinios10\Xamarin.Essentials.dll</HintPath>
</Reference>
<Reference Include="OpenTK-1.0" />
<Reference Include="Plugin.Permissions">
Expand Down Expand Up @@ -246,5 +246,5 @@
</ItemGroup>
<Import Project="..\NRGScoutingApp\NRGScoutingApp.projitems" Label="Shared" Condition="Exists('..\NRGScoutingApp\NRGScoutingApp.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<Import Project="..\packages\Xamarin.Forms.3.6.0.264807\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.3.6.0.264807\build\Xamarin.Forms.targets')" />
<Import Project="..\packages\Xamarin.Forms.4.2.0.848062\build\Xamarin.Forms.targets" Condition="Exists('..\packages\Xamarin.Forms.4.2.0.848062\build\Xamarin.Forms.targets')" />
</Project>
6 changes: 3 additions & 3 deletions iOS/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Newtonsoft.Json" version="12.0.1" targetFramework="xamarinios10" />
<package id="Newtonsoft.Json" version="12.0.2" targetFramework="xamarinios10" />
<package id="Plugin.Permissions" version="3.0.0.12" targetFramework="xamarinios10" />
<package id="Rg.Plugins.Popup" version="1.1.4.168" targetFramework="xamarinios10" />
<package id="System.Numerics.Vectors" version="4.5.0" targetFramework="xamarinios10" />
<package id="Xam.Plugin.Connectivity" version="3.2.0" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.1.0" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="3.6.0.264807" targetFramework="xamarinios10" />
<package id="Xamarin.Essentials" version="1.3.1" targetFramework="xamarinios10" />
<package id="Xamarin.Forms" version="4.2.0.848062" targetFramework="xamarinios10" />
<package id="Xamarin.Plugins.Clipboard" version="2.2.1" targetFramework="xamarinios10" />
</packages>