Skip to content
This repository was archived by the owner on Apr 7, 2020. It is now read-only.

Commit bf791f4

Browse files
thimmy687thimmy687
authored
Merge pull request #402 from Integreat/Fix-#399
Fix #399
2 parents b4376fa + 8c0748b commit bf791f4

12 files changed

Lines changed: 169 additions & 206 deletions

File tree

‎Integreat/Integreat.Droid/Integreat.Droid.csproj‎

Lines changed: 95 additions & 95 deletions
Large diffs are not rendered by default.

‎Integreat/Integreat.Droid/Properties/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="tuerantuer.app.integreat" android:installLocation="auto" android:versionCode="55604" android:versionName="2.2.4">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="tuerantuer.app.integreat" android:installLocation="auto" android:versionCode="55605" android:versionName="2.2.5">
33
<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="26" />
44
<application android:label="Integreat" android:theme="@style/MyTheme" android:icon="@mipmap/icon" android:largeHeap="true" />
55
</manifest>

‎Integreat/Integreat.Droid/packages.config‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Autofac" version="4.6.2" targetFramework="monoandroid71" />
3+
<package id="Autofac" version="4.8.0" targetFramework="monoandroid80" />
44
<package id="DLToolkit.Forms.Controls.FlowListView" version="2.0.10" targetFramework="monoandroid80" />
55
<package id="Microsoft.AspNetCore.WebUtilities" version="2.0.1" targetFramework="monoandroid80" />
66
<package id="Microsoft.CSharp" version="4.4.1" targetFramework="monoandroid80" />
@@ -65,8 +65,8 @@
6565
<package id="System.Xml.ReaderWriter" version="4.3.1" targetFramework="monoandroid80" />
6666
<package id="System.Xml.XDocument" version="4.3.0" targetFramework="monoandroid71" />
6767
<package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="monoandroid71" />
68-
<package id="Xam.Plugin.Connectivity" version="3.0.3" targetFramework="monoandroid80" />
69-
<package id="Xam.Plugins.Settings" version="3.1.1" targetFramework="monoandroid71" />
68+
<package id="Xam.Plugin.Connectivity" version="3.1.1" targetFramework="monoandroid80" />
69+
<package id="Xam.Plugins.Settings" version="4.0.0.7" targetFramework="monoandroid80" />
7070
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid80" />
7171
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="26.1.0" targetFramework="monoandroid80" />
7272
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="26.1.0" targetFramework="monoandroid80" />
@@ -87,21 +87,21 @@
8787
<package id="Xamarin.Android.Support.v7.Palette" version="26.1.0.1" targetFramework="monoandroid80" />
8888
<package id="Xamarin.Android.Support.v7.RecyclerView" version="26.1.0.1" targetFramework="monoandroid80" />
8989
<package id="Xamarin.Android.Support.Vector.Drawable" version="26.1.0.1" targetFramework="monoandroid80" />
90-
<package id="Xamarin.Build.Download" version="0.4.7" targetFramework="monoandroid80" />
91-
<package id="Xamarin.Firebase.Analytics" version="60.1142.0" targetFramework="monoandroid80" />
92-
<package id="Xamarin.Firebase.Analytics.Impl" version="60.1142.0" targetFramework="monoandroid80" />
93-
<package id="Xamarin.Firebase.AppIndexing" version="60.1142.0" targetFramework="monoandroid80" />
94-
<package id="Xamarin.Firebase.Common" version="60.1142.0" targetFramework="monoandroid80" />
95-
<package id="Xamarin.Firebase.Iid" version="60.1142.0" targetFramework="monoandroid80" />
96-
<package id="Xamarin.Forms" version="2.5.1.444934" targetFramework="monoandroid80" />
97-
<package id="Xamarin.GooglePlayServices.Ads" version="60.1142.0" targetFramework="monoandroid80" />
98-
<package id="Xamarin.GooglePlayServices.Ads.Lite" version="60.1142.0" targetFramework="monoandroid80" />
99-
<package id="Xamarin.GooglePlayServices.Analytics" version="60.1142.0" targetFramework="monoandroid80" />
100-
<package id="Xamarin.GooglePlayServices.Analytics.Impl" version="60.1142.0" targetFramework="monoandroid80" />
101-
<package id="Xamarin.GooglePlayServices.AppIndexing" version="60.1142.0" targetFramework="monoandroid80" />
102-
<package id="Xamarin.GooglePlayServices.Base" version="60.1142.0" targetFramework="monoandroid80" />
103-
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.0" targetFramework="monoandroid80" />
104-
<package id="Xamarin.GooglePlayServices.Gass" version="60.1142.0" targetFramework="monoandroid80" />
105-
<package id="Xamarin.GooglePlayServices.TagManager.V4.Impl" version="60.1142.0" targetFramework="monoandroid80" />
106-
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.0" targetFramework="monoandroid80" />
90+
<package id="Xamarin.Build.Download" version="0.4.11" targetFramework="monoandroid80" />
91+
<package id="Xamarin.Firebase.Analytics" version="60.1142.1" targetFramework="monoandroid80" />
92+
<package id="Xamarin.Firebase.Analytics.Impl" version="60.1142.1" targetFramework="monoandroid80" />
93+
<package id="Xamarin.Firebase.AppIndexing" version="60.1142.1" targetFramework="monoandroid80" />
94+
<package id="Xamarin.Firebase.Common" version="60.1142.1" targetFramework="monoandroid80" />
95+
<package id="Xamarin.Firebase.Iid" version="60.1142.1" targetFramework="monoandroid80" />
96+
<package id="Xamarin.Forms" version="3.0.0.446417" targetFramework="monoandroid80" />
97+
<package id="Xamarin.GooglePlayServices.Ads" version="60.1142.1" targetFramework="monoandroid80" />
98+
<package id="Xamarin.GooglePlayServices.Ads.Lite" version="60.1142.1" targetFramework="monoandroid80" />
99+
<package id="Xamarin.GooglePlayServices.Analytics" version="60.1142.1" targetFramework="monoandroid80" />
100+
<package id="Xamarin.GooglePlayServices.Analytics.Impl" version="60.1142.1" targetFramework="monoandroid80" />
101+
<package id="Xamarin.GooglePlayServices.AppIndexing" version="60.1142.1" targetFramework="monoandroid80" />
102+
<package id="Xamarin.GooglePlayServices.Base" version="60.1142.1" targetFramework="monoandroid80" />
103+
<package id="Xamarin.GooglePlayServices.Basement" version="60.1142.1" targetFramework="monoandroid80" />
104+
<package id="Xamarin.GooglePlayServices.Gass" version="60.1142.1" targetFramework="monoandroid80" />
105+
<package id="Xamarin.GooglePlayServices.TagManager.V4.Impl" version="60.1142.1" targetFramework="monoandroid80" />
106+
<package id="Xamarin.GooglePlayServices.Tasks" version="60.1142.1" targetFramework="monoandroid80" />
107107
</packages>

