roko.li/sharee.bike-App
5
0
Fork 0
mirror of https://dev.azure.com/TeilRad/sharee.bike%20App/_git/Code synced 2025-04-19 11:37:28 +02:00
Code Issues Projects Releases Packages Wiki Activity

Version 3.0.364

Browse source
This commit is contained in:
Anja 2023-05-09 08:47:52 +02:00
parent 91d42552c7
commit 0b9196a78d
91 changed files with 3452 additions and 555 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Meinkonrad/TINK.Android/Properties/AndroidManifest.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.363" android:versionCode="363">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="internalOnly" package="com.TeilRad.Meinkonrad" android:versionName="3.0.364" android:versionCode="364">
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="31" />
<!-- Google Maps related permissions -->
<!-- Permission to receive remote notifications from Google Play Services -->

4
Meinkonrad/TINK.iOS/Info.plist
View file

@ -56,8 +56,8 @@
<key>CFBundleDisplayName</key>
<string>Mein konrad</string>
<key>CFBundleVersion</key>
<string>363</string>
<string>364</string>
<key>CFBundleShortVersionString</key>
<string>3.0.363</string>
<string>3.0.364</string>
</dict>
</plist>

10
Meinkonrad/TINK/App.xaml.cs
View file

@ -55,7 +55,7 @@ namespace TINK
var specialFolders = DependencyService.Get<ISpecialFolder>();
var internalPersonalDir = specialFolders.GetInternalPersonalDir();
// Delete attachtment from previous session.
// Delete attachment from previous session.
DeleteAttachment(internalPersonalDir);
// Setup logger using default settings.
@ -108,11 +108,11 @@ namespace TINK
if (settings.MinimumLogEventLevel != Model.Settings.Settings.DEFAULTLOGGINLEVEL
|| settings.LogToExternalFolder)
{
// Eigher
// Either
// - logging is not set to default value or
// - logging is performed to external folder.
// Need to reconfigure.
Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing vialation occurs.
Log.CloseAndFlush(); // Close before modifying logger configuration. Otherwise a sharing violation occurs.
TinkApp.SetupLogging(
new LoggingLevelSwitch(settings.MinimumLogEventLevel),
@ -132,7 +132,7 @@ namespace TINK
{
// App versions newer than 3.0.173 stored geolocation service in configuration.
// Version 3.0.290: Geolocation service "GeolocationService" is no more supported.
// For this a swich of geolocation service is fored when loading configurations of older app versions.
// For this a switch of geolocation service is forced when loading configurations of older app versions.
LocationServicesContainer.SetActive(settings.ActiveGeolocationService);
}
@ -148,7 +148,7 @@ namespace TINK
const string MERCHANTID = "0000000000";
// Create new app instnace.
// Create new app instance.
Log.Debug("Constructing main model...");
m_oModelRoot = new TinkApp(
settings,

8
Meinkonrad/TINK/View/Contact/ContactPage.xaml
View file

@ -70,11 +70,13 @@
<Label FormattedText="{Binding LikeTinkApp}"/>
<!--- Mail to app- related support -->
<Button
Style="{StaticResource SecondaryButton}"
Text="{x:Static resources:AppResources.ActionContactMailAppReleated}"
IsEnabled="{Binding IsSendMailAvailable}"
Command="{Binding OnMailAppRelatedRequest}"/>
<!--- Link to App Store -->
<Label
<!--- Link to App Store
inactivated since most feedback in App Store is not app-related-->
<!--<Label
Margin="0,10,0,0"
TextType="Html"
HorizontalOptions="Center"
@ -83,7 +85,7 @@
<Label.GestureRecognizers>
<TapGestureRecognizer Command="{Binding OnRateRequest}"/>
</Label.GestureRecognizers>
</Label>
</Label>-->
</StackLayout>
</Frame>
</StackLayout>

6
Meinkonrad/TINK/View/Info/BikeInfo/BikeInfoCarouselPage.xaml.cs
View file

@ -1,4 +1,4 @@
using System;
using System;
using System.Threading.Tasks;
using TINK.Model.Bikes.BikeInfoNS.DriveNS.BatteryNS;
#if USEFLYOUT
@ -23,7 +23,7 @@ namespace TINK.View.Info.BikeInfo
InitializeComponent();
ItemsSource = new BikeInfoViewModel(
resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.RessourcePrefix}Images.{resourceName}"),
resourceName => ImageSource.FromResource($"{ViewModelResourceHelper.ResourcePrefix}Images.{resourceName}"),
this).CarouselItems;
}
@ -126,4 +126,4 @@ namespace TINK.View.Info.BikeInfo
public async Task<IUserFeedback> DisplayUserFeedbackPopup(IBattery battery = null, string co2Saving = null) => throw new NotSupportedException();
#endif
}
}
}

2
Meinkonrad/TINK/View/Settings/SettingsPage.xaml
View file

@ -89,7 +89,7 @@
<StackLayout>
<Label
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}"
Text="{Binding CopriServerUriList.CorpiServerUriDescription}"/>
Text="{Binding CopriServerUriList.CopriServerUriDescription}"/>
<Picker
IsVisible="{Binding DebugLevel, Converter={StaticResource PickCopriServer_Converter}}"
ItemsSource="{Binding CopriServerUriList.ServerTextList}"

14
Meinkonrad/TINK/ViewModel/ViewModelResourceHelper.cs
View file

@ -7,8 +7,8 @@ namespace TINK.ViewModel
{
public static class ViewModelResourceHelper
{
/// <summary> Get ressource prefix depending on platform.</summary>
public static string RessourcePrefix
/// <summary> Get resource prefix depending on platform.</summary>
public static string ResourcePrefix
{
get
{
@ -24,19 +24,19 @@ namespace TINK.ViewModel
}
}
/// <summary> Gets an an embedded html ressource.</summary>
/// <summary> Gets an embedded html resource.</summary>
/// <param name="resrouceName">Name of resource to get.</param>
/// <returns></returns>
public static string GetEmbeddedResource(string resrouceName)
{
var ressourceName = RessourcePrefix + resrouceName;
Log.Verbose($"Using this resource prefix {RessourcePrefix}.");
var resourceName = ResourcePrefix + resrouceName;
Log.Verbose($"Using this resource prefix {ResourcePrefix}.");
// note that the prefix includes the trailing period '.' that is required
var assembly = typeof(ViewModelResourceHelper).GetTypeInfo().Assembly;
var stream = assembly.GetManifestResourceStream(ressourceName);
var stream = assembly.GetManifestResourceStream(resourceName);
return stream != null
? (new StreamReader(stream, Encoding.UTF8)).ReadToEnd()
: string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- ressource {0}.</body>", ressourceName);
: string.Format("<!DOCTYPE html><html lang=\"de\"><body>An error occurred loading html- resource {0}.</body>", resourceName);
}
}
}