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.

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

add qff mockup #50

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
515 changes: 280 additions & 235 deletions VisualChallenge/VisualChallenge.Android/Resources/Resource.designer.cs

Large diffs are not rendered by default.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
111 changes: 107 additions & 4 deletions VisualChallenge/VisualChallenge.Android/VisualChallenge.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.293082-pre8" />
<PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>4.0.0.293082-pre8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />
</ItemGroup>
<ItemGroup>
<Compile Include="MainActivity.cs" />
Expand Down Expand Up @@ -85,6 +83,96 @@
<AndroidResource Include="Resources\drawable-xhdpi\xamagon_preview.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\xamagon_preview.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\xamagon_preview.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_baggage.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_check_in.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_chevron_right_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_home.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_launcher_round.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_more_info_16dp.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_offer.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_person_black_24dp.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_plane.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_qstreaming_homepage.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_seat.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-xhdpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-hdpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-mdpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-ldpi\ic_trip.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-xhdpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-hdpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-mdpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-ldpi\shapes_set4.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-xhdpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-hdpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-mdpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-ldpi\shapes_silver.png" />
<AndroidResource Include="Resources\drawable-xxxhdpi\shapes_default.png" />
<AndroidResource Include="Resources\drawable-xxhdpi\shapes_default.png" />
<AndroidResource Include="Resources\drawable-xhdpi\shapes_default.png" />
<AndroidResource Include="Resources\drawable-hdpi\shapes_default.png" />
<AndroidResource Include="Resources\drawable-mdpi\shapes_default.png" />
<AndroidResource Include="Resources\drawable-ldpi\shapes_default.png" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
Expand All @@ -93,5 +181,20 @@
<Name>VisualChallenge</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable-xxxhdpi\" />
<Folder Include="Resources\drawable-xxhdpi\" />
<Folder Include="Resources\drawable-xhdpi\" />
<Folder Include="Resources\drawable-hdpi\" />
<Folder Include="Resources\drawable-mdpi\" />
<Folder Include="Resources\drawable-ldpi\" />
<Folder Include="Assets\" />
</ItemGroup>
<ItemGroup>
<AndroidAsset Include="Assets\brauer_neue_std.ttf" />
<AndroidAsset Include="Assets\ciutadella_regular.ttf" />
<AndroidAsset Include="Assets\ciutadella_medium.ttf" />
<AndroidAsset Include="Assets\ciutadella_semibold.ttf" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
</Project>
3 changes: 2 additions & 1 deletion VisualChallenge/VisualChallenge.iOS/AppDelegate.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System;
using System.Collections.Generic;
using System.Linq;

using System.Threading.Tasks;
using Foundation;
using UIKit;

Expand Down Expand Up @@ -30,4 +30,5 @@ public override bool FinishedLaunching(UIApplication app, NSDictionary options)
return base.FinishedLaunching(app, options);
}
}

}
8 changes: 8 additions & 0 deletions VisualChallenge/VisualChallenge.iOS/Info.plist
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,13 @@
<string>VisualChallenge</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>

<key>UIAppFonts</key>
<array>
<string>brauer_neue_std.ttf</string>
<string>ciutadella_regular.ttf</string>
<string>ciutadella_medium.ttf</string>
<string>ciutadella_semibold.ttf</string>
</array>
</dict>
</plist>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
57 changes: 53 additions & 4 deletions VisualChallenge/VisualChallenge.iOS/VisualChallenge.iOS.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
<MtouchArch>x86_64</MtouchArch>
<MtouchLink>None</MtouchLink>
<MtouchDebug>true</MtouchDebug>
<MtouchExtraArgs>--enable-repl</MtouchExtraArgs>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|iPhoneSimulator' ">
<DebugType>none</DebugType>
Expand Down Expand Up @@ -124,6 +125,53 @@
<BundleResource Include="Resources\xamarin_logo%402x.png" />
<BundleResource Include="Resources\xamarin_logo%403x.png" />
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
<BundleResource Include="Resources\ic_baggage%403x.png" />
<BundleResource Include="Resources\ic_baggage%402x.png" />
<BundleResource Include="Resources\ic_baggage.png" />
<BundleResource Include="Resources\ic_check_in%403x.png" />
<BundleResource Include="Resources\ic_check_in%402x.png" />
<BundleResource Include="Resources\ic_check_in.png" />
<BundleResource Include="Resources\ic_chevron_right_black_24dp%403x.png" />
<BundleResource Include="Resources\ic_chevron_right_black_24dp%402x.png" />
<BundleResource Include="Resources\ic_chevron_right_black_24dp.png" />
<BundleResource Include="Resources\ic_home%403x.png" />
<BundleResource Include="Resources\ic_home%402x.png" />
<BundleResource Include="Resources\ic_home.png" />
<BundleResource Include="Resources\ic_launcher_round%403x.png" />
<BundleResource Include="Resources\ic_launcher_round%402x.png" />
<BundleResource Include="Resources\ic_launcher_round.png" />
<BundleResource Include="Resources\ic_more_info_16dp%403x.png" />
<BundleResource Include="Resources\ic_more_info_16dp%402x.png" />
<BundleResource Include="Resources\ic_more_info_16dp.png" />
<BundleResource Include="Resources\ic_offer%403x.png" />
<BundleResource Include="Resources\ic_offer%402x.png" />
<BundleResource Include="Resources\ic_offer.png" />
<BundleResource Include="Resources\ic_person_black_24dp%403x.png" />
<BundleResource Include="Resources\ic_person_black_24dp%402x.png" />
<BundleResource Include="Resources\ic_person_black_24dp.png" />
<BundleResource Include="Resources\ic_plane%403x.png" />
<BundleResource Include="Resources\ic_plane%402x.png" />
<BundleResource Include="Resources\ic_plane.png" />
<BundleResource Include="Resources\ic_qstreaming_homepage%403x.png" />
<BundleResource Include="Resources\ic_qstreaming_homepage%402x.png" />
<BundleResource Include="Resources\ic_qstreaming_homepage.png" />
<BundleResource Include="Resources\ic_seat%403x.png" />
<BundleResource Include="Resources\ic_seat%402x.png" />
<BundleResource Include="Resources\ic_seat.png" />
<BundleResource Include="Resources\ic_trip%403x.png" />
<BundleResource Include="Resources\ic_trip%402x.png" />
<BundleResource Include="Resources\ic_trip.png" />
<BundleResource Include="Resources\shapes_set4%403x.png" />
<BundleResource Include="Resources\shapes_set4%402x.png" />
<BundleResource Include="Resources\shapes_set4.png" />
<BundleResource Include="Resources\shapes_silver%403x.png" />
<BundleResource Include="Resources\shapes_silver%402x.png" />
<BundleResource Include="Resources\shapes_silver.png" />
<BundleResource Include="Resources\brauer_neue_std.ttf" />
<BundleResource Include="Resources\ciutadella_regular.ttf" />
<BundleResource Include="Resources\ciutadella_medium.ttf" />
<BundleResource Include="Resources\ciutadella_semibold.ttf" />
<BundleResource Include="Resources\shapes_default.png" />
</ItemGroup>
<ItemGroup>
<Reference Include="System" />
Expand All @@ -132,10 +180,8 @@
<Reference Include="Xamarin.iOS" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.293082-pre8" />
<PackageReference Include="Xamarin.Forms.Visual.Material">
<Version>4.0.0.293082-pre8</Version>
</PackageReference>
<PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />
</ItemGroup>
<Import Project="$(MSBuildExtensionsPath)\Xamarin\iOS\Xamarin.iOS.CSharp.targets" />
<ItemGroup>
Expand All @@ -144,4 +190,7 @@
<Name>VisualChallenge</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\" />
</ItemGroup>
</Project>
48 changes: 34 additions & 14 deletions VisualChallenge/VisualChallenge/AppShell.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
RouteScheme="app"
Route="VisualChallenge"
FlyoutBehavior="Disabled"
Shell.NavBarIsVisible="False"
Title="VisualChallenge"
x:Class="VisualChallenge.AppShell"
Visual="Material"
Expand All @@ -16,26 +17,45 @@
-->
<Shell.Resources>
<ResourceDictionary>
<Color x:Key="NavigationPrimary">#2196F3</Color>
<Color x:Key="NavigationPrimary">#FEFEFE</Color>
<Style x:Key="BaseStyle" TargetType="Element">
<Setter Property="Shell.ShellBackgroundColor" Value="{StaticResource NavigationPrimary}" />
<Setter Property="Shell.ShellForegroundColor" Value="White" />
<Setter Property="Shell.ShellTitleColor" Value="White" />
<Setter Property="Shell.ShellDisabledColor" Value="#B4FFFFFF" />
<Setter Property="Shell.ShellUnselectedColor" Value="#95FFFFFF" />
<Setter Property="Shell.ShellForegroundColor" Value="Green" />
<Setter Property="Shell.ShellTitleColor" Value="Black" />
<Setter Property="Shell.ShellDisabledColor" Value="Blue" />
<Setter Property="Shell.ShellUnselectedColor" Value="Orange" />
<Setter Property="Shell.ShellTabBarBackgroundColor" Value="{StaticResource NavigationPrimary}" />
<Setter Property="Shell.ShellTabBarForegroundColor" Value="White"/>
<Setter Property="Shell.ShellTabBarUnselectedColor" Value="#95FFFFFF"/>
<Setter Property="Shell.ShellTabBarTitleColor" Value="White"/>
<Setter Property="Shell.ShellTabBarForegroundColor" Value="Purple"/>
<Setter Property="Shell.ShellTabBarUnselectedColor" Value="Gray"/>
<Setter Property="Shell.ShellTabBarTitleColor" Value="#E80000"/>
</Style>
<Style TargetType="ShellItem" BasedOn="{StaticResource BaseStyle}" />
</ResourceDictionary>
</Shell.Resources>

<ShellItem Title="Bottom Tab Sample"
Style="{StaticResource BaseStyle}">

<ShellSection Title="HOME" Icon="ic_home.png">
<ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
</ShellSection>

<ShellSection Title="TRIPS" Icon="ic_trip.png">
<ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
</ShellSection>

<ShellSection Title="BOOK" Icon="ic_plane.png">
<ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
</ShellSection>

<ShellSection Title="DEALS" Icon="ic_offer.png">
<ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
</ShellSection>

<ShellSection Title="MY QFF" Icon="ic_person_black_24dp.png">
<ShellContent ContentTemplate="{DataTemplate ContentPage}"/>
</ShellSection>

<FlyoutItem>
<Tab>
<ShellContent ContentTemplate="{DataTemplate local:VisualChallengePage}"/>
</Tab>
</FlyoutItem>

</ShellItem>

</Shell>
7 changes: 2 additions & 5 deletions VisualChallenge/VisualChallenge/VisualChallenge.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Xamarin.Forms" Version="4.0.1.206893" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.1.206893" />
<PackageReference Include="Xamarin.Forms" Version="4.0.0.394984-pre10" />
<PackageReference Include="Xamarin.Forms.Visual.Material" Version="4.0.0.394984-pre10" />
</ItemGroup>

<ItemGroup>
<Compile Update="VisualChallengePage.xaml.cs">
<DependentUpon>VisualChallengePage.xaml</DependentUpon>
</Compile>
</ItemGroup>
</Project>
Loading