‎Integreat/Integreat.Shared/ApplicationObjects/IntegreatModule.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ private static void RegisterViewModels(ContainerBuilder builder)
9393

9494
builder.RegisterType<SearchViewModel>();
9595

96-
builder.RegisterType<ContentContainerViewModel>();
97-
builder.RegisterType<MainContentPageViewModel>();
98-
builder.RegisterType<ExtrasContentPageViewModel>();
99-
builder.RegisterType<EventsContentPageViewModel>();
96+
builder.RegisterType<ContentContainerViewModel>().SingleInstance();
97+
builder.RegisterType<MainContentPageViewModel>().SingleInstance();
98+
builder.RegisterType<ExtrasContentPageViewModel>().SingleInstance();
99+
builder.RegisterType<EventsContentPageViewModel>().SingleInstance();
100100

101101
builder.RegisterType<MainTwoLevelViewModel>();
102102

‎Integreat/Integreat.Shared/ViewModels/ContentContainerViewModel.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,15 @@ public async void OpenSettings()
111111
await _navigator.PushAsync(_settingsFactory(this));
112112
}
113113

114+
/// <summary>
115+
/// Changes the location.
116+
/// </summary>
117+
/// <param name="location">Location.</param>
118+
public void ChangeLocation(Location location)
119+
{
120+
_selectedLocation = location;
121+
}
122+
114123
/// <summary> Creates the main pages of the App. Main, Extras, Events and Settings </summary>
115124
/// <param name="children">The children.</param>
116125
public void CreateMainView(IList<Page> children)

