From 4d6a1e2c22e0ad8491ab647828f6ff29ffd9eda4 Mon Sep 17 00:00:00 2001
From: Peti <petipeti156@gmail.com>
Date: Sat, 27 May 2023 10:03:37 +0200
Subject: [PATCH] java, gardle, upgrade, color theme changes, splash screen not
working (!)
---
.gitignore | 1 +
.../res/drawable-v21/launch_background.xml | 18 +--
.../main/res/drawable/launch_background.xml | 18 +--
.../app/src/main/res/values-v31/styles.xml | 14 --
.../app/src/main/res/values/styles.xml | 48 +++----
filcnaplo/android/build.gradle | 2 +-
filcnaplo/android/gradle.properties | 8 +-
.../gradle/wrapper/gradle-wrapper.properties | 2 +-
.../LaunchBackground.imageset/Contents.json | 42 +++---
.../LaunchImage.imageset/Contents.json | 46 +++---
.../Runner/Base.lproj/LaunchScreen.storyboard | 88 ++++++------
filcnaplo/ios/Runner/Info.plist | 134 +++++++++---------
filcnaplo/lib/main.dart | 9 +-
filcnaplo/pubspec.yaml | 4 +-
.../lib/screens/login/login_screen.dart | 45 ++++--
filcnaplo_premium/android/local.properties | 2 +-
16 files changed, 248 insertions(+), 233 deletions(-)
delete mode 100644 filcnaplo/android/app/src/main/res/values-v31/styles.xml
diff --git a/.gitignore b/.gitignore
index 5d5b2bc..5629c09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
termek.txt
.DS_Store
filc3.properties
+local.properties
# Files and directories created by pub
.dart_tool/
.packages
diff --git a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml
index 51cb1b4..3cc4948 100644
--- a/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <bitmap android:gravity="fill" android:src="@drawable/background"/>
- </item>
- <item>
- <bitmap android:gravity="center" android:src="@drawable/splash"/>
- </item>
-</layer-list>
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <bitmap android:gravity="fill" android:src="@drawable/background"/>
+ </item>
+ <item>
+ <bitmap android:gravity="center" android:src="@drawable/splash"/>
+ </item>
+</layer-list>
diff --git a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml
index 51cb1b4..3cc4948 100644
--- a/filcnaplo/android/app/src/main/res/drawable/launch_background.xml
+++ b/filcnaplo/android/app/src/main/res/drawable/launch_background.xml
@@ -1,9 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
- <item>
- <bitmap android:gravity="fill" android:src="@drawable/background"/>
- </item>
- <item>
- <bitmap android:gravity="center" android:src="@drawable/splash"/>
- </item>
-</layer-list>
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item>
+ <bitmap android:gravity="fill" android:src="@drawable/background"/>
+ </item>
+ <item>
+ <bitmap android:gravity="center" android:src="@drawable/splash"/>
+ </item>
+</layer-list>
diff --git a/filcnaplo/android/app/src/main/res/values-v31/styles.xml b/filcnaplo/android/app/src/main/res/values-v31/styles.xml
deleted file mode 100644
index 5ec5068..0000000
--- a/filcnaplo/android/app/src/main/res/values-v31/styles.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<resources>
-
- <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
- <item name="android:padding">?attr/appWidgetPadding</item>
- <item name="android:background">@drawable/app_widget_background</item>
- <item name="android:clipToOutline">true</item>
- </style>
-
- <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
- <item name="android:padding">?attr/appWidgetPadding</item>
- <item name="android:background">@drawable/app_widget_inner_view_background</item>
- <item name="android:clipToOutline">true</item>
- </style>
-</resources>
\ No newline at end of file
diff --git a/filcnaplo/android/app/src/main/res/values/styles.xml b/filcnaplo/android/app/src/main/res/values/styles.xml
index 7992e45..30e86bc 100644
--- a/filcnaplo/android/app/src/main/res/values/styles.xml
+++ b/filcnaplo/android/app/src/main/res/values/styles.xml
@@ -1,30 +1,30 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
- <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
- <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is off -->
+ <style name="LaunchTheme" parent="@android:style/Theme.Light.NoTitleBar">
<!-- Show a splash screen on the activity. Automatically removed when
- Flutter draws its first frame -->
- <item name="android:windowBackground">@drawable/launch_background</item>
- <item name="android:forceDarkAllowed">false</item>
- <item name="android:windowFullscreen">false</item>
- <item name="android:windowDrawsSystemBarBackgrounds">false</item>
- <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
- </style>
+ Flutter draws its first frame -->
+ <item name="android:windowBackground">@drawable/launch_background</item>
+ <item name="android:forceDarkAllowed">false</item>
+ <item name="android:windowFullscreen">false</item>
+ <item name="android:windowDrawsSystemBarBackgrounds">false</item>
+ <item name="android:windowLayoutInDisplayCutoutMode">shortEdges</item>
+ </style>
<!-- Theme applied to the Android Window as soon as the process has started.
This theme determines the color of the Android Window while your
Flutter UI initializes, as well as behind your Flutter UI while its
running.
- This Theme is only used starting with V2 of Flutter's Android embedding. -->
- <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
- <item name="android:windowBackground">?android:colorBackground</item>
- </style>
- <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
- <item name="android:id">@android:id/background</item>
- <item name="android:background">?android:attr/colorBackground</item>
- </style>
- <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
- <item name="android:background">?android:attr/colorBackground</item>
- <item name="android:textColor">?android:attr/textColorPrimary</item>
- </style>
-</resources>
+ This Theme is only used starting with V2 of Flutter's Android embedding. -->
+ <style name="NormalTheme" parent="@android:style/Theme.Light.NoTitleBar">
+ <item name="android:windowBackground">?android:colorBackground</item>
+ </style>
+ <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
+ <item name="android:id">@android:id/background</item>
+ <item name="android:background">?android:attr/colorBackground</item>
+ </style>
+ <style name="Widget.Android.AppWidget.InnerView" parent="android:Widget">
+ <item name="android:background">?android:attr/colorBackground</item>
+ <item name="android:textColor">?android:attr/textColorPrimary</item>
+ </style>
+</resources>
diff --git a/filcnaplo/android/build.gradle b/filcnaplo/android/build.gradle
index ecbea63..08eb4c9 100644
--- a/filcnaplo/android/build.gradle
+++ b/filcnaplo/android/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.6.10'
+ ext.kotlin_version = '1.8.21'
ext {
compileSdkVersion = 33
diff --git a/filcnaplo/android/gradle.properties b/filcnaplo/android/gradle.properties
index 7f55add..183b8aa 100644
--- a/filcnaplo/android/gradle.properties
+++ b/filcnaplo/android/gradle.properties
@@ -1,4 +1,8 @@
-org.gradle.jvmargs=-Xmx1536M
+org.gradle.jvmargs=-Xmx1536M \
+--add-exports=java.base/sun.nio.ch=ALL-UNNAMED \
+--add-opens=java.base/java.lang=ALL-UNNAMED \
+--add-opens=java.base/java.lang.reflect=ALL-UNNAMED \
+--add-opens=java.base/java.io=ALL-UNNAMED \
+--add-exports=jdk.unsupported/sun.misc=ALL-UNNAMED
android.useAndroidX=true
android.enableJetifier=true
-org.gradle.java.home=C:\\Program Files\\Java\\jdk-14.0.2
diff --git a/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties b/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties
index b9f4649..51d7af8 100644
--- a/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties
+++ b/filcnaplo/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https://services.gradle.org/distributions/gradle-7.3.3-all.zip
diff --git a/filcnaplo/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json b/filcnaplo/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
index 98c5509..9f447e1 100644
--- a/filcnaplo/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
+++ b/filcnaplo/ios/Runner/Assets.xcassets/LaunchBackground.imageset/Contents.json
@@ -1,21 +1,21 @@
-{
- "images" : [
- {
- "filename" : "background.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
+{
+ "images" : [
+ {
+ "filename" : "background.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/filcnaplo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json b/filcnaplo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
index 97a1d4b..00cabce 100644
--- a/filcnaplo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
+++ b/filcnaplo/ios/Runner/Assets.xcassets/LaunchImage.imageset/Contents.json
@@ -1,23 +1,23 @@
-{
- "images" : [
- {
- "filename" : "LaunchImage.png",
- "idiom" : "universal",
- "scale" : "1x"
- },
- {
- "filename" : "LaunchImage@2x.png",
- "idiom" : "universal",
- "scale" : "2x"
- },
- {
- "filename" : "LaunchImage@3x.png",
- "idiom" : "universal",
- "scale" : "3x"
- }
- ],
- "info" : {
- "author" : "xcode",
- "version" : 1
- }
-}
+{
+ "images" : [
+ {
+ "filename" : "LaunchImage.png",
+ "idiom" : "universal",
+ "scale" : "1x"
+ },
+ {
+ "filename" : "LaunchImage@2x.png",
+ "idiom" : "universal",
+ "scale" : "2x"
+ },
+ {
+ "filename" : "LaunchImage@3x.png",
+ "idiom" : "universal",
+ "scale" : "3x"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}
diff --git a/filcnaplo/ios/Runner/Base.lproj/LaunchScreen.storyboard b/filcnaplo/ios/Runner/Base.lproj/LaunchScreen.storyboard
index 9322003..2876738 100644
--- a/filcnaplo/ios/Runner/Base.lproj/LaunchScreen.storyboard
+++ b/filcnaplo/ios/Runner/Base.lproj/LaunchScreen.storyboard
@@ -1,44 +1,44 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
- <dependencies>
- <deployment identifier="iOS"/>
- <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
- </dependencies>
- <scenes>
- <!--View Controller-->
- <scene sceneID="EHf-IW-A2E">
- <objects>
- <viewController id="01J-lp-oVM" sceneMemberID="viewController">
- <layoutGuides>
- <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
- <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
- </layoutGuides>
- <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
- <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
- <subviews>
- <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
- <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
- </subviews>
- <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
- <constraints>
- <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
- <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
- <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
- <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
- <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
- <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
- <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
- <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
- </constraints>
- </view>
- </viewController>
- <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
- </objects>
- <point key="canvasLocation" x="53" y="375"/>
- </scene>
- </scenes>
- <resources>
- <image name="LaunchImage" width="500" height="500"/>
- <image name="LaunchBackground" width="1" height="1"/>
- </resources>
-</document>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="12121" systemVersion="16G29" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+ <dependencies>
+ <deployment identifier="iOS"/>
+ <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="12089"/>
+ </dependencies>
+ <scenes>
+ <!--View Controller-->
+ <scene sceneID="EHf-IW-A2E">
+ <objects>
+ <viewController id="01J-lp-oVM" sceneMemberID="viewController">
+ <layoutGuides>
+ <viewControllerLayoutGuide type="top" id="Ydg-fD-yQy"/>
+ <viewControllerLayoutGuide type="bottom" id="xbc-2k-c8Z"/>
+ </layoutGuides>
+ <view key="view" contentMode="scaleToFill" id="Ze5-6b-2t3">
+ <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+ <subviews>
+ <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleToFill" image="LaunchBackground" translatesAutoresizingMaskIntoConstraints="NO" id="tWc-Dq-wcI"/>
+ <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="LaunchImage" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-k0-Ey4"></imageView>
+ </subviews>
+ <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+ <constraints>
+ <constraint firstItem="YRO-k0-Ey4" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="3T2-ad-Qdv"/>
+ <constraint firstItem="tWc-Dq-wcI" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="RPx-PI-7Xg"/>
+ <constraint firstItem="tWc-Dq-wcI" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="SdS-ul-q2q"/>
+ <constraint firstAttribute="trailing" secondItem="tWc-Dq-wcI" secondAttribute="trailing" id="Swv-Gf-Rwn"/>
+ <constraint firstAttribute="trailing" secondItem="YRO-k0-Ey4" secondAttribute="trailing" id="TQA-XW-tRk"/>
+ <constraint firstItem="YRO-k0-Ey4" firstAttribute="bottom" secondItem="Ze5-6b-2t3" secondAttribute="bottom" id="duK-uY-Gun"/>
+ <constraint firstItem="tWc-Dq-wcI" firstAttribute="leading" secondItem="Ze5-6b-2t3" secondAttribute="leading" id="kV7-tw-vXt"/>
+ <constraint firstItem="YRO-k0-Ey4" firstAttribute="top" secondItem="Ze5-6b-2t3" secondAttribute="top" id="xPn-NY-SIU"/>
+ </constraints>
+ </view>
+ </viewController>
+ <placeholder placeholderIdentifier="IBFirstResponder" id="iYj-Kq-Ea1" userLabel="First Responder" sceneMemberID="firstResponder"/>
+ </objects>
+ <point key="canvasLocation" x="53" y="375"/>
+ </scene>
+ </scenes>
+ <resources>
+ <image name="LaunchImage" width="500" height="500"/>
+ <image name="LaunchBackground" width="1" height="1"/>
+ </resources>
+</document>
diff --git a/filcnaplo/ios/Runner/Info.plist b/filcnaplo/ios/Runner/Info.plist
index 79a4ae5..17a486b 100644
--- a/filcnaplo/ios/Runner/Info.plist
+++ b/filcnaplo/ios/Runner/Info.plist
@@ -1,71 +1,71 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
-<dict>
- <key>BGTaskSchedulerPermittedIdentifiers</key>
- <array>
- <string>com.transistorsoft.fetch</string>
- </array>
- <key>CADisableMinimumFrameDurationOnPhone</key>
- <true/>
- <key>CFBundleDevelopmentRegion</key>
- <string>$(DEVELOPMENT_LANGUAGE)</string>
- <key>CFBundleExecutable</key>
- <string>$(EXECUTABLE_NAME)</string>
- <key>CFBundleIdentifier</key>
- <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
- <key>CFBundleInfoDictionaryVersion</key>
- <string>6.0</string>
- <key>CFBundleName</key>
- <string>Filc Napló</string>
- <key>CFBundlePackageType</key>
- <string>APPL</string>
- <key>CFBundleShortVersionString</key>
- <string>$(FLUTTER_BUILD_NAME)</string>
- <key>CFBundleSignature</key>
- <string>????</string>
- <key>CFBundleVersion</key>
- <string>$(FLUTTER_BUILD_NUMBER)</string>
- <key>ITSAppUsesNonExemptEncryption</key>
- <false/>
- <key>LSApplicationQueriesSchemes</key>
- <array>
- <string>https</string>
- <string>http</string>
- </array>
- <key>LSRequiresIPhoneOS</key>
- <true/>
- <key>NSPhotoLibraryUsageDescription</key>
- <string>The app requires the photo library to set a custom profile picture.</string>
- <key>NSSupportsLiveActivities</key>
- <true/>
- <key>UIApplicationSupportsIndirectInputEvents</key>
- <true/>
- <key>UIBackgroundModes</key>
- <array>
- <string>fetch</string>
- <string>processing</string>
- </array>
- <key>UILaunchStoryboardName</key>
- <string>LaunchScreen</string>
- <key>UIMainStoryboardFile</key>
- <string>Main</string>
- <key>UIStatusBarHidden</key>
- <false/>
- <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>UIViewControllerBasedStatusBarAppearance</key>
- <false/>
-</dict>
+ <dict>
+ <key>BGTaskSchedulerPermittedIdentifiers</key>
+ <array>
+ <string>com.transistorsoft.fetch</string>
+ </array>
+ <key>CADisableMinimumFrameDurationOnPhone</key>
+ <true/>
+ <key>CFBundleDevelopmentRegion</key>
+ <string>$(DEVELOPMENT_LANGUAGE)</string>
+ <key>CFBundleExecutable</key>
+ <string>$(EXECUTABLE_NAME)</string>
+ <key>CFBundleIdentifier</key>
+ <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+ <key>CFBundleInfoDictionaryVersion</key>
+ <string>6.0</string>
+ <key>CFBundleName</key>
+ <string>Filc Napló</string>
+ <key>CFBundlePackageType</key>
+ <string>APPL</string>
+ <key>CFBundleShortVersionString</key>
+ <string>$(FLUTTER_BUILD_NAME)</string>
+ <key>CFBundleSignature</key>
+ <string>????</string>
+ <key>CFBundleVersion</key>
+ <string>$(FLUTTER_BUILD_NUMBER)</string>
+ <key>ITSAppUsesNonExemptEncryption</key>
+ <false/>
+ <key>LSApplicationQueriesSchemes</key>
+ <array>
+ <string>https</string>
+ <string>http</string>
+ </array>
+ <key>LSRequiresIPhoneOS</key>
+ <true/>
+ <key>NSPhotoLibraryUsageDescription</key>
+ <string>The app requires the photo library to set a custom profile picture.</string>
+ <key>NSSupportsLiveActivities</key>
+ <true/>
+ <key>UIApplicationSupportsIndirectInputEvents</key>
+ <true/>
+ <key>UIBackgroundModes</key>
+ <array>
+ <string>fetch</string>
+ <string>processing</string>
+ </array>
+ <key>UILaunchStoryboardName</key>
+ <string>LaunchScreen</string>
+ <key>UIMainStoryboardFile</key>
+ <string>Main</string>
+ <key>UIStatusBarHidden</key>
+ <false/>
+ <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>UIViewControllerBasedStatusBarAppearance</key>
+ <false/>
+ </dict>
</plist>
diff --git a/filcnaplo/lib/main.dart b/filcnaplo/lib/main.dart
index 2266a84..7032313 100644
--- a/filcnaplo/lib/main.dart
+++ b/filcnaplo/lib/main.dart
@@ -15,7 +15,6 @@ void main() async {
WidgetsBinding binding = WidgetsFlutterBinding.ensureInitialized();
binding.renderView.automaticSystemUiAdjustment = false;
SystemChrome.setPreferredOrientations([DeviceOrientation.portraitUp]);
-
// Startup
Startup startup = Startup();
await startup.start();
@@ -26,7 +25,10 @@ void main() async {
BackgroundFetch.registerHeadlessTask(backgroundHeadlessTask);
// Run App
- runApp(App(database: startup.database, settings: startup.settings, user: startup.user));
+ runApp(App(
+ database: startup.database,
+ settings: startup.settings,
+ user: startup.user));
}
class Startup {
@@ -55,7 +57,8 @@ Widget errorBuilder(FlutterErrorDetails details) {
if (!errorShown && details.exceptionAsString() != lastException) {
errorShown = true;
lastException = details.exceptionAsString();
- Navigator.of(context, rootNavigator: true).push(MaterialPageRoute(builder: (context) {
+ Navigator.of(context, rootNavigator: true)
+ .push(MaterialPageRoute(builder: (context) {
if (kReleaseMode) {
return ErrorReportScreen(details);
} else {
diff --git a/filcnaplo/pubspec.yaml b/filcnaplo/pubspec.yaml
index 18eba36..9002804 100644
--- a/filcnaplo/pubspec.yaml
+++ b/filcnaplo/pubspec.yaml
@@ -71,7 +71,7 @@ dependencies:
dev_dependencies:
flutter_lints: ^2.0.1
flutter_launcher_icons: "^0.13.1"
- #flutter_native_splash: "^2.3.0"
+ flutter_native_splash: "^2.3.0"
sqflite_common_ffi: ^2.0.0+3
flutter:
@@ -157,6 +157,8 @@ flutter_icons:
flutter_native_splash:
color: "#3D7BF4"
image: "assets/icons/ic_splash.png"
+ android_12:
+ image: "assets/icons/ic_splash.png"
android: true
android_gravity: center
ios: true
diff --git a/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart b/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
index 44c00bf..34bf31c 100755
--- a/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
+++ b/filcnaplo_mobile_ui/lib/screens/login/login_screen.dart
@@ -33,9 +33,9 @@ class _LoginScreenState extends State<LoginScreen> {
// Scaffold Gradient background
final LinearGradient _backgroundGradient = const LinearGradient(
colors: [
- Color(0xff20AC9B),
- Color(0xff20AC9B),
- Color(0xff123323),
+ Color.fromARGB(255, 61, 122, 244),
+ Color.fromARGB(255, 23, 77, 185),
+ Color.fromARGB(255, 7, 42, 112),
],
begin: Alignment(-0.8, -1.0),
end: Alignment(0.8, 1.0),
@@ -61,7 +61,8 @@ class _LoginScreenState extends State<LoginScreen> {
});
} else {
ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
- content: Text("schools_error".i18n, style: const TextStyle(color: Colors.white)),
+ content: Text("schools_error".i18n,
+ style: const TextStyle(color: Colors.white)),
backgroundColor: AppColors.of(context).red,
context: context,
));
@@ -109,16 +110,22 @@ class _LoginScreenState extends State<LoginScreen> {
children: [
Padding(
padding: const EdgeInsets.only(top: 8.0),
- child: Opacity(child: Image.asset("assets/icons/ic_splash.png", color: Colors.black), opacity: 0.3),
+ child: Opacity(
+ child: Image.asset(
+ "assets/icons/ic_splash.png",
+ color: Colors.black),
+ opacity: 0.3),
),
BackdropFilter(
- filter: ImageFilter.blur(sigmaX: 6.0, sigmaY: 6.0),
+ filter:
+ ImageFilter.blur(sigmaX: 6.0, sigmaY: 6.0),
child: Image.asset("assets/icons/ic_splash.png"),
)
],
),
width: MediaQuery.of(context).size.width / 4,
- margin: const EdgeInsets.only(left: 12.0, right: 12.0, bottom: 12.0),
+ margin: const EdgeInsets.only(
+ left: 12.0, right: 12.0, bottom: 12.0),
),
),
),
@@ -249,17 +256,26 @@ class _LoginScreenState extends State<LoginScreen> {
replacement: const Padding(
padding: EdgeInsets.symmetric(vertical: 6.0),
child: CircularProgressIndicator(
- valueColor: AlwaysStoppedAnimation<Color>(Colors.white),
+ valueColor:
+ AlwaysStoppedAnimation<Color>(Colors.white),
),
),
),
),
- if (_loginState == LoginState.missingFields || _loginState == LoginState.invalidGrant || _loginState == LoginState.failed)
+ if (_loginState == LoginState.missingFields ||
+ _loginState == LoginState.invalidGrant ||
+ _loginState == LoginState.failed)
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: Text(
- ["missing_fields", "invalid_grant", "error"][_loginState.index].i18n,
- style: const TextStyle(color: Colors.red, fontWeight: FontWeight.w500),
+ [
+ "missing_fields",
+ "invalid_grant",
+ "error"
+ ][_loginState.index]
+ .i18n,
+ style: const TextStyle(
+ color: Colors.red, fontWeight: FontWeight.w500),
),
),
const Spacer()
@@ -276,7 +292,9 @@ class _LoginScreenState extends State<LoginScreen> {
String username = usernameController.text;
String password = passwordController.text;
- if (username == "" || password == "" || schoolController.selectedSchool == null) {
+ if (username == "" ||
+ password == "" ||
+ schoolController.selectedSchool == null) {
return setState(() => _loginState = LoginState.missingFields);
}
@@ -291,7 +309,8 @@ class _LoginScreenState extends State<LoginScreen> {
ScaffoldMessenger.of(context).showSnackBar(CustomSnackBar(
context: context,
brightness: Brightness.light,
- content: Text("welcome".i18n.fill([user.name]), overflow: TextOverflow.ellipsis),
+ content: Text("welcome".i18n.fill([user.name]),
+ overflow: TextOverflow.ellipsis),
));
},
onSuccess: () {
diff --git a/filcnaplo_premium/android/local.properties b/filcnaplo_premium/android/local.properties
index ba0df0d..142a2c2 100644
--- a/filcnaplo_premium/android/local.properties
+++ b/filcnaplo_premium/android/local.properties
@@ -1,2 +1,2 @@
sdk.dir=C:\\Users\\Peti\\AppData\\Local\\Android\\sdk
-flutter.sdk=/Users/kima/development/flutter
\ No newline at end of file
+flutter.sdk=D:\\flutter
\ No newline at end of file