Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CollectionView Challenge - Strava clone #32

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

CollectionView Challenge - Strava clone #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
47cbcc5
Setup main page
Depechie Apr 25, 2019
b9254c7
Project adjustments
Depechie Apr 25, 2019
87521e4
Design stats
Depechie Apr 26, 2019
e019cca
Added Open Sans font
Depechie Apr 26, 2019
affe95b
Circle image
Depechie Apr 26, 2019
f14551d
Circle image adjustment
Depechie Apr 26, 2019
4881ae4
Bug fix for CollectionView loading
Depechie Apr 26, 2019
8d7f20f
Added pins
Depechie Apr 26, 2019
c772f8b
Only 2 tabs
Depechie Apr 26, 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
Binary file added CollectionViewChallenge/CollectionViewChallenge.Android/Assets/OpenSans-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added ...ctionViewChallenge/CollectionViewChallenge.Android/Assets/materialdesignicons-webfont.ttf
View file
Open in desktop
Binary file not shown.
16 changes: 14 additions & 2 deletions ...ctionViewChallenge/CollectionViewChallenge.Android/CollectionViewChallenge.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
<MonoAndroidResourcePrefix>Resources</MonoAndroidResourcePrefix>
<MonoAndroidAssetsPrefix>Assets</MonoAndroidAssetsPrefix>
<AndroidUseLatestPlatformSdk>false</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v8.1</TargetFrameworkVersion>
<AndroidEnableSGenConcurrent>true</AndroidEnableSGenConcurrent>
<AndroidHttpClientHandlerType>Xamarin.Android.Net.AndroidClientHandler</AndroidHttpClientHandlerType>
Expand Down Expand Up @@ -62,6 +61,15 @@
<PackageReference Include="Xamarin.Android.Support.Core.Utils" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Android.Support.CustomTabs" Version="28.0.0.1" />
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Sharpnado.Presentation.Forms">
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.Maps">
<Version>3.6.0.344457</Version>
</PackageReference>
<PackageReference Include="Xam.Plugins.Forms.ImageCircle">
<Version>3.0.0.5</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down Expand Up @@ -102,9 +110,13 @@
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\CollectionViewChallenge\CollectionViewChallenge.csproj">
<Project>{BA39825E-3CF8-4A31-B120-782B2A651542}</Project>
<Project>{9A9DDEE5-8C48-4274-82D7-22EB79C97206}</Project>
<Name>CollectionViewChallenge</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\materialdesignicons-webfont.ttf" />
<AndroidAsset Include="Assets\OpenSans-Light.ttf" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
6 changes: 6 additions & 0 deletions CollectionViewChallenge/CollectionViewChallenge.Android/MainActivity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
using Android.Views;
using Android.Widget;
using Android.OS;
using Sharpnado.Presentation.Forms.Droid;
using ImageCircle.Forms.Plugin.Droid;

namespace CollectionViewChallenge.Droid
{
Expand All @@ -22,6 +24,10 @@ protected override void OnCreate(Bundle savedInstanceState)
global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental", "Visual_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental");
Xamarin.Essentials.Platform.Init(this, savedInstanceState);
global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
global::Xamarin.FormsMaps.Init(this, savedInstanceState);
SharpnadoInitializer.Initialize();
ImageCircleRenderer.Init();

LoadApplication(new App());
}
public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
Expand Down
8 changes: 4 additions & 4 deletions CollectionViewChallenge/CollectionViewChallenge.Android/Properties/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:versionCode="1" android:versionName="1.0" package="com.companyname.CollectionViewChallenge">
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
<application android:label="CollectionViewChallenge.Android"></application>
</manifest>
<uses-sdk android:minSdkVersion="21" android:targetSdkVersion="27" />
<application android:label="CollectionViewChallenge.Android"></application>
</manifest>
5 changes: 5 additions & 0 deletions CollectionViewChallenge/CollectionViewChallenge.iOS/AppDelegate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using System.Linq;

using Foundation;
using ImageCircle.Forms.Plugin.iOS;
using Sharpnado.Presentation.Forms.iOS;
using UIKit;