‎Integreat/Integreat.Shared/ViewModels/LanguagesViewModel.cs‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
using System.Collections.ObjectModel;
88
using System.Windows.Input;
99
using Integreat.Localization;
10-
using Xamarin.Forms;
11-
using Integreat.Shared.ViewFactory;
12-
10+
using Xamarin.Forms;
11+
using Integreat.Shared.ViewFactory;
12+
1313
namespace Integreat.Shared.ViewModels
1414
{
1515
/// <summary>
@@ -33,7 +33,7 @@ public LanguagesViewModel(Location location, DataLoaderProvider dataLoaderProvid
3333
Items = new ObservableCollection<Language>();
3434
_location = location;
3535
_dataLoaderProvider = dataLoaderProvider;
36-
_viewFactory = viewFactory;
36+
_viewFactory = viewFactory;
3737
}
3838

3939
// ReSharper disable once MemberCanBePrivate.Global
@@ -82,12 +82,15 @@ public IEnumerable<Language> Items
8282

8383
private void LanguageSelected()
8484
{
85-
Preferences.SetLanguage(_location, SelectedLanguage);
85+
Preferences.SetLanguage(_location, SelectedLanguage);
86+
ContentContainerViewModel.Current.ChangeLocation(_location);
87+
8688
#if __ANDROID__
87-
Application.Current.MainPage = new NavigationPage(_viewFactory.Resolve<ContentContainerViewModel>());
89+
Application.Current.MainPage = new NavigationPage(_viewFactory.Resolve<ContentContainerViewModel>());
8890
#else
8991
Application.Current.MainPage = _viewFactory.Resolve<ContentContainerViewModel>();
9092
#endif
93+
ContentContainerViewModel.Current.RefreshAll(true);
9194
}
9295

9396
public override void OnAppearing()

‎Integreat/Integreat.Shared/ViewModels/Settings/SettingsPageViewModel.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ public string Version
9797
var version = Foundation.NSBundle.MainBundle.InfoDictionary[new Foundation.NSString("CFBundleVersion")]
9898
.ToString();
9999
#else
100-
version = "2.2.4";
100+
version = "2.2.5";
101101
#endif
102102
return version;
103103
}

‎Integreat/Integreat.iOS/Helpers/Settings.cs‎

Lines changed: 0 additions & 44 deletions
This file was deleted.

‎Integreat/Integreat.iOS/Info.plist‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<key>CFBundleIdentifier</key>
2828
<string>de.integreat-app</string>
2929
<key>CFBundleVersion</key>
30-
<string>2.2.4</string>
30+
<string>2.2.5</string>
3131
<key>UILaunchStoryboardName</key>
3232
<string>LaunchScreen</string>
3333
<key>NSAppTransportSecurity</key>
@@ -42,7 +42,7 @@
4242
<key>UIMainStoryboardFile~ipad</key>
4343
<string>LaunchScreen</string>
4444
<key>CFBundleShortVersionString</key>
45-
<string>2.2.4</string>
45+
<string>2.2.5</string>
4646
<key>XSAppIconAssets</key>
4747
<string>Assets.xcassets/AppIcons.appiconset</string>
4848
</dict>

