Skip to content

Commit

Permalink
Merge pull request #18 from tlm-solutions/fixing-flutter-3.7.0-and-such
Browse files Browse the repository at this point in the history
Improvement of life patch and flutter 3.7.0 compatibility
  • Loading branch information
Tassilo Tanneberger authored Apr 16, 2023
2 parents 1efd37a + 8fd3f95 commit c700edb
Show file tree
Hide file tree
Showing 39 changed files with 918 additions and 310 deletions.
6 changes: 2 additions & 4 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,8 @@
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<uses-permission android:name="android.permission.INTERNET" />
<queries>
<intent>
<action android:name="android.intent.action.VIEW" />
Expand Down
Binary file added android/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="?android:colorBackground" />
<item android:drawable="@android:color/black" />

<!-- You can insert your own image assets here -->
<!-- <item>
Expand Down
39 changes: 39 additions & 0 deletions android/app/src/main/res/drawable/ic_launcher_foreground.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="250"
android:viewportHeight="250">
<group android:scaleX="0.53"
android:scaleY="0.53"
android:translateX="58.75"
android:translateY="58.75">
<path
android:pathData="M74.45,79.88c-10.48,0 -19,8.52 -19,19v78.33c0,10.48 8.52,19 19,19h21l10.11,-52h-29.18c-3.03,0 -5.5,-2.47 -5.5,-5.5v-19.48c0,-3.03 2.47,-5.5 5.5,-5.5h35.1l2.86,-14.71c-0.91,0.91 -2.16,1.48 -3.55,1.48h-16.72c-2.76,0 -5,-2.24 -5,-5v-1.55c0,-2.76 2.24,-5 5,-5h16.72c2.29,0 4.2,1.55 4.79,3.65l2.47,-12.73h-43.61ZM81.31,171.46c4.28,0 7.76,2.78 7.76,6.19s-3.48,6.19 -7.76,6.19 -7.76,-2.78 -7.76,-6.19 3.48,-6.19 7.76,-6.19Z"
android:fillColor="#fbcb04"/>
<path
android:pathData="M100.61,80.44L87.68,51.57"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#fbcb04"/>
<path
android:pathData="M70.74,58.07c-0.73,0.38 -1.66,0.11 -2.07,-0.61 -0.41,-0.72 -0.15,-1.61 0.59,-2l1.49,2.61ZM76.47,51.7l1.33,-0.69 1.49,2.61 -1.33,0.69 -1.49,-2.61ZM69.26,55.46l7.21,-3.76 1.49,2.61 -7.21,3.76 -1.49,-2.61Z"
android:fillColor="#fbcb04"/>
<path
android:pathData="M101.47,80.96L114.41,52.08"
android:strokeWidth="3"
android:fillColor="#00000000"
android:strokeColor="#fbcb04"/>
<path
android:pathData="M93.04,208.58H60.15l3.59,-5.25h30.32l0.58,-3h-28.85l4.24,-6.19c0.47,-0.68 0.29,-1.62 -0.39,-2.08 -0.68,-0.47 -1.62,-0.29 -2.08,0.39l-14.68,21.45c-0.47,0.68 -0.29,1.62 0.39,2.08 0.26,0.18 0.55,0.26 0.85,0.26 0.48,0 0.95,-0.23 1.24,-0.65l2.74,-4.01h34.36l0.58,-3Z"
android:fillColor="#fbcb04"/>
<path
android:pathData="M123.05,54.2l0.6,-3.07l-0.1,-0.05l0,-0.08l-45.69,0l0,3l44.82,0l0.37,0.2z"
android:fillColor="#fbcb04"/>
<path
android:pathData="M181.37,28l-36.5,182.48c3.39,0.52 6.92,0.24 10.38,-0.82 3.46,-1.06 6.79,-2.89 9.8,-5.37 3.01,-2.48 5.63,-5.58 7.72,-9.1 2.09,-3.53 3.61,-7.42 4.47,-11.45L207.89,28h-26.52Z"
android:fillColor="#fbcb04"/>
<path
android:pathData="M135.21,28l-40.93,205.72c3.32,0.83 6.81,0.7 10.26,-0.38s6.81,-3.08 9.87,-5.89c3.06,-2.81 5.77,-6.38 7.97,-10.5 2.2,-4.12 3.85,-8.71 4.86,-13.52l0.09,-0.29L161.75,28h-26.54Z"
android:fillColor="#fbcb04"/>
</group>
</vector>
2 changes: 1 addition & 1 deletion android/app/src/main/res/drawable/launch_background.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Modify this file to customize your launch splash screen -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@android:color/white" />
<item android:drawable="@android:color/black" />

<!-- You can insert your own image assets here -->
<!-- <item>
Expand Down
5 changes: 5 additions & 0 deletions android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
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.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
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.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
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.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
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.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
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.
4 changes: 4 additions & 0 deletions android/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#000000</color>
</resources>
2 changes: 1 addition & 1 deletion android/gradle.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
org.gradle.jvmargs=-Xmx1536M
android.useAndroidX=true
android.enableJetifier=true
flutter.minSdkVersion=18
flutter.minSdkVersion=19
flutter.compileSdkVersion=33
Loading

0 comments on commit c700edb

Please sign in to comment.