From be449b8a512c1ad951cf8a4784b2ff02df5a859f Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 10 Jul 2024 12:14:12 +0300 Subject: [PATCH] android target sdk moved to 34. --- android/app/build.gradle | 4 ++-- assets/lottie/faceid.json | 1 + lib/controllers/providers/api/user_provider.dart | 2 +- lib/new_views/pages/land_page/land_page.dart | 6 ++++-- 4 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 assets/lottie/faceid.json diff --git a/android/app/build.gradle b/android/app/build.gradle index 74abb2b6..8823813a 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -34,7 +34,7 @@ if (keystorePropertiesFile.exists()) { android { - compileSdkVersion 33 + compileSdkVersion 34 ndkVersion flutter.ndkVersion compileOptions { @@ -48,7 +48,7 @@ android { // You can update the following values to match your application needs. // For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration. minSdkVersion 21 - targetSdkVersion 33 + targetSdkVersion 34 versionCode 7 versionName '1.2.0' } diff --git a/assets/lottie/faceid.json b/assets/lottie/faceid.json new file mode 100644 index 00000000..3b3bfbe2 --- /dev/null +++ b/assets/lottie/faceid.json @@ -0,0 +1 @@ +{"v":"4.8.0","meta":{"g":"LottieFiles AE ","a":"","k":"","d":"","tc":""},"fr":60,"ip":0,"op":121,"w":480,"h":480,"nm":"Face ID","ddd":0,"assets":[],"layers":[{"ddd":0,"ind":1,"ty":4,"nm":"Mouth","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.4,"y":1},"o":{"x":0.555,"y":0},"t":10,"s":[240,279.6,0],"to":[-0.667,0.333,0],"ti":[0,0,0]},{"i":{"x":0.415,"y":1},"o":{"x":0.586,"y":0},"t":32,"s":[236,281.6,0],"to":[0,0,0],"ti":[-0.667,0.333,0]},{"t":81,"s":[240,279.6,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":1,"k":[{"i":{"x":0.294,"y":1},"o":{"x":0.664,"y":0},"t":10,"s":[{"i":[[0,0],[4.992,0],[1.957,2.951]],"o":[[-1.957,2.951],[-4.992,0],[0,0]],"v":[[11.25,-2.5],[0,2.5],[-11.25,-2.5]],"c":false}]},{"i":{"x":0.228,"y":1},"o":{"x":0.724,"y":0},"t":37,"s":[{"i":[[0,0],[4.776,0],[1.872,2.951]],"o":[[-1.872,2.951],[-4.776,0],[0,0]],"v":[[10.278,-2.5],[-0.486,2.5],[-11.25,-2.5]],"c":false}]},{"t":87,"s":[{"i":[[0,0],[4.992,0],[1.957,2.951]],"o":[[-1.957,2.951],[-4.992,0],[0,0]],"v":[[11.25,-2.5],[0,2.5],[-11.25,-2.5]],"c":false}]}],"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.607843137255,0.627450980392,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":1,"ml":4,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Mouth","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":2,"ty":4,"nm":"Nose","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.415,"y":1},"o":{"x":0.561,"y":0},"t":10,"s":[237.5,229.6,0],"to":[-1.667,1.667,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.578,"y":0},"t":31,"s":[227.5,239.6,0],"to":[0,0,0],"ti":[-1.667,1.667,0]},{"t":81,"s":[237.5,229.6,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,1.657],[0,0]],"o":[[0,0],[1.657,0],[0,0],[0,0]],"v":[[-1.875,5],[-1.125,5],[1.875,2],[1.875,-5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.607843137255,0.627450980392,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Nose","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":3,"ty":4,"nm":"Eye 1","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.415,"y":1},"o":{"x":0.561,"y":0},"t":10,"s":[195,194.601,0],"to":[0,1.667,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.578,"y":0},"t":31,"s":[195,204.601,0],"to":[0,0,0],"ti":[0,1.667,0]},{"t":81,"s":[195,194.601,0]}],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":0,"k":[100,100,100],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,1.25],[0,-1.25]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.607843137255,0.627450980392,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Eye 1","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":4,"ty":4,"nm":"Eye 2","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":1,"k":[{"i":{"x":0.415,"y":1},"o":{"x":0.561,"y":0},"t":10,"s":[285,203.851,0],"to":[-1.667,1.667,0],"ti":[0,0,0]},{"i":{"x":0.4,"y":1},"o":{"x":0.578,"y":0},"t":31,"s":[275,213.851,0],"to":[0,0,0],"ti":[-1.667,1.667,0]},{"t":81,"s":[285,203.851,0]}],"ix":2},"a":{"a":0,"k":[0,9.25,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":72,"s":[100,100,100]},{"i":{"x":[0.833,0.833,0.833],"y":[0.833,0.833,0.833]},"o":{"x":[0.167,0.167,0.167],"y":[0.167,0.167,0.167]},"t":91,"s":[100,31,100]},{"t":110,"s":[100,100,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0]],"o":[[0,0],[0,0]],"v":[[0,-1.25],[0,1.25]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"st","c":{"a":0,"k":[0.607843137255,0.627450980392,0.752941176471,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Eye 2","np":2,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":121,"st":0,"bm":0},{"ddd":0,"ind":5,"ty":4,"nm":"Capture","sr":1,"ks":{"o":{"a":0,"k":100,"ix":11},"r":{"a":0,"k":0,"ix":10},"p":{"a":0,"k":[240,240,0],"ix":2},"a":{"a":0,"k":[0,0,0],"ix":1},"s":{"a":1,"k":[{"i":{"x":[0.631,0.631,0.667],"y":[0.996,0.996,1]},"o":{"x":[0.766,0.766,0.333],"y":[-0.228,-0.228,0]},"t":11,"s":[99.858,99.858,100]},{"i":{"x":[0.602,0.602,0.667],"y":[1.513,1.513,1]},"o":{"x":[0.407,0.407,0.333],"y":[-0.015,-0.015,0]},"t":28,"s":[83,83,100]},{"t":74,"s":[100.001,100.001,100]}],"ix":6}},"ao":0,"shapes":[{"ty":"gr","it":[{"ind":0,"ty":"sh","ix":1,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,3.314],[0,0]],"o":[[0,0],[3.314,0],[0,0],[0,0]],"v":[[13.5,25.5],[19.5,25.5],[25.5,19.5],[25.5,13.5]],"c":false},"ix":2},"nm":"Path 1","mn":"ADBE Vector Shape - Group","hd":false},{"ind":1,"ty":"sh","ix":2,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,3.314],[0,0]],"o":[[0,0],[-3.314,0],[0,0],[0,0]],"v":[[-13.5,25.5],[-19.5,25.5],[-25.5,19.5],[-25.5,13.5]],"c":false},"ix":2},"nm":"Path 2","mn":"ADBE Vector Shape - Group","hd":false},{"ind":2,"ty":"sh","ix":3,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-3.314],[0,0]],"o":[[0,0],[3.314,0],[0,0],[0,0]],"v":[[13.5,-25.5],[19.5,-25.5],[25.5,-19.5],[25.5,-13.5]],"c":false},"ix":2},"nm":"Path 3","mn":"ADBE Vector Shape - Group","hd":false},{"ind":3,"ty":"sh","ix":4,"ks":{"a":0,"k":{"i":[[0,0],[0,0],[0,-3.314],[0,0]],"o":[[0,0],[-3.314,0],[0,0],[0,0]],"v":[[-13.5,-25.5],[-19.5,-25.5],[-25.5,-19.5],[-25.5,-13.5]],"c":false},"ix":2},"nm":"Path 4","mn":"ADBE Vector Shape - Group","hd":false},{"ty":"mm","mm":1,"nm":"Merge Paths 1","mn":"ADBE Vector Filter - Merge","hd":false},{"ty":"st","c":{"a":0,"k":[0.168627455831,0.192156866193,0.317647069693,1],"ix":3},"o":{"a":0,"k":100,"ix":4},"w":{"a":0,"k":3,"ix":5},"lc":2,"lj":2,"bm":0,"nm":"Stroke 1","mn":"ADBE Vector Graphic - Stroke","hd":false},{"ty":"tr","p":{"a":0,"k":[0,0],"ix":2},"a":{"a":0,"k":[0,0],"ix":1},"s":{"a":0,"k":[400,400],"ix":3},"r":{"a":0,"k":0,"ix":6},"o":{"a":0,"k":100,"ix":7},"sk":{"a":0,"k":0,"ix":4},"sa":{"a":0,"k":0,"ix":5},"nm":"Transform"}],"nm":"Capture","np":6,"cix":2,"bm":0,"ix":1,"mn":"ADBE Vector Group","hd":false}],"ip":0,"op":121,"st":0,"bm":0}],"markers":[]} \ No newline at end of file diff --git a/lib/controllers/providers/api/user_provider.dart b/lib/controllers/providers/api/user_provider.dart index 1167e7c2..6fe00e30 100644 --- a/lib/controllers/providers/api/user_provider.dart +++ b/lib/controllers/providers/api/user_provider.dart @@ -70,7 +70,7 @@ class UserProvider extends ChangeNotifier { Navigator.pop(context); return response.statusCode; } catch (error) { - debugPrint(error); + // debugPrint(error); Navigator.pop(context); _loading = false; notifyListeners(); diff --git a/lib/new_views/pages/land_page/land_page.dart b/lib/new_views/pages/land_page/land_page.dart index 6f1aa2da..8b3f37d8 100644 --- a/lib/new_views/pages/land_page/land_page.dart +++ b/lib/new_views/pages/land_page/land_page.dart @@ -1,3 +1,5 @@ +import 'dart:io'; + import 'package:flutter/material.dart'; import 'package:provider/provider.dart'; import 'package:shared_preferences/shared_preferences.dart'; @@ -71,10 +73,10 @@ class _LandPageState extends State { 16.height, Align( alignment: AlignmentDirectional.centerStart, - child: "Fingerprint/Face ID".addTranslation.heading3(context).custom(fontWeight: FontWeight.w600), + child: (Platform.isAndroid ? "Fingerprint" : "Face ID").addTranslation.heading3(context).custom(fontWeight: FontWeight.w600), ), 16.height, - "fingerprint".toLottieAsset(height: 180), + (Platform.isAndroid ? "fingerprint" : "faceid").toLottieAsset(height: 180), 16.height, Align( alignment: AlignmentDirectional.centerStart,