‎Integreat/Integreat.iOS/Integreat.iOS.csproj‎

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="..\..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.props')" />
4-
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" />
3+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.props" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.props')" />
4+
<Import Project="..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.props" Condition="Exists('..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">iPhoneSimulator</Platform>
@@ -146,7 +146,6 @@
146146
</PropertyGroup>
147147
<ItemGroup>
148148
<Compile Include="CustomRenderer\SpaceFittingLabelRenderer.cs" />
149-
<Compile Include="Helpers\Settings.cs" />
150149
<Compile Include="Main.cs" />
151150
<Compile Include="AppDelegate.cs" />
152151
<None Include="app.config" />
@@ -169,9 +168,6 @@
169168
<InterfaceDefinition Include="Resources\LaunchScreen.storyboard" />
170169
</ItemGroup>
171170
<ItemGroup>
172-
<Reference Include="Autofac">
173-
<HintPath>..\..\packages\Autofac.4.6.2\lib\netstandard1.1\Autofac.dll</HintPath>
174-
</Reference>
175171
<Reference Include="DLToolkit.Forms.Controls.FlowListView, Version=1.0.6542.36915, Culture=neutral, processorArchitecture=MSIL">
176172
<HintPath>..\..\packages\DLToolkit.Forms.Controls.FlowListView.2.0.10\lib\portable-net45+wp8+wpa81+win8+MonoAndroid10+MonoTouch10+Xamarin.iOS10+netstandard1.0\DLToolkit.Forms.Controls.FlowListView.dll</HintPath>
177173
</Reference>
@@ -194,18 +190,6 @@
194190
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
195191
<HintPath>..\..\packages\Newtonsoft.Json.10.0.3\lib\netstandard1.3\Newtonsoft.Json.dll</HintPath>
196192
</Reference>
197-
<Reference Include="Plugin.Connectivity, Version=3.0.3.0, Culture=neutral, processorArchitecture=MSIL">
198-
<HintPath>..\..\packages\Xam.Plugin.Connectivity.3.0.3\lib\Xamarin.iOS10\Plugin.Connectivity.dll</HintPath>
199-
</Reference>
200-
<Reference Include="Plugin.Connectivity.Abstractions, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
201-
<HintPath>..\..\packages\Xam.Plugin.Connectivity.3.0.3\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll</HintPath>
202-
</Reference>
203-
<Reference Include="Plugin.Settings, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
204-
<HintPath>..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.dll</HintPath>
205-
</Reference>
206-
<Reference Include="Plugin.Settings.Abstractions, Version=3.1.1.0, Culture=neutral, processorArchitecture=MSIL">
207-
<HintPath>..\..\packages\Xam.Plugins.Settings.3.1.1\lib\Xamarin.iOS10\Plugin.Settings.Abstractions.dll</HintPath>
208-
</Reference>
209193
<Reference Include="Plugin.Share, Version=7.1.1.0, Culture=neutral, processorArchitecture=MSIL">
210194
<HintPath>..\..\packages\Plugin.Share.7.1.1\lib\Xamarin.iOS10\Plugin.Share.dll</HintPath>
211195
</Reference>
@@ -250,17 +234,30 @@
250234
<Reference Include="System.Core" />
251235
<Reference Include="Xamarin.iOS" />
252236
<Reference Include="System.Xml.Linq" />
237+
<Reference Include="Autofac">
238+
<HintPath>..\..\packages\Autofac.4.8.0\lib\netstandard1.1\Autofac.dll</HintPath>
239+
<Private>False</Private>
240+
</Reference>
253241
<Reference Include="Xamarin.Forms.Core">
254-
<HintPath>..\..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
242+
<HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Core.dll</HintPath>
255243
</Reference>
256244
<Reference Include="Xamarin.Forms.Platform">
257-
<HintPath>..\..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
245+
<HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.dll</HintPath>
258246
</Reference>
259247
<Reference Include="Xamarin.Forms.Platform.iOS">
260-
<HintPath>..\..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
248+
<HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Platform.iOS.dll</HintPath>
261249
</Reference>
262250
<Reference Include="Xamarin.Forms.Xaml">
263-
<HintPath>..\..\packages\Xamarin.Forms.2.5.1.444934\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
251+
<HintPath>..\..\packages\Xamarin.Forms.3.0.0.446417\lib\Xamarin.iOS10\Xamarin.Forms.Xaml.dll</HintPath>
252+
</Reference>
253+
<Reference Include="Plugin.Connectivity.Abstractions">
254+
<HintPath>..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\Xamarin.iOS10\Plugin.Connectivity.Abstractions.dll</HintPath>
255+
</Reference>
256+
<Reference Include="Plugin.Connectivity">
257+
<HintPath>..\..\packages\Xam.Plugin.Connectivity.3.1.1\lib\Xamarin.iOS10\Plugin.Connectivity.dll</HintPath>
258+
</Reference>
259+
<Reference Include="Plugin.Settings">
260+
<HintPath>..\..\packages\Xam.Plugins.Settings.4.0.0.7\lib\xamarinios10\Plugin.Settings.dll</HintPath>
264261
</Reference>
265262
</ItemGroup>
266263
<ItemGroup>
@@ -515,13 +512,11 @@
515512
</PropertyGroup>
516513
<Error Condition="!Exists('..\..\packages\refit.3.0.1\build\netstandard1.3\refit.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\refit.3.0.1\build\netstandard1.3\refit.targets'))" />
517514
<Error Condition="!Exists('..\..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets'))" />
518-
<Error Condition="!Exists('..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.props'))" />
519-
<Error Condition="!Exists('..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets'))" />
520515
<Error Condition="!Exists('..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.2\build\Xamarin.Google.iOS.Analytics.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.2\build\Xamarin.Google.iOS.Analytics.targets'))" />
521516
</Target>
522517
<Import Project="..\..\packages\refit.3.0.1\build\netstandard1.3\refit.targets" Condition="Exists('..\..\packages\refit.3.0.1\build\netstandard1.3\refit.targets')" />
523518
<Import Project="..\..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets" Condition="Exists('..\..\packages\NETStandard.Library.2.0.1\build\netstandard2.0\NETStandard.Library.targets')" />
524-
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.7\build\Xamarin.Build.Download.targets')" />
525519
<Import Project="..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.2\build\Xamarin.Google.iOS.Analytics.targets" Condition="Exists('..\..\packages\Xamarin.Google.iOS.Analytics.3.17.0.2\build\Xamarin.Google.iOS.Analytics.targets')" />
526-
<Import Project="..\..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.2.5.1.444934\build\netstandard1.0\Xamarin.Forms.targets')" />
520+
<Import Project="..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.targets" Condition="Exists('..\..\packages\Xamarin.Forms.3.0.0.446417\build\netstandard2.0\Xamarin.Forms.targets')" />
521+
<Import Project="..\..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets" Condition="Exists('..\..\packages\Xamarin.Build.Download.0.4.11\build\Xamarin.Build.Download.targets')" />
527522
</Project>

0 commit comments

Comments
 (0)