namespace CollectionViewChallenge.iOS
Expand All @@ -24,7 +26,10 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
{
global::Xamarin.Forms.Forms.SetFlags("Shell_Experimental", "Visual_Experimental", "CollectionView_Experimental", "FastRenderers_Experimental");
global::Xamarin.Forms.Forms.Init();
global::Xamarin.FormsMaps.Init();
LoadApplication(new App());
SharpnadoInitializer.Initialize();
ImageCircleRenderer.Init();

return base.FinishedLaunching(app, options);
}
Expand Down
13 changes: 12 additions & 1 deletion CollectionViewChallenge/CollectionViewChallenge.iOS/CollectionViewChallenge.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,8 @@
<BundleResource Include="Resources\xamarin_logo%402x.png" />
<BundleResource Include="Resources\xamarin_logo%403x.png" />
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
<BundleResource Include="Resources\materialdesignicons-webfont.ttf" />
<BundleResource Include="Resources\OpenSans-Light.ttf" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -135,11 +137,20 @@
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.346134-pre9" />
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Sharpnado.Presentation.Forms">
<Version>1.1.0</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms.Maps">
<Version>3.6.0.344457</Version>
</PackageReference>
<PackageReference Include="Xam.Plugins.Forms.ImageCircle">
<Version>3.0.0.5</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
<ProjectReference Include="..\CollectionViewChallenge\CollectionViewChallenge.csproj">
<Project>{BA39825E-3CF8-4A31-B120-782B2A651542}</Project>
<Project>{9A9DDEE5-8C48-4274-82D7-22EB79C97206}</Project>
<Name>CollectionViewChallenge</Name>
</ProjectReference>
</ItemGroup>
Expand Down
69 changes: 37 additions & 32 deletions CollectionViewChallenge/CollectionViewChallenge.iOS/Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,37 +2,42 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleDisplayName</key>
<string>CollectionViewChallenge</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.CollectionViewChallenge</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleName</key>
<string>CollectionViewChallenge</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>UIDeviceFamily</key>
<array>
<integer>1</integer>
<integer>2</integer>
</array>
<key>UISupportedInterfaceOrientations</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>UISupportedInterfaceOrientations~ipad</key>
<array>
<string>UIInterfaceOrientationPortrait</string>
<string>UIInterfaceOrientationPortraitUpsideDown</string>
<string>UIInterfaceOrientationLandscapeLeft</string>
<string>UIInterfaceOrientationLandscapeRight</string>
</array>
<key>MinimumOSVersion</key>
<string>8.0</string>
<key>CFBundleDisplayName</key>
<string>CollectionViewChallenge</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.CollectionViewChallenge</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleName</key>
<string>CollectionViewChallenge</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>UIAppFonts</key>
<array>
<string>materialdesignicons-webfont.ttf</string>
<string>OpenSans-Light.ttf</string>
</array>
</dict>
</plist>
Binary file added CollectionViewChallenge/CollectionViewChallenge.iOS/Resources/OpenSans-Light.ttf
View file
Open in desktop
Binary file not shown.
Binary file added ...ectionViewChallenge/CollectionViewChallenge.iOS/Resources/materialdesignicons-webfont.ttf
View file
Open in desktop
Binary file not shown.
17 changes: 15 additions & 2 deletions CollectionViewChallenge/CollectionViewChallenge/App.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,21 @@
<?xml version="1.0" encoding="utf-8" ?>
<?xml version="1.0" encoding="utf-8" ?>
<Application xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
x:Class="CollectionViewChallenge.App">
<Application.Resources>

<ResourceDictionary>
<OnPlatform x:Key="MaterialFontFamily" x:TypeArguments="x:String">
<On Platform="iOS" Value="Material Design Icons" />
<On Platform="Android" Value="materialdesignicons-webfont.ttf#Material Design Icons" />
</OnPlatform>

<OnPlatform x:Key="OpenSansLight" x:TypeArguments="x:String">
<On Platform="iOS" Value="Open Sans" />
<On Platform="Android" Value="OpenSans-Light.ttf#Open Sans" />
</OnPlatform>

<Color x:Key="White">#F8F8F8</Color>
<Color x:Key="Accent">#008DA8</Color>
</ResourceDictionary>
</Application.Resources>
</Application>
6 changes: 3 additions & 3 deletions CollectionViewChallenge/CollectionViewChallenge/AppShell.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
-->
<Shell.Resources>
<ResourceDictionary>
<Color x:Key="NavigationPrimary">#2196F3</Color>
<Color x:Key="NavigationPrimary">#008DA8</Color>
<Style x:Key="BaseStyle" TargetType="Element">
<Setter Property="Shell.ShellBackgroundColor" Value="{StaticResource NavigationPrimary}" />
<Setter Property="Shell.ShellForegroundColor" Value="White" />
Expand All @@ -72,8 +72,8 @@
<ShellItem>
<ShellSection Title="CollectionView" Icon="tab_feed.png">
<ShellContent Title="CollectionView">
<local:CollectionViewChallengePage Title="CollectionView"/>
<local:CollectionViewChallengePage Title="Training on sunny roads"/>
</ShellContent>
</ShellSection>
</ShellItem>
</Shell>
</Shell>
3 changes: 3 additions & 0 deletions CollectionViewChallenge/CollectionViewChallenge/CollectionViewChallenge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.346134-pre9" />
<PackageReference Include="Xamarin.Essentials" Version="1.1.0" />
<PackageReference Include="Sharpnado.Presentation.Forms" Version="1.1.0" />
<PackageReference Include="Xamarin.Forms.Maps" Version="3.6.0.344457" />
<PackageReference Include="Xam.Plugins.Forms.ImageCircle" Version="3.0.0.5" />
</ItemGroup>

<ItemGroup>
Expand Down
Loading