jsuarezruiz
/
MyTasks
зеркало из https://github.com/jsuarezruiz/MyTasks.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Some fixes in the iOS project

This commit is contained in:
Javier Suárez Ruiz 2019-02-25 11:58:25 +01:00
Родитель f7220f3486
Коммит db991f411d
5 изменённых файлов: 53 добавлений и 38 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

68
src/MyTasks.iOS/Info.plist
Просмотреть файл

@ -2,37 +2,45 @@
<!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>
<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>MyTasks</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.MyTasks</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleName</key>
<string>MyTasks</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
<key>UIAppFonts</key>
<array>
<integer>1</integer>
<integer>2</integer>
<string>Poppins-Bold.ttf</string>
<string>Poppins-Light.ttf</string>
<string>Poppins-Medium.ttf</string>
<string>Poppins-Regular.ttf</string>
<string>Poppins-SemiBold.ttf</string>
</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>MyTasks</string>
<key>CFBundleIdentifier</key>
<string>com.companyname.MyTasks</string>
<key>CFBundleVersion</key>
<string>1.0</string>
<key>UILaunchStoryboardName</key>
<string>LaunchScreen</string>
<key>CFBundleName</key>
<string>MyTasks</string>
<key>XSAppIconAssets</key>
<string>Assets.xcassets/AppIcon.appiconset</string>
</dict>
</plist>

4
src/MyTasks/Services/TaskService.cs
Просмотреть файл

@ -23,12 +23,12 @@ namespace MyTasks.Services
// NOTE: In this sample the focus is on the UI. This is a Fake service.
return new List<Models.Task>
{
new Models.Task { Name = "Customer meeting", Category = "Hangouts", Status = "Warning", Time = "6pm", Color = Color.FromHex("#EEB611"), People = new List<Models.Person> { new Models.Person { Photo = "face2" }, new Models.Person { Photo = "face5" } }, Completed = false },
new Models.Task { Name = "Customer meeting", Category = "Hangouts", Status = "Warning", Time = "6pm", Color = Color.FromHex("#EEB611"), People = new List<Models.Person> { new Models.Person { Photo = "face2.jpg" }, new Models.Person { Photo = "face5.jpg" } }, Completed = false },
new Models.Task { Name = "Catch up with Brian", Category = "Mobile Project", Status = "Warning", Time = "5pm", Color = Color.FromHex("#EEB611"), Completed = false },
new Models.Task { Name = "Approve final design review", Category = "Mobile Project", Status = "Problem", Time = "4pm", Color = Color.FromHex("#5677CB"), Completed = false }, new Models.Task { Name = "Make new icons", Category = "Web App", Status = "Ready", Time = "3pm", Color = Color.FromHex("#51C6BF"), Completed = false },
new Models.Task { Name = "Design explorations", Category = "Company Website", Status = "Delayed", Time = "2pm", Color = Color.FromHex("#EE376C"), Completed = false },
new Models.Task { Name = "Lunch with Mary", Category = "Grill House", Status = "Ready", Time = "12pm", Color = Color.FromHex("#51C6BF"), Completed = false },
new Models.Task { Name = "Team meeting", Category = "Hangouts", Status = "Ready", Time = "10am", Color = Color.FromHex("#51C6BF"), People = new List<Models.Person> { new Models.Person { Photo = "face2" }, new Models.Person { Photo = "face3" }, new Models.Person { Photo = "face4" }, new Models.Person { Photo = "face5" } }, Completed = false }
new Models.Task { Name = "Team meeting", Category = "Hangouts", Status = "Ready", Time = "10am", Color = Color.FromHex("#51C6BF"), People = new List<Models.Person> { new Models.Person { Photo = "face2.jpg" }, new Models.Person { Photo = "face3.jpg" }, new Models.Person { Photo = "face4.jpg" }, new Models.Person { Photo = "face5.jpg" } }, Completed = false }
};
}
}

6
src/MyTasks/Styles/Fonts.xaml
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ResourceDictionary
xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
@ -20,8 +20,8 @@
<!-- FONTS -->
<OnPlatform x:Key="PoppinsBold"
x:TypeArguments="x:String"
iOS="Poppins_Bold"
Android="Poppins_Bold.ttf#Poppins"/>
iOS="Poppins-Bold"
Android="Poppins-Bold.ttf#Poppins"/>
<OnPlatform x:Key="PoppinsLight"
x:TypeArguments="x:String"

2
src/MyTasks/Views/MyTasksView.xaml
Просмотреть файл

@ -109,7 +109,7 @@
Grid.Column="0"
Grid.Row="0"
Grid.RowSpan="2"
Source="face1"
Source="face1.jpg"
Aspect="AspectFit"
Style="{StaticResource ProfileStyle}"/>
<Label

11
src/MyTasks/Views/Templates/TaskItemTemplate.xaml
Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<ContentView xmlns="http://xamarin.com/schemas/2014/forms"
xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
xmlns:imageCircle="clr-namespace:ImageCircle.Forms.Plugin.Abstractions;assembly=ImageCircle.Forms.Plugin"
@ -13,7 +13,14 @@
</Style>
<Style x:Key="PointStyle" TargetType="BoxView">
<Setter Property="CornerRadius" Value="24" />
<Setter Property="CornerRadius">
<Setter.Value>
<OnPlatform x:TypeArguments="CornerRadius">
<On Platform="Android" Value="24" />
<On Platform="iOS" Value="10" />
</OnPlatform>
</Setter.Value>
</Setter>
<Setter Property="HorizontalOptions" Value="Center" />
<Setter Property="VerticalOptions" Value="Start" />
<Setter Property="HeightRequest" Value="16" />