diff --git a/LastenradBayern/TINK.Android/Assets/Location_Pin.png b/LastenradBayern/TINK.Android/Assets/Location_Pin.png index 4ead5e8..d5c651a 100644 Binary files a/LastenradBayern/TINK.Android/Assets/Location_Pin.png and b/LastenradBayern/TINK.Android/Assets/Location_Pin.png differ diff --git a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj index efc0459..02b7d8d 100644 --- a/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj +++ b/LastenradBayern/TINK.Android/LastenradBayern.Android.csproj @@ -240,6 +240,10 @@ + + Designer + MSBuild:UpdateGeneratedFiles + @@ -345,11 +349,6 @@ - - - MSBuild:UpdateGeneratedFiles - - diff --git a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml index 5f5760a..6d34b3b 100644 --- a/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml +++ b/LastenradBayern/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/LastenradBayern/TINK.Android/Resources/drawable/Location_Button.png b/LastenradBayern/TINK.Android/Resources/drawable/Location_Button.png index 330cc36..1da5e0e 100644 Binary files a/LastenradBayern/TINK.Android/Resources/drawable/Location_Button.png and b/LastenradBayern/TINK.Android/Resources/drawable/Location_Button.png differ diff --git a/LastenradBayern/TINK.iOS/Info.plist b/LastenradBayern/TINK.iOS/Info.plist index edcf8f8..603386b 100644 --- a/LastenradBayern/TINK.iOS/Info.plist +++ b/LastenradBayern/TINK.iOS/Info.plist @@ -55,8 +55,8 @@ CFBundleDisplayName LastenradBayern CFBundleVersion - 350 + 352 CFBundleShortVersionString - 3.0.350 + 3.0.352 diff --git a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj index 29e6136..c9886b1 100644 --- a/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj +++ b/LastenradBayern/TINK.iOS/LastenradBayern.iOS.csproj @@ -328,7 +328,7 @@ false - + false diff --git a/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json index ba39056..5200c4e 100644 --- a/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json +++ b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Location_Button.svg", + "filename" : "Location_Button.pdf", "idiom" : "universal" }, { diff --git a/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf new file mode 100644 index 0000000..625565c --- /dev/null +++ b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmPN1 +0 !q(qئU읱Ǐx8(HF=БGp v> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 42.000168 42.000027 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.17.4 (https://cairographics.org)) + /Creator + /CreationDate (D:20221124081702+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000659 00000 n +0000000429 00000 n +0000000357 00000 n +0000000015 00000 n +0000000335 00000 n +0000000724 00000 n +0000001007 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1059 +%%EOF diff --git a/LastenradBayern/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf index 7e4316f..b2ced0f 100644 Binary files a/LastenradBayern/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf and b/LastenradBayern/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf differ diff --git a/LastenradBayern/TINK/View/Map/MapPage.xaml b/LastenradBayern/TINK/View/Map/MapPage.xaml index 2e67a65..f4c9deb 100644 --- a/LastenradBayern/TINK/View/Map/MapPage.xaml +++ b/LastenradBayern/TINK/View/Map/MapPage.xaml @@ -90,7 +90,7 @@ - - + --> diff --git a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj index f8ba913..35f5ff7 100644 --- a/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj +++ b/Meinkonrad/TINK.Android/Meinkonrad.Android.csproj @@ -240,6 +240,10 @@ + + Designer + MSBuild:UpdateGeneratedFiles + @@ -461,11 +465,6 @@ MSBuild:UpdateGeneratedFiles - - - MSBuild:UpdateGeneratedFiles - - diff --git a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml index a21089f..c8465ee 100644 --- a/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml +++ b/Meinkonrad/TINK.Android/Properties/AndroidManifest.xml @@ -1,5 +1,5 @@  - + diff --git a/Meinkonrad/TINK.Android/Resources/drawable/Location_Button.png b/Meinkonrad/TINK.Android/Resources/drawable/Location_Button.png index 330cc36..1da5e0e 100644 Binary files a/Meinkonrad/TINK.Android/Resources/drawable/Location_Button.png and b/Meinkonrad/TINK.Android/Resources/drawable/Location_Button.png differ diff --git a/Meinkonrad/TINK.iOS/Info.plist b/Meinkonrad/TINK.iOS/Info.plist index d71bcc3..2bcc4a3 100644 --- a/Meinkonrad/TINK.iOS/Info.plist +++ b/Meinkonrad/TINK.iOS/Info.plist @@ -55,8 +55,8 @@ CFBundleDisplayName Mein konrad CFBundleVersion - 350 + 352 CFBundleShortVersionString - 3.0.350 + 3.0.352 diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json index ba39056..5200c4e 100644 --- a/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json +++ b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Contents.json @@ -1,7 +1,7 @@ { "images" : [ { - "filename" : "Location_Button.svg", + "filename" : "Location_Button.pdf", "idiom" : "universal" }, { diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf new file mode 100644 index 0000000..625565c --- /dev/null +++ b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Button.imageset/Location_Button.pdf @@ -0,0 +1,69 @@ +%PDF-1.5 +% +4 0 obj +<< /Length 5 0 R + /Filter /FlateDecode +>> +stream +xmPN1 +0 !q(qئU읱Ǐx8(HF=БGp v> + >> +>> +endobj +2 0 obj +<< /Type /Page % 1 + /Parent 1 0 R + /MediaBox [ 0 0 42.000168 42.000027 ] + /Contents 4 0 R + /Group << + /Type /Group + /S /Transparency + /I true + /CS /DeviceRGB + >> + /Resources 3 0 R +>> +endobj +1 0 obj +<< /Type /Pages + /Kids [ 2 0 R ] + /Count 1 +>> +endobj +6 0 obj +<< /Producer (cairo 1.17.4 (https://cairographics.org)) + /Creator + /CreationDate (D:20221124081702+01'00) +>> +endobj +7 0 obj +<< /Type /Catalog + /Pages 1 0 R +>> +endobj +xref +0 8 +0000000000 65535 f +0000000659 00000 n +0000000429 00000 n +0000000357 00000 n +0000000015 00000 n +0000000335 00000 n +0000000724 00000 n +0000001007 00000 n +trailer +<< /Size 8 + /Root 7 0 R + /Info 6 0 R +>> +startxref +1059 +%%EOF diff --git a/Meinkonrad/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf index 7e4316f..980d0d7 100644 --- a/Meinkonrad/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf +++ b/Meinkonrad/TINK.iOS/Media.xcassets/Location_Pin.imageset/Location_Pin.pdf @@ -5,12 +5,11 @@ /Filter /FlateDecode >> stream -xՏA -1 E9ſ1iNbt).djg@= GT!iDw6KN%^hH/[a)(ބ#R\N.0%3F'Ft}&g-Zb n=3'j [ +xOI0 Lfi_ġpDPEH=|UȊ3ObZ6lLc@ݓ,蝪/zt<v 5B<Ljq葙Xk8kf[4GVܩ.3 =5J%u”v-\:ب Z?u - /CreationDate (D:20221116092441+01'00) + /CreationDate (D:20221118084115+01'00) >> endobj 7 0 obj @@ -53,18 +52,18 @@ endobj xref 0 8 0000000000 65535 f -0000000581 00000 n -0000000351 00000 n -0000000279 00000 n +0000000587 00000 n +0000000357 00000 n +0000000285 00000 n 0000000015 00000 n -0000000257 00000 n -0000000646 00000 n -0000000929 00000 n +0000000263 00000 n +0000000652 00000 n +0000000935 00000 n trailer << /Size 8 /Root 7 0 R /Info 6 0 R >> startxref -981 +987 %%EOF diff --git a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj index efbb892..1ea3946 100644 --- a/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj +++ b/Meinkonrad/TINK.iOS/Meinkonrad.iOS.csproj @@ -327,7 +327,7 @@ false - + false diff --git a/Meinkonrad/TINK/View/FeedbackPopup.xaml b/Meinkonrad/TINK/View/FeedbackPopup.xaml index 5178d64..9344792 100644 --- a/Meinkonrad/TINK/View/FeedbackPopup.xaml +++ b/Meinkonrad/TINK/View/FeedbackPopup.xaml @@ -1,4 +1,4 @@ - + - - - - + + + - \ No newline at end of file + diff --git a/Meinkonrad/TINK/View/Map/MapPage.xaml b/Meinkonrad/TINK/View/Map/MapPage.xaml index 84e3483..78cee8b 100644 --- a/Meinkonrad/TINK/View/Map/MapPage.xaml +++ b/Meinkonrad/TINK/View/Map/MapPage.xaml @@ -99,9 +99,11 @@ Command="{Binding OnCurrentLocationButtonClicked}" IsVisible="True" BackgroundColor="Transparent" + BorderWidth="1" + BorderColor="LightGray" VerticalOptions="End" - HorizontalOptions="End" - Margin="0,0,11,100" + HorizontalOptions="Center" + Margin="0,0,0,12" Source="Location_Button.png" WidthRequest="40" HeightRequest="40" diff --git a/ShareeSharedGuiLib/View/RunningProcessView.xaml b/ShareeSharedGuiLib/View/RunningProcessView.xaml index 4a61fc1..7f71dc3 100644 --- a/ShareeSharedGuiLib/View/RunningProcessView.xaml +++ b/ShareeSharedGuiLib/View/RunningProcessView.xaml @@ -35,9 +35,11 @@