developer1044/AppCardsStarter_Modelo
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

migração flutter 2.2.1

Browse Source
This commit is contained in:
Renan
2021-06-01 16:52:01 -03:00
parent c44fcdddea
commit dd6bbb650b
25 changed files with 568 additions and 469 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/app/build.gradle
+16 -16
View File
@@ -45,7 +45,7 @@ android {
defaultConfig { defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.hightechx.mobile.decpisos" applicationId "com.hightechx.mobile.decpisos"
minSdkVersion 17 minSdkVersion 19
targetSdkVersion 30 targetSdkVersion 30
versionCode flutterVersionCode.toInteger() versionCode flutterVersionCode.toInteger()
versionName flutterVersionName versionName flutterVersionName
@@ -82,27 +82,27 @@ android {
signingConfig signingConfigs.debug signingConfig signingConfigs.debug
} }
} }
// splits { splits {
// //Configures multiple APKs based on ABI. //Configures multiple APKs based on ABI.
// abi { abi {
// //Enables building multiple APKs per ABI. //Enables building multiple APKs per ABI.
// enable true enable true
// //By default all ABIs are included, so use reset() and include to specify that we only //By default all ABIs are included, so use reset() and include to specify that we only
// //want APKs for x86 and x86_64. //want APKs for x86 and x86_64.
// //Resets the list of ABIs that Gradle should create APKs for to none. //Resets the list of ABIs that Gradle should create APKs for to none.
// reset() reset()
// //Specifies a list of ABIs that Gradle should create APKs for. //Specifies a list of ABIs that Gradle should create APKs for.
// include "x86", "x86_64", "armeabi", "armeabi-v7a", "arm64-v8a" include "x86", "x86_64", "armeabi", "armeabi-v7a", "arm64-v8a"
// //Specifies that we do not want to also generate a universal APK that includes all ABIs. //Specifies that we do not want to also generate a universal APK that includes all ABIs.
// universalApk false universalApk false
// } }
// } }
} }
flutter { flutter {
ios/Runner/Info.plist
+2
View File
@@ -75,5 +75,7 @@
<true/> <true/>
<key>UIViewControllerBasedStatusBarAppearance</key> <key>UIViewControllerBasedStatusBarAppearance</key>
<false/> <false/>
<key>io.flutter.embedded_views_preview</key>
<true/>
</dict> </dict>
</plist> </plist>
lib/atualizarapp/atualizarapp.dart
+2 -2
View File
@@ -3,7 +3,7 @@ import 'package:flutter/material.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
class AtualizarScreen extends StatefulWidget { class AtualizarScreen extends StatefulWidget {
final String linkLoja; final String? linkLoja;
AtualizarScreen({this.linkLoja}); AtualizarScreen({this.linkLoja});
@override @override
_AtualizarScreenState createState() => _AtualizarScreenState(); _AtualizarScreenState createState() => _AtualizarScreenState();
@@ -55,7 +55,7 @@ class _AtualizarScreenState extends State<AtualizarScreen> {
borderRadius: BorderRadius.circular(10.0) borderRadius: BorderRadius.circular(10.0)
), ),
onPressed: (){ onPressed: (){
launch(widget.linkLoja); launch(widget.linkLoja!);
} }
), ),
], ],
lib/default_response_api.dart
+19 -19
View File
@@ -1,6 +1,6 @@
class DefaultResponseApi { class DefaultResponseApi {
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
DefaultResponseApi({this.errorCode, this.errorMessage}); DefaultResponseApi({this.errorCode, this.errorMessage});
@@ -18,11 +18,11 @@ class DefaultResponseApi {
} }
class RegistraDeviceRequest { class RegistraDeviceRequest {
int aPPMOBILECODIGO; int? aPPMOBILECODIGO;
int pLATAFORMAMOBILECODIGO; int? pLATAFORMAMOBILECODIGO;
String dEVICETOKEN; String? dEVICETOKEN;
String mODELODEVICE; String? mODELODEVICE;
int uSUCOD; int? uSUCOD;
RegistraDeviceRequest( RegistraDeviceRequest(
{this.aPPMOBILECODIGO, {this.aPPMOBILECODIGO,
@@ -51,12 +51,12 @@ class RegistraDeviceRequest {
} }
class ApiStatusResponse { class ApiStatusResponse {
String sistema; String? sistema;
String upload; String? upload;
String download; String? download;
String pagamento; String? pagamento;
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
ApiStatusResponse( ApiStatusResponse(
{this.sistema, {this.sistema,
@@ -77,12 +77,12 @@ class ApiStatusResponse {
} }
class VersaoMinimaResponse { class VersaoMinimaResponse {
int versaoMinima; int? versaoMinima;
String linkLoja; String? linkLoja;
String nome; String? nome;
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
bool vOk; bool? vOk;
VersaoMinimaResponse({this.errorCode, this.errorMessage,this.linkLoja,this.nome,this.versaoMinima,this.vOk}); VersaoMinimaResponse({this.errorCode, this.errorMessage,this.linkLoja,this.nome,this.versaoMinima,this.vOk});
lib/funcoes_gerais.dart
+6 -5
View File
@@ -1,4 +1,5 @@
import 'dart:convert'; import 'dart:convert';
import 'package:get/get.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import 'package:device_info/device_info.dart'; import 'package:device_info/device_info.dart';
import 'dart:io'; import 'dart:io';
@@ -45,7 +46,7 @@ class FuncoesGerais{
return Future<String>.value(tokenPadrao); return Future<String>.value(tokenPadrao);
} }
static Future<void> registraDevice(String token) async{ static Future<void> registraDevice(String? token) async{
if(await FuncoesGerais.checkInternetConnection()){ if(await FuncoesGerais.checkInternetConnection()){
if(token != null && token.isNotEmpty){ if(token != null && token.isNotEmpty){
@@ -78,7 +79,7 @@ class FuncoesGerais{
try { try {
var body = json.encode(objPost); var body = json.encode(objPost);
//var response = await http.post(url, body: body,headers: heads); //var response = await http.post(url, body: body,headers: heads);
await http.post(url, body: body,headers: heads); await http.post(Uri.parse(url), body: body,headers: heads);
//var r = await http.post(url, body: body,headers: heads); //var r = await http.post(url, body: body,headers: heads);
//print(r); //print(r);
// if (response != null) { // if (response != null) {
@@ -112,8 +113,8 @@ class FuncoesGerais{
heads["Content-type"] = "application/json; charset=utf-8"; heads["Content-type"] = "application/json; charset=utf-8";
try { try {
var response = await http.get(url,headers: heads); http.Response response = await http.get(Uri.parse(url),headers: heads);
if (response != null) { if (!GetUtils.isNullOrBlank(response.body)!) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
objRetorno = VersaoMinimaResponse.fromJson(data); objRetorno = VersaoMinimaResponse.fromJson(data);
@@ -121,7 +122,7 @@ class FuncoesGerais{
// var v = packageInfo.version.split('.'); // var v = packageInfo.version.split('.');
// int versaoAtual = 0; // int versaoAtual = 0;
//if(v.length > 0)versaoAtual = v[0] != null && v[0].isNotEmpty ? int.parse(v[0]) : 0; //if(v.length > 0)versaoAtual = v[0] != null && v[0].isNotEmpty ? int.parse(v[0]) : 0;
if(FuncoesGerais.versaoAtual != null && objRetorno.versaoMinima > FuncoesGerais.versaoAtual){ if(objRetorno.versaoMinima! > FuncoesGerais.versaoAtual){
objRetorno.vOk = false; objRetorno.vOk = false;
} }
} }
lib/home/home.dart
+50 -21
View File
@@ -1,5 +1,7 @@
import 'package:decpisos/funcoes_gerais.dart'; import 'package:decpisos/funcoes_gerais.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:line_icons/line_icons.dart';
import 'package:url_launcher/url_launcher.dart'; import 'package:url_launcher/url_launcher.dart';
import 'package:webview_flutter/webview_flutter.dart'; import 'package:webview_flutter/webview_flutter.dart';
@@ -14,25 +16,46 @@ class _HomeScreenState extends State<HomeScreen> with AutomaticKeepAliveClientMi
@override @override
Widget build(BuildContext context) { Widget build(BuildContext context) {
super.build(context); super.build(context);
return SafeArea( return Scaffold(
child: this.error ? this._buildError() : WebView( appBar: AppBar(
initialUrl: FuncoesGerais.homeURL, title: Text(FuncoesGerais.nomeApp),
javascriptMode: JavascriptMode.unrestricted, centerTitle: false,
onWebResourceError: (err){ actions: [
this.error = true; IconButton(
this.msg = err.description; onPressed: (){
setState(() { if(Get.theme.brightness == Brightness.dark){
}); Get.changeThemeMode(ThemeMode.light);
}, }
navigationDelegate: (navigation){ else{
print(navigation.url); Get.changeThemeMode(ThemeMode.dark);
if (navigation.url.startsWith(FuncoesGerais.dominioPermitido)) { }
return NavigationDecision.navigate; },
} tooltip: 'Alternar modo dark/light',
//print('allowing navigation to $request'); icon: Icon(LineIcons.palette)
launch(navigation.url); )
return NavigationDecision.prevent; ],
}, ),
body: SafeArea(
child: this.error ? this._buildError() : WebView(
initialUrl: FuncoesGerais.homeURL,
javascriptMode: JavascriptMode.unrestricted,
onWebResourceError: (err){
this.error = true;
this.msg = err.description;
setState(() {
});
},
allowsInlineMediaPlayback: true,
navigationDelegate: (navigation){
print(navigation.url);
if (navigation.url.startsWith(FuncoesGerais.dominioPermitido)) {
return NavigationDecision.navigate;
}
//print('allowing navigation to $request');
launch(navigation.url);
return NavigationDecision.prevent;
},
),
), ),
); );
} }
@@ -44,12 +67,18 @@ class _HomeScreenState extends State<HomeScreen> with AutomaticKeepAliveClientMi
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(msg), Text(msg),
RaisedButton(onPressed: (){ ElevatedButton(onPressed: (){
this.error = false; this.error = false;
this.msg = ''; this.msg = '';
setState(() { setState(() {
}); });
}, child: Text('Atualizar'),) }, child: Text('Atualizar'))
// RaisedButton(onPressed: (){
// this.error = false;
// this.msg = '';
// setState(() {
// });
// }, child: Text('Atualizar'),)
], ],
), ),
); );
lib/index/index_controller.dart
+5 -5
View File
@@ -10,19 +10,19 @@ import 'package:line_icons/line_icons.dart';
//import 'package:line_icons/line_icons.dart'; //import 'package:line_icons/line_icons.dart';
class IndexController extends GetxController with SingleGetTickerProviderMixin { class IndexController extends GetxController with SingleGetTickerProviderMixin {
TabController tabController; TabController? tabController;
var tabs = List<TabItem>().obs; var tabs = <TabItem>[].obs;
var childrenTabs = List<Widget>().obs; var childrenTabs = <Widget>[].obs;
@override @override
void onInit() { void onInit() {
super.onInit(); super.onInit();
this.initTabs(); this.initTabs();
this.tabController.index = 1; this.tabController!.index = 1;
} }
@override @override
void onClose() { void onClose() {
this.tabController.dispose(); this.tabController!.dispose();
super.onClose(); super.onClose();
} }
lib/instagram_embed/instagram_embed.dart
+8 -2
View File
@@ -44,12 +44,18 @@ class _InstagramScreenState extends State<InstagramScreen> with AutomaticKeepAli
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(msg), Text(msg),
RaisedButton(onPressed: (){ ElevatedButton(onPressed: (){
this.error = false; this.error = false;
this.msg = ''; this.msg = '';
setState(() { setState(() {
}); });
}, child: Text('Atualizar'),) }, child: Text('Atualizar'))
// RaisedButton(onPressed: (){
// this.error = false;
// this.msg = '';
// setState(() {
// });
// }, child: Text('Atualizar'),)
], ],
), ),
); );
lib/main.dart
+18 -5
View File
@@ -1,11 +1,21 @@
import 'package:decpisos/funcoes_gerais.dart'; import 'package:decpisos/funcoes_gerais.dart';
import 'package:firebase_core/firebase_core.dart';
//import 'package:firebase_messaging/firebase_messaging.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart'; import 'package:flutter_localizations/flutter_localizations.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'splash/splash.dart'; import 'splash/splash.dart';
void main() { Future<void> main() async {
WidgetsFlutterBinding.ensureInitialized();
await Firebase.initializeApp();
// Set the background messaging handler early on, as a named top-level function
// FirebaseMessaging.onBackgroundMessage((RemoteMessage message) async {
// await Firebase.initializeApp();
// print('Handling a background message ${message.messageId}');
// });
runApp(GetMaterialApp( runApp(GetMaterialApp(
title: FuncoesGerais.nomeApp, title: FuncoesGerais.nomeApp,
localizationsDelegates: [ localizationsDelegates: [
@@ -17,11 +27,14 @@ void main() {
supportedLocales: [ supportedLocales: [
const Locale('pt'), const Locale('pt'),
], ],
theme: ThemeData.light().copyWith(primaryColor: Color(0xFF05578e)),
darkTheme: ThemeData.dark().copyWith(primaryColor: Colors.black87),
// theme: ThemeData(
// //brightness: Brightness.dark,
// visualDensity: VisualDensity.adaptivePlatformDensity,
// primarySwatch: Colors.blueGrey
// ),
themeMode: ThemeMode.dark, themeMode: ThemeMode.dark,
theme: ThemeData(
brightness: Brightness.dark,
visualDensity: VisualDensity.adaptivePlatformDensity,
),
home: SplashScreen() home: SplashScreen()
)); ));
} }
lib/notificacoes/api/notificacoes_api.dart
+11 -9
View File
@@ -1,6 +1,7 @@
import 'dart:convert'; import 'dart:convert';
import 'package:get/get_utils/src/get_utils/get_utils.dart';
import 'package:http/http.dart' as http; import 'package:http/http.dart' as http;
import '../../default_response_api.dart'; import '../../default_response_api.dart';
@@ -26,9 +27,10 @@ class NotificacoesApi{
Map<String, String> heads = Map(); Map<String, String> heads = Map();
heads["Content-type"] = "application/json; charset=utf-8"; heads["Content-type"] = "application/json; charset=utf-8";
var response = await http.get(url, headers: heads); var response = await http.get(Uri.parse(url), headers: heads);
if (response != null) { //if (response != null) {
if (!GetUtils.isNullOrBlank(response.body)!) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
retorno = NotificacoesResponse.fromJson(data); retorno = NotificacoesResponse.fromJson(data);
@@ -47,7 +49,7 @@ class NotificacoesApi{
return retorno; return retorno;
} }
Future<NotificacaoResponse> getNotificacao(int id) async{ Future<NotificacaoResponse> getNotificacao(int? id) async{
var retorno = new NotificacaoResponse( var retorno = new NotificacaoResponse(
errorCode: 0, errorCode: 0,
errorMessage: "" errorMessage: ""
@@ -63,9 +65,9 @@ class NotificacoesApi{
Map<String, String> heads = Map(); Map<String, String> heads = Map();
heads["Content-type"] = "application/json; charset=utf-8"; heads["Content-type"] = "application/json; charset=utf-8";
var response = await http.get(url, headers: heads); var response = await http.get(Uri.parse(url), headers: heads);
if (response != null) { if (!GetUtils.isNullOrBlank(response.body)!) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
retorno = NotificacaoResponse.fromJson(data); retorno = NotificacaoResponse.fromJson(data);
@@ -100,9 +102,9 @@ class NotificacoesApi{
var body = json.encode(post); var body = json.encode(post);
var response = await http.post(url, headers: heads, body: body); var response = await http.post(Uri.parse(url), headers: heads, body: body);
if (response != null) { if (!GetUtils.isNullOrBlank(response.body)!) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
objRetorno = DefaultResponseApi.fromJson(data); objRetorno = DefaultResponseApi.fromJson(data);
@@ -135,10 +137,10 @@ class NotificacoesApi{
var body = json.encode(post); var body = json.encode(post);
var response = await http.post(url, headers: heads, body: body); var response = await http.post(Uri.parse(url), headers: heads, body: body);
if (response != null) { if (!GetUtils.isNullOrBlank(response.body)!) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
objRetorno = DefaultResponseApi.fromJson(data); objRetorno = DefaultResponseApi.fromJson(data);
lib/notificacoes/api/notificacoes_classes.dart
+24 -24
View File
@@ -1,6 +1,6 @@
class NotificacaoLikeRequest { class NotificacaoLikeRequest {
int iD; int? iD;
String like; String? like;
NotificacaoLikeRequest({this.iD, this.like}); NotificacaoLikeRequest({this.iD, this.like});
@@ -18,8 +18,8 @@ class NotificacaoLikeRequest {
} }
class NotificacaoLidaRequest { class NotificacaoLidaRequest {
String latitude; String? latitude;
String longitude; String? longitude;
NotificacaoLidaRequest({this.latitude, this.longitude}); NotificacaoLidaRequest({this.latitude, this.longitude});
@@ -38,9 +38,9 @@ class NotificacaoLidaRequest {
class NotificacaoResponse { class NotificacaoResponse {
NotificacaoResults result; NotificacaoResults? result;
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
NotificacaoResponse({this.result, this.errorCode, this.errorMessage}); NotificacaoResponse({this.result, this.errorCode, this.errorMessage});
@@ -54,7 +54,7 @@ class NotificacaoResponse {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.result != null) { if (this.result != null) {
data['Result'] = this.result.toJson(); data['Result'] = this.result!.toJson();
} }
data['ErrorCode'] = this.errorCode; data['ErrorCode'] = this.errorCode;
data['ErrorMessage'] = this.errorMessage; data['ErrorMessage'] = this.errorMessage;
@@ -63,18 +63,18 @@ class NotificacaoResponse {
} }
class NotificacoesResponse { class NotificacoesResponse {
List<NotificacaoResults> results; List<NotificacaoResults>? results;
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
bool loadMore; bool? loadMore;
NotificacoesResponse({this.results, this.errorCode, this.errorMessage,this.loadMore}); NotificacoesResponse({this.results, this.errorCode, this.errorMessage,this.loadMore});
NotificacoesResponse.fromJson(Map<String, dynamic> json) { NotificacoesResponse.fromJson(Map<String, dynamic> json) {
if (json['Results'] != null) { if (json['Results'] != null) {
results = new List<NotificacaoResults>(); results = <NotificacaoResults>[];
json['Results'].forEach((v) { json['Results'].forEach((v) {
results.add(new NotificacaoResults.fromJson(v)); results!.add(new NotificacaoResults.fromJson(v));
}); });
} }
errorCode = json['ErrorCode']; errorCode = json['ErrorCode'];
@@ -84,7 +84,7 @@ class NotificacoesResponse {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.results != null) { if (this.results != null) {
data['Results'] = this.results.map((v) => v.toJson()).toList(); data['Results'] = this.results!.map((v) => v.toJson()).toList();
} }
data['ErrorCode'] = this.errorCode; data['ErrorCode'] = this.errorCode;
data['ErrorMessage'] = this.errorMessage; data['ErrorMessage'] = this.errorMessage;
@@ -93,15 +93,15 @@ class NotificacoesResponse {
} }
class NotificacaoResults { class NotificacaoResults {
int iD; int? iD;
String titulo; String? titulo;
String texto; String? texto;
String conteudo; String? conteudo;
String dataNotificacao; String? dataNotificacao;
String tipoConteudo; String? tipoConteudo;
bool visualizado; bool? visualizado;
String imageUrl; String? imageUrl;
String like; String? like;
NotificacaoResults( NotificacaoResults(
{this.iD, {this.iD,
lib/notificacoes/notificacao.dart
+10 -7
View File
@@ -15,17 +15,17 @@ class NotificacaoDetail extends StatelessWidget {
// //
//title: Obx(() => Text(c.notificacaoDetail.value.result.titulo ?? 'Notificação')), //title: Obx(() => Text(c.notificacaoDetail.value.result.titulo ?? 'Notificação')),
), ),
body: Obx(() => c.loadingDetail.value ? Center(child: CircularProgressIndicator(),) : c.notificacaoDetail.value.errorCode != 0 ? Center(child: Text(c.notificacaoDetail.value.errorMessage),) : ListView( body: Obx(() => c.loadingDetail.value ? Center(child: CircularProgressIndicator(),) : c.notificacaoDetail.value.errorCode != 0 ? Center(child: Text(c.notificacaoDetail.value.errorMessage!),) : ListView(
children: <Widget>[ children: <Widget>[
Visibility( Visibility(
visible: GetUtils.isNullOrBlank(c.notificacaoDetail.value.result.imageUrl) == false, visible: GetUtils.isNullOrBlank(c.notificacaoDetail.value.result!.imageUrl) == false,
child: Container( child: Container(
color: Colors.black38, color: Colors.black38,
height: 250, height: 250,
child: Padding( child: Padding(
padding: const EdgeInsets.all(70.0), padding: const EdgeInsets.all(70.0),
child: Image.network( child: Image.network(
c.notificacaoDetail.value.result.imageUrl ?? '', c.notificacaoDetail.value.result!.imageUrl ?? '',
fit: BoxFit.contain, fit: BoxFit.contain,
), ),
), ),
@@ -37,14 +37,17 @@ class NotificacaoDetail extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
c.notificacaoDetail.value.result.titulo, c.notificacaoDetail.value.result!.titulo!,
style: TextStyle(fontSize: 30.0,), style: TextStyle(fontSize: 30.0,),
), ),
const SizedBox(height: 10), const SizedBox(height: 10),
Html( Html(
data: c.notificacaoDetail.value.result.conteudo, data: c.notificacaoDetail.value.result!.conteudo,
onLinkTap: (url){ // onLinkTap: (url){
launch(url); // launch(url);
// },
onLinkTap: (url,ctx,mp,element){
launch(url!);
}, },
// style: Theme.of(context).textTheme.bodyText2.copyWith( // style: Theme.of(context).textTheme.bodyText2.copyWith(
// color: Colors.black54, // color: Colors.black54,
lib/notificacoes/notificacoes.dart
+14 -13
View File
@@ -71,7 +71,7 @@ class NotificacoesScreen extends StatelessWidget {
// child: this._buildListTile(index) // child: this._buildListTile(index)
// ); // );
} else if (index > 1) { } else if (index > 1) {
if(c.loadMore == null || c.loadMore){ if(c.loadMore){
c.getNotificacoesBloc(); c.getNotificacoesBloc();
return Container( return Container(
height: 40, height: 40,
@@ -113,8 +113,9 @@ class NotificacoesScreen extends StatelessWidget {
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(c.errorMessage), Text(c.errorMessage!),
RaisedButton(onPressed: c.refresh, child: Text('Atualizar'),) ElevatedButton(onPressed: c.refresh, child: Text('Atualizar'))
//RaisedButton(onPressed: c.refresh, child: Text('Atualizar'),)
], ],
), ),
); );
@@ -123,12 +124,12 @@ class NotificacoesScreen extends StatelessWidget {
Widget _buildListTile(int index) { Widget _buildListTile(int index) {
if(c.notificacoesResults[index].tipoConteudo == 'L'){ if(c.notificacoesResults[index].tipoConteudo == 'L'){
return this._buildListTileTile(index: index,onTap: (){ return this._buildListTileTile(index: index,onTap: (){
c.notificacaoLidaBloc(c.notificacoesResults[index].iD).then((value) => launch(c.notificacoesResults[index].conteudo)); c.notificacaoLidaBloc(c.notificacoesResults[index].iD).then((value) => launch(c.notificacoesResults[index].conteudo!));
}); });
} }
return OpenContainer<bool>( return OpenContainer<bool>(
//openColor: Colors.transparent, //openColor: Colors.transparent,
closedColor: Colors.black87.withOpacity(0.2), closedColor: Get.theme.primaryColor.withOpacity(0.2),
transitionType: ContainerTransitionType.fadeThrough, transitionType: ContainerTransitionType.fadeThrough,
openBuilder: (BuildContext _, VoidCallback openContainer) { openBuilder: (BuildContext _, VoidCallback openContainer) {
c.notificacoesResults[index].visualizado = true; c.notificacoesResults[index].visualizado = true;
@@ -136,7 +137,7 @@ class NotificacoesScreen extends StatelessWidget {
//return _DetailsPage(); //return _DetailsPage();
return NotificacaoDetail(); return NotificacaoDetail();
}, },
onClosed: (bool isMarkedAsDone) { onClosed: (bool? isMarkedAsDone) {
c.notificacaoLidaBloc(c.notificacoesResults[index].iD); c.notificacaoLidaBloc(c.notificacoesResults[index].iD);
if (isMarkedAsDone ?? false) if (isMarkedAsDone ?? false)
Get.rawSnackbar(message: 'Marked as done!'); Get.rawSnackbar(message: 'Marked as done!');
@@ -150,21 +151,21 @@ class NotificacoesScreen extends StatelessWidget {
); );
} }
Widget _buildListTileTile({Function onTap,@required int index}){ Widget _buildListTileTile({Function? onTap,required int index}){
return ListTile( return ListTile(
leading: CircleAvatar( leading: CircleAvatar(
backgroundImage: GetUtils.isNullOrBlank(c.notificacoesResults[index].imageUrl) ? AssetImage( backgroundImage: (GetUtils.isNullOrBlank(c.notificacoesResults[index].imageUrl)! ? AssetImage(
'assets/images/logo.png', 'assets/images/logo.png',
) : NetworkImage(c.notificacoesResults[index].imageUrl), ) : NetworkImage(c.notificacoesResults[index].imageUrl!)) as ImageProvider<Object>?,
// child: Image.asset( // child: Image.asset(
// 'assets/images/logo.png', // 'assets/images/logo.png',
// width: 40, // width: 40,
// ), // ),
), ),
onTap: onTap, onTap: onTap as void Function()?,
trailing: c.notificacoesResults[index].visualizado ? Text('') : Text('●',style: TextStyle(color: Colors.blue),), trailing: c.notificacoesResults[index].visualizado! ? Text('') : Text('●',style: TextStyle(color: Colors.blue),),
title: Text(c.notificacoesResults[index].titulo), title: Text(c.notificacoesResults[index].titulo!),
subtitle: Text(c.getDateFormatada(c.notificacoesResults[index].dataNotificacao)), subtitle: Text(c.getDateFormatada(c.notificacoesResults[index].dataNotificacao!)),
); );
} }
} }
lib/notificacoes/notificacoes_controller.dart
+12 -11
View File
@@ -5,13 +5,13 @@ import 'api/notificacoes_api.dart';
import 'api/notificacoes_classes.dart'; import 'api/notificacoes_classes.dart';
class NotificacoesController extends GetxController with SingleGetTickerProviderMixin{ class NotificacoesController extends GetxController with SingleGetTickerProviderMixin{
var notificacoesResults = List<NotificacaoResults>().obs; var notificacoesResults = <NotificacaoResults>[].obs;
bool loadMore = true; bool loadMore = true;
NotificacoesApi _api = new NotificacoesApi(); NotificacoesApi _api = new NotificacoesApi();
var notificacaoDetail = NotificacaoResponse().obs; var notificacaoDetail = NotificacaoResponse().obs;
int page = 1; int page = 1;
var errorCode = 0.obs; var errorCode = 0.obs;
var errorMessage = ''; String? errorMessage = '';
var loading = true.obs; var loading = true.obs;
var loadingDetail = true.obs; var loadingDetail = true.obs;
var like = ''.obs; var like = ''.obs;
@@ -45,27 +45,27 @@ class NotificacoesController extends GetxController with SingleGetTickerProvider
getNotificacoesBloc()async{ getNotificacoesBloc()async{
var response = await this._api.getNotificacoes(page); var response = await this._api.getNotificacoes(page);
this.loadMore = response.results.length < 1 ? false : true; this.loadMore = response.results!.length < 1 ? false : true;
if(response.errorCode != 0){ if(response.errorCode != 0){
this.errorCode.value = response.errorCode; this.errorCode.value = response.errorCode!;
this.errorMessage = response.errorMessage; this.errorMessage = response.errorMessage;
} }
else{ else{
//if(this.page > 1)this.listKey.currentState.insertItem(2,duration: const Duration(milliseconds: 1500)); //if(this.page > 1)this.listKey.currentState.insertItem(2,duration: const Duration(milliseconds: 1500));
page++; page++;
this.notificacoesResults.addAll(response.results); this.notificacoesResults.addAll(response.results!);
} }
if(this.loading.value)this.loading.value = false; if(this.loading.value)this.loading.value = false;
} }
getNotificacaoDetail(int id) async { getNotificacaoDetail(int? id) async {
this.loadingDetail.value = true; this.loadingDetail.value = true;
this.notificacaoDetail.value.result = new NotificacaoResults(); this.notificacaoDetail.value.result = new NotificacaoResults();
var response = await this._api.getNotificacao(id); var response = await this._api.getNotificacao(id);
this.notificacaoDetail.value = response; this.notificacaoDetail.value = response;
this.like.value = response.result.like; this.like.value = response.result!.like!;
this.loadingDetail.value = false; this.loadingDetail.value = false;
} }
@@ -80,10 +80,11 @@ class NotificacoesController extends GetxController with SingleGetTickerProvider
Future<void> notificacaoLikeBloc(NotificacaoLikeRequest item) async { Future<void> notificacaoLikeBloc(NotificacaoLikeRequest item) async {
var response = await this._api.notificacaoLike(item); var response = await this._api.notificacaoLike(item);
if(response != null && response.errorCode == 0) //if(response != null && response.errorCode == 0)
if(response.errorCode != null && response.errorCode == 0)
{ {
this.notificacaoDetail.value.result.like = item.like; this.notificacaoDetail.value.result!.like = item.like;
this.like.value = item.like; this.like.value = item.like!;
} }
} }
@@ -96,7 +97,7 @@ class NotificacoesController extends GetxController with SingleGetTickerProvider
return r; return r;
} }
Future<void> notificacaoLidaBloc(int notificacaoID) async { Future<void> notificacaoLidaBloc(int? notificacaoID) async {
return; return;
} }
} }
lib/pdfviewer/pdfviewer.dart
+14 -4
View File
@@ -1,6 +1,7 @@
import 'package:advance_pdf_viewer/advance_pdf_viewer.dart'; //import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
import 'package:decpisos/pdfviewer/pdfviewer_controller.dart'; import 'package:decpisos/pdfviewer/pdfviewer_controller.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_pdfview/flutter_pdfview.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
class PDFViewerScreen extends StatelessWidget { class PDFViewerScreen extends StatelessWidget {
@@ -18,13 +19,22 @@ class PDFViewerScreen extends StatelessWidget {
Obx(() => c.visibleRefresh.value ? IconButton(icon: Icon(Icons.refresh), onPressed: c.refreshPDF) : Container()) Obx(() => c.visibleRefresh.value ? IconButton(icon: Icon(Icons.refresh), onPressed: c.refreshPDF) : Container())
], ],
), ),
// body: Obx(() => c.loading.value
// ? Center(
// child: CircularProgressIndicator(),
// )
// : c.error.value ? c.buildError() : PDFViewer(
// lazyLoad: false,
// document: c.doc,
// )),
body: Obx(() => c.loading.value body: Obx(() => c.loading.value
? Center( ? Center(
child: CircularProgressIndicator(), child: CircularProgressIndicator(),
) )
: c.error.value ? c.buildError() : PDFViewer( : c.error.value ? c.buildError() : PDFView(
lazyLoad: false, filePath: c.filePDF!.path,
document: c.doc, //nightMode: true,
fitPolicy: FitPolicy.BOTH,
)), )),
); );
} }
lib/pdfviewer/pdfviewer_controller.dart
+33 -26
View File
@@ -1,8 +1,8 @@
import 'dart:io'; import 'dart:io' as io;
import 'package:flutter/foundation.dart';
import 'package:advance_pdf_viewer/advance_pdf_viewer.dart'; //import 'package:advance_pdf_viewer/advance_pdf_viewer.dart';
import 'package:decpisos/funcoes_gerais.dart'; import 'package:decpisos/funcoes_gerais.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:get/get.dart'; import 'package:get/get.dart';
import 'package:path_provider/path_provider.dart'; import 'package:path_provider/path_provider.dart';
@@ -13,8 +13,8 @@ class PDFViewerScreenController extends GetxController{
var loadPDF = false.obs; var loadPDF = false.obs;
var visibleRefresh = false.obs; var visibleRefresh = false.obs;
var error = false.obs; var error = false.obs;
PDFDocument doc; //PDFDocument doc = PDFDocument();
File _filePDF; io.File? filePDF;
@override @override
void onInit() { void onInit() {
@@ -24,18 +24,24 @@ class PDFViewerScreenController extends GetxController{
Future<void> _loadPDF() async { Future<void> _loadPDF() async {
var file = await this._createFileOfPdfUrl(); var file = await this._createFileOfPdfUrl();
if(file != null && await file.exists()){ // if(file != null && await file.exists()){
this.doc = await PDFDocument.fromFile(file); // //io.File fpdf = new io.File('${file.path}');
//this.visibleRefresh.value = true; // this.doc = await PDFDocument.fromFile(file);
} // //this.doc = await PDFDocument.fromFile(file);
else{ // //this.visibleRefresh.value = true;
if(await FuncoesGerais.checkInternetConnection() == false){ // }
this.error.value = true; // else{
} // if(await FuncoesGerais.checkInternetConnection() == false){
else{ // this.error.value = true;
this.doc = await PDFDocument.fromURL(FuncoesGerais.urlPDF); // }
} // else{
// this.doc = await PDFDocument.fromURL(FuncoesGerais.urlPDF);
// }
// }
if(file == null || await file.exists() == false){
this.error.value = true;
} }
this.loading.value = false; this.loading.value = false;
@@ -44,7 +50,7 @@ class PDFViewerScreenController extends GetxController{
Future<void> refreshPDF() async { Future<void> refreshPDF() async {
this.loading.value = true; this.loading.value = true;
try { try {
await this._filePDF.delete(); await this.filePDF!.delete();
this._loadPDF(); this._loadPDF();
} catch (e) { } catch (e) {
Get.rawSnackbar(message: 'Não possível atualizar o PDF. Tente novamente'); Get.rawSnackbar(message: 'Não possível atualizar o PDF. Tente novamente');
@@ -57,7 +63,7 @@ class PDFViewerScreenController extends GetxController{
this.loadPDF.value = true; this.loadPDF.value = true;
var file = await this._createFileOfPdfUrl(); var file = await this._createFileOfPdfUrl();
try { try {
Share.shareFiles([file.path], text: 'DecCard').then((value) => this.loadPDF.value = false); Share.shareFiles([file!.path], text: 'DecCard').then((value) => this.loadPDF.value = false);
} catch (e) { } catch (e) {
this.loadPDF.value = false; this.loadPDF.value = false;
Get.rawSnackbar(message: 'Não foi possível compartilhar o PDF'); Get.rawSnackbar(message: 'Não foi possível compartilhar o PDF');
@@ -65,16 +71,16 @@ class PDFViewerScreenController extends GetxController{
} }
Future<File> _createFileOfPdfUrl() async { Future<io.File?> _createFileOfPdfUrl() async {
final url = FuncoesGerais.urlPDF; final url = FuncoesGerais.urlPDF;
File file; io.File? file;
//f.File file2;
final filename = url.substring(url.lastIndexOf("/") + 1); final filename = url.substring(url.lastIndexOf("/") + 1);
String dir = (await getApplicationDocumentsDirectory()).path; String dir = (await getApplicationDocumentsDirectory()).path;
file = new File('$dir/$filename'); file = io.File('$dir/$filename');
if(!await file.exists()){ if(!await file.exists()){
if(await FuncoesGerais.checkInternetConnection()){ if(await FuncoesGerais.checkInternetConnection()){
var request = await HttpClient().getUrl(Uri.parse(url)); var request = await io.HttpClient().getUrl(Uri.parse(url));
var response = await request.close(); var response = await request.close();
var bytes = await consolidateHttpClientResponseBytes(response); var bytes = await consolidateHttpClientResponseBytes(response);
await file.writeAsBytes(bytes); await file.writeAsBytes(bytes);
@@ -83,8 +89,8 @@ class PDFViewerScreenController extends GetxController{
file = null; file = null;
} }
} }
this._filePDF = file; this.filePDF = file;
if(this._filePDF != null) this.visibleRefresh.value = await this._filePDF.exists(); if(this.filePDF != null) this.visibleRefresh.value = await this.filePDF!.exists();
return file; return file;
} }
@@ -98,7 +104,8 @@ class PDFViewerScreenController extends GetxController{
children: [ children: [
Text('Não foi possível carregar o PDF'), Text('Não foi possível carregar o PDF'),
SizedBox(height: 10.0,), SizedBox(height: 10.0,),
RaisedButton(onPressed: this.refreshPDF,child: Text('Atualizar'),) ElevatedButton(onPressed: this.refreshPDF,child: Text('Atualizar'))
//RaisedButton(onPressed: this.refreshPDF,child: Text('Atualizar'),)
], ],
), ),
); );
lib/splash/splash.dart
+1 -1
View File
@@ -35,7 +35,7 @@ class SplashScreen extends StatelessWidget {
backgroundColor: Colors.blueGrey.shade800, backgroundColor: Colors.blueGrey.shade800,
screenFunction: ()async{ screenFunction: ()async{
await c.firebaseCloudMessagingListeners(); await c.firebaseCloudMessagingListeners();
await c.verTutorial(); //await c.verTutorial();
var screen = await c.verUsuLogado(); var screen = await c.verUsuLogado();
return screen; return screen;
}, },
lib/splash/splash_controller.dart
+44 -24
View File
@@ -13,8 +13,9 @@ import '../funcoes_gerais.dart';
class SplashController extends GetxController { class SplashController extends GetxController {
bool _tutorialOk = false; //bool _tutorialOk = false;
FirebaseMessaging _firebaseMessaging = FirebaseMessaging(); //FirebaseMessaging _firebaseMessaging = FirebaseMessaging();
//FirebaseMessaging _firebaseMessaging = FirebaseMessaging.instance;
@override @override
void onInit() { void onInit() {
@@ -26,14 +27,14 @@ class SplashController extends GetxController {
super.onClose(); super.onClose();
} }
Future<void> verTutorial()async{ // Future<void> verTutorial()async{
SharedPreferences prefs = await SharedPreferences.getInstance(); // SharedPreferences prefs = await SharedPreferences.getInstance();
this._tutorialOk = prefs.getBool('tutorial') ?? false; // this._tutorialOk = prefs.getBool('tutorial') ?? false;
} // }
Future<Widget> verUsuLogado()async{ Future<Widget> verUsuLogado()async{
var resp = await FuncoesGerais.checkVersaoMinimaOk(); var resp = await FuncoesGerais.checkVersaoMinimaOk();
if(resp.vOk){ if(resp.vOk!){
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
var token = prefs.getString('token_notif'); var token = prefs.getString('token_notif');
await FuncoesGerais.registraDevice(token); await FuncoesGerais.registraDevice(token);
@@ -48,28 +49,46 @@ class SplashController extends GetxController {
Future<void> firebaseCloudMessagingListeners() async{ Future<void> firebaseCloudMessagingListeners() async{
try { try {
if (_firebaseMessaging == null) return; //if (_firebaseMessaging == null) return;
if (Platform.isIOS) iOSPermission(); if (Platform.isIOS) iOSPermission();
_firebaseMessaging.getToken().then((token) async { // _firebaseMessaging.getToken().then((token) async {
// print(token);
// SharedPreferences prefs = await SharedPreferences.getInstance();
// await prefs.setString('token_notif', token);
// });
FirebaseMessaging.instance.getToken().then((token) async{
print(token); print(token);
SharedPreferences prefs = await SharedPreferences.getInstance(); SharedPreferences prefs = await SharedPreferences.getInstance();
await prefs.setString('token_notif', token); await prefs.setString('token_notif', token!);
});
// _firebaseMessaging.configure(
// onLaunch: this._onNotification,
// onMessage: this._onNotification,
// //onBackgroundMessage: this._onNotification,
// onResume: this._onNotification
// );
FirebaseMessaging.onMessage.listen((RemoteMessage message) {
print('Push onMessage');
Get.snackbar(message.notification!.title ?? 'Notificação', message.notification!.body ?? 'Nova notificação',
mainButton: TextButton(onPressed: () => this._onNotification(message), child: Text('Ver')),
backgroundColor: Colors.black.withOpacity(0.7),
colorText: Colors.white
);
//this._onNotification(message);
});
FirebaseMessaging.onMessageOpenedApp.listen((RemoteMessage message) {
print('A new onMessageOpenedApp event was published!');
print(message);
//Get.snackbar(message.notification!.title ?? 'Notificação', message.notification!.body ?? 'Nova notificação',mainButton: TextButton(onPressed: () => this._onNotification(message), child: Text('Ver')));
}); });
_firebaseMessaging.configure(
onLaunch: this._onNotification,
onMessage: this._onNotification,
//onBackgroundMessage: this._onNotification,
onResume: this._onNotification
);
} on PlatformException catch (e) { } on PlatformException catch (e) {
print(e.message); print(e.message);
} }
} }
Future<dynamic> _onNotification(Map<String, dynamic> message) async{ void _onNotification(RemoteMessage message){
Get.to(() => NotificacoesScreen()); Get.to(() => NotificacoesScreen());
//print(message); //print(message);
//print(message['aps']['alert']['title']); //print(message['aps']['alert']['title']);
@@ -77,12 +96,13 @@ class SplashController extends GetxController {
} }
void iOSPermission() { void iOSPermission() {
_firebaseMessaging.requestNotificationPermissions( FirebaseMessaging.instance.requestPermission();
IosNotificationSettings(sound: true, badge: true, alert: true)); // _firebaseMessaging.requestNotificationPermissions(
_firebaseMessaging.onIosSettingsRegistered // IosNotificationSettings(sound: true, badge: true, alert: true));
.listen((IosNotificationSettings settings) { // _firebaseMessaging.onIosSettingsRegistered
print("Settings registered: $settings"); // .listen((IosNotificationSettings settings) {
}); // print("Settings registered: $settings");
// });
} }
} }
lib/videos/api/youtube_api.dart
+5 -4
View File
@@ -7,7 +7,7 @@ import 'youtube_classes.dart';
class YouTubeApi{ class YouTubeApi{
Future<YouTubeSearchResponse> getChannelVideos({String nextPageToken = ''}) async { Future<YouTubeSearchResponse> getChannelVideos({String? nextPageToken = ''}) async {
var retorno = new YouTubeSearchResponse( var retorno = new YouTubeSearchResponse(
errorCode: 0, errorCode: 0,
errorMessage: '', errorMessage: '',
@@ -25,12 +25,13 @@ class YouTubeApi{
String url = "https://www.googleapis.com/youtube/v3/search?key=${FuncoesGerais.youtubeApiKey}&channelId=${FuncoesGerais.channelId}&part=snippet,id&order=date&maxResults=10"; String url = "https://www.googleapis.com/youtube/v3/search?key=${FuncoesGerais.youtubeApiKey}&channelId=${FuncoesGerais.channelId}&part=snippet,id&order=date&maxResults=10";
if(nextPageToken.isNotEmpty) url += "&pageToken=$nextPageToken"; if(nextPageToken!.isNotEmpty) url += "&pageToken=$nextPageToken";
try{ try{
var response = await http.get(url); var response = await http.get(Uri.parse(url));
if (response != null) { //if (response != null) {
if (response.body.isNotEmpty) {
if (response.statusCode == 200) { if (response.statusCode == 200) {
var data = jsonDecode(response.body); var data = jsonDecode(response.body);
retorno = YouTubeSearchResponse.fromJson(data); retorno = YouTubeSearchResponse.fromJson(data);
lib/videos/api/youtube_classes.dart
+38 -38
View File
@@ -1,12 +1,12 @@
class YouTubeSearchResponse { class YouTubeSearchResponse {
String kind; String? kind;
String etag; String? etag;
String nextPageToken; String? nextPageToken;
String regionCode; String? regionCode;
PageInfo pageInfo; PageInfo? pageInfo;
List<YouTubeItems> items; List<YouTubeItems>? items;
int errorCode; int? errorCode;
String errorMessage; String? errorMessage;
YouTubeSearchResponse({this.kind, this.etag, this.nextPageToken, this.regionCode, this.pageInfo, this.items,this.errorCode = 0, this.errorMessage = ''}); YouTubeSearchResponse({this.kind, this.etag, this.nextPageToken, this.regionCode, this.pageInfo, this.items,this.errorCode = 0, this.errorMessage = ''});
@@ -17,8 +17,8 @@ class YouTubeSearchResponse {
regionCode = json['regionCode'] ?? ''; regionCode = json['regionCode'] ?? '';
pageInfo = json['pageInfo'] != null ? new PageInfo.fromJson(json['pageInfo']) : null; pageInfo = json['pageInfo'] != null ? new PageInfo.fromJson(json['pageInfo']) : null;
if (json['items'] != null) { if (json['items'] != null) {
items = new List<YouTubeItems>(); items = <YouTubeItems>[];
json['items'].forEach((v) { items.add(new YouTubeItems.fromJson(v)); }); json['items'].forEach((v) { items!.add(new YouTubeItems.fromJson(v)); });
} }
errorCode = 0; errorCode = 0;
errorMessage = ''; errorMessage = '';
@@ -26,8 +26,8 @@ class YouTubeSearchResponse {
} }
class PageInfo { class PageInfo {
int totalResults; int? totalResults;
int resultsPerPage; int? resultsPerPage;
PageInfo({this.totalResults, this.resultsPerPage}); PageInfo({this.totalResults, this.resultsPerPage});
@@ -45,10 +45,10 @@ class PageInfo {
} }
class YouTubeItems { class YouTubeItems {
String kind; String? kind;
String etag; String? etag;
Id id; Id? id;
Snippet snippet; Snippet? snippet;
YouTubeItems({this.kind, this.etag, this.id, this.snippet}); YouTubeItems({this.kind, this.etag, this.id, this.snippet});
@@ -64,18 +64,18 @@ class YouTubeItems {
data['kind'] = this.kind; data['kind'] = this.kind;
data['etag'] = this.etag; data['etag'] = this.etag;
if (this.id != null) { if (this.id != null) {
data['id'] = this.id.toJson(); data['id'] = this.id!.toJson();
} }
if (this.snippet != null) { if (this.snippet != null) {
data['snippet'] = this.snippet.toJson(); data['snippet'] = this.snippet!.toJson();
} }
return data; return data;
} }
} }
class Id { class Id {
String kind; String? kind;
String videoId; String? videoId;
Id({this.kind, this.videoId}); Id({this.kind, this.videoId});
@@ -93,14 +93,14 @@ class Id {
} }
class Snippet { class Snippet {
String publishedAt; String? publishedAt;
String channelId; String? channelId;
String title; String? title;
String description; String? description;
Thumbnails thumbnails; Thumbnails? thumbnails;
String channelTitle; String? channelTitle;
String liveBroadcastContent; String? liveBroadcastContent;
String publishTime; String? publishTime;
Snippet({this.publishedAt, this.channelId, this.title, this.description, this.thumbnails, this.channelTitle, this.liveBroadcastContent, this.publishTime}); Snippet({this.publishedAt, this.channelId, this.title, this.description, this.thumbnails, this.channelTitle, this.liveBroadcastContent, this.publishTime});
@@ -122,7 +122,7 @@ class Snippet {
data['title'] = this.title; data['title'] = this.title;
data['description'] = this.description; data['description'] = this.description;
if (this.thumbnails != null) { if (this.thumbnails != null) {
data['thumbnails'] = this.thumbnails.toJson(); data['thumbnails'] = this.thumbnails!.toJson();
} }
data['channelTitle'] = this.channelTitle; data['channelTitle'] = this.channelTitle;
data['liveBroadcastContent'] = this.liveBroadcastContent; data['liveBroadcastContent'] = this.liveBroadcastContent;
@@ -132,9 +132,9 @@ class Snippet {
} }
class Thumbnails { class Thumbnails {
ThumbDefault thumbDefault; ThumbDefault? thumbDefault;
ThumbDefault medium; ThumbDefault? medium;
ThumbDefault high; ThumbDefault? high;
Thumbnails({this.thumbDefault, this.medium, this.high}); Thumbnails({this.thumbDefault, this.medium, this.high});
@@ -147,22 +147,22 @@ class Thumbnails {
Map<String, dynamic> toJson() { Map<String, dynamic> toJson() {
final Map<String, dynamic> data = new Map<String, dynamic>(); final Map<String, dynamic> data = new Map<String, dynamic>();
if (this.thumbDefault != null) { if (this.thumbDefault != null) {
data['default'] = this.thumbDefault.toJson(); data['default'] = this.thumbDefault!.toJson();
} }
if (this.medium != null) { if (this.medium != null) {
data['medium'] = this.medium.toJson(); data['medium'] = this.medium!.toJson();
} }
if (this.high != null) { if (this.high != null) {
data['high'] = this.high.toJson(); data['high'] = this.high!.toJson();
} }
return data; return data;
} }
} }
class ThumbDefault { class ThumbDefault {
String url; String? url;
int width; int? width;
int height; int? height;
ThumbDefault({this.url, this.width, this.height}); ThumbDefault({this.url, this.width, this.height});
lib/videos/bloc/youtube_controller.dart
+10 -10
View File
@@ -15,7 +15,7 @@ class YouTubeController extends GetxController {
var itens = <YouTubeItems>[].obs; var itens = <YouTubeItems>[].obs;
bool atualizar = false; bool atualizar = false;
var errorCode = 0.obs; var errorCode = 0.obs;
var errorMessage = ''; String? errorMessage = '';
var loading = true.obs; var loading = true.obs;
final f = DateFormat('dd/MM/yyyy HH:mm:ss'); final f = DateFormat('dd/MM/yyyy HH:mm:ss');
@@ -41,23 +41,23 @@ class YouTubeController extends GetxController {
Future<void> getChannelVideosBloc({String textoBusca = '-'}) async { Future<void> getChannelVideosBloc({String textoBusca = '-'}) async {
//this.loading.value = true; //this.loading.value = true;
if (results == null || atualizar || results.value.errorCode != 0) { if (results.value.errorCode == null || atualizar || results.value.errorCode != 0) {
results.value = new YouTubeSearchResponse(); results.value = new YouTubeSearchResponse();
this.itens = new RxList<YouTubeItems>(); this.itens = new RxList<YouTubeItems>();
results.value = await this._api.getChannelVideos(); results.value = await this._api.getChannelVideos();
results.value.items = results.value.items.where((element) => GetUtils.isNullOrBlank(element.id.videoId) == false).toList(); results.value.items = results.value.items!.where((element) => GetUtils.isNullOrBlank(element.id!.videoId) == false).toList();
this.itens.addAll(results.value.items); this.itens.addAll(results.value.items!);
this.errorCode.value = results.value.errorCode; this.errorCode.value = results.value.errorCode!;
this.errorMessage = results.value.errorMessage; this.errorMessage = results.value.errorMessage;
this.atualizar = false; this.atualizar = false;
} else if (results.value.nextPageToken != null && results.value.nextPageToken.isNotEmpty) { } else if (results.value.nextPageToken != null && results.value.nextPageToken!.isNotEmpty) {
var more = await this._api.getChannelVideos(nextPageToken: results.value.nextPageToken); var more = await this._api.getChannelVideos(nextPageToken: results.value.nextPageToken);
more.items = more.items.where((element) => GetUtils.isNullOrBlank(element.id.videoId) == false).toList(); more.items = more.items!.where((element) => GetUtils.isNullOrBlank(element.id!.videoId) == false).toList();
this.errorCode.value = more.errorCode; this.errorCode.value = more.errorCode!;
this.errorMessage = more.errorMessage; this.errorMessage = more.errorMessage;
this.itens.addAll(more.items); this.itens.addAll(more.items!);
results.value.nextPageToken = more.nextPageToken ?? ''; results.value.nextPageToken = more.nextPageToken ?? '';
results.value.items += more.items; results.value.items!.addAll(more.items!);
} }
if(this.errorCode.value == -5){ if(this.errorCode.value == -5){
this._ic.tabsWithoutVideos(); this._ic.tabsWithoutVideos();
lib/videos/youtube_video_player.dart
+5 -5
View File
@@ -5,19 +5,19 @@ import 'api/youtube_classes.dart';
class YouTubeVideoPlayerScreen extends StatefulWidget { class YouTubeVideoPlayerScreen extends StatefulWidget {
final YouTubeItems ytVideo; final YouTubeItems ytVideo;
YouTubeVideoPlayerScreen({@required this.ytVideo}); YouTubeVideoPlayerScreen({required this.ytVideo});
@override @override
_YouTubeVideoPlayerScreenState createState() => _YouTubeVideoPlayerScreenState(); _YouTubeVideoPlayerScreenState createState() => _YouTubeVideoPlayerScreenState();
} }
class _YouTubeVideoPlayerScreenState extends State<YouTubeVideoPlayerScreen> { class _YouTubeVideoPlayerScreenState extends State<YouTubeVideoPlayerScreen> {
YoutubePlayerController _controller; late YoutubePlayerController _controller;
bool _fullScreen = false; bool _fullScreen = false;
@override @override
void initState() { void initState() {
super.initState(); super.initState();
_controller = new YoutubePlayerController(initialVideoId: widget.ytVideo.id.videoId); _controller = new YoutubePlayerController(initialVideoId: widget.ytVideo.id!.videoId!);
} }
@override @override
@@ -58,9 +58,9 @@ class _YouTubeVideoPlayerScreenState extends State<YouTubeVideoPlayerScreen> {
padding: const EdgeInsets.all(8.0), padding: const EdgeInsets.all(8.0),
child: Column( child: Column(
children: [ children: [
Text(widget.ytVideo.snippet.title), Text(widget.ytVideo.snippet!.title!),
SizedBox(height: 10.0,), SizedBox(height: 10.0,),
Text(widget.ytVideo.snippet.description), Text(widget.ytVideo.snippet!.description!),
], ],
), ),
) )
lib/videos/youtube_videos.dart
+8 -7
View File
@@ -219,7 +219,7 @@ class _YouTubeVideosScreenState extends State<YouTubeVideosScreen> with Automati
// child: this._buildListTile(index) // child: this._buildListTile(index)
// ); // );
} else if (index > 1) { } else if (index > 1) {
if (!GetUtils.isNullOrBlank(c.results.value.nextPageToken)) { if (!GetUtils.isNullOrBlank(c.results.value.nextPageToken)!) {
c.getChannelVideosBloc(); c.getChannelVideosBloc();
return Center(child: CircularProgressIndicator(),); return Center(child: CircularProgressIndicator(),);
} else { } else {
@@ -248,7 +248,7 @@ class _YouTubeVideosScreenState extends State<YouTubeVideosScreen> with Automati
Widget listItem(YouTubeItems item) { Widget listItem(YouTubeItems item) {
return InkWell( return InkWell(
onTap: (){ onTap: (){
if(GetUtils.isNullOrBlank(item.id.videoId)){ if(GetUtils.isNullOrBlank(item.id!.videoId)!){
Get.rawSnackbar(message: 'Não foi possível reproduzir o vídeo'); Get.rawSnackbar(message: 'Não foi possível reproduzir o vídeo');
} }
else{ else{
@@ -281,21 +281,21 @@ class _YouTubeVideosScreenState extends State<YouTubeVideosScreen> with Automati
crossAxisAlignment: CrossAxisAlignment.start, crossAxisAlignment: CrossAxisAlignment.start,
children: <Widget>[ children: <Widget>[
Text( Text(
item.snippet.title, item.snippet!.title!,
softWrap: true, softWrap: true,
maxLines: 2, maxLines: 2,
style: TextStyle(fontSize: 13.0,fontWeight: FontWeight.bold), style: TextStyle(fontSize: 13.0,fontWeight: FontWeight.bold),
), ),
Padding(padding: EdgeInsets.only(bottom: 1.5)), Padding(padding: EdgeInsets.only(bottom: 1.5)),
Text( Text(
item.snippet.description, item.snippet!.description!,
softWrap: true, softWrap: true,
maxLines: 3, maxLines: 3,
style: TextStyle(fontSize: 11.0,fontWeight: FontWeight.w400), style: TextStyle(fontSize: 11.0,fontWeight: FontWeight.w400),
), ),
Padding(padding: EdgeInsets.only(bottom: 3.0)), Padding(padding: EdgeInsets.only(bottom: 3.0)),
Text( Text(
c.getDateFormatada(item.snippet.publishedAt), c.getDateFormatada(item.snippet!.publishedAt!),
softWrap: true, softWrap: true,
maxLines: 1, maxLines: 1,
style: TextStyle(fontSize: 9.0,fontWeight: FontWeight.w300), style: TextStyle(fontSize: 9.0,fontWeight: FontWeight.w300),
@@ -315,8 +315,9 @@ class _YouTubeVideosScreenState extends State<YouTubeVideosScreen> with Automati
mainAxisAlignment: MainAxisAlignment.center, mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.center, crossAxisAlignment: CrossAxisAlignment.center,
children: [ children: [
Text(c.errorMessage), Text(c.errorMessage!),
RaisedButton(onPressed: c.refresh, child: Text('Atualizar'),) ElevatedButton(onPressed: c.refresh, child: Text('Atualizar'))
//RaisedButton(onPressed: c.refresh, child: Text('Atualizar'),)
], ],
), ),
); );
pubspec.lock
+182 -182
View File
@@ -1,254 +1,275 @@
# Generated by pub # Generated by pub
# See https://dart.dev/tools/pub/glossary#lockfile # See https://dart.dev/tools/pub/glossary#lockfile
packages: packages:
advance_pdf_viewer:
dependency: "direct main"
description:
name: advance_pdf_viewer
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.2"
animated_splash_screen: animated_splash_screen:
dependency: "direct main" dependency: "direct main"
description: description:
name: animated_splash_screen name: animated_splash_screen
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1+2" version: "1.1.0"
animations: animations:
dependency: "direct main" dependency: "direct main"
description: description:
name: animations name: animations
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "2.0.0"
archive: archive:
dependency: transitive dependency: transitive
description: description:
name: archive name: archive
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.0.13" version: "3.1.2"
args: args:
dependency: transitive dependency: transitive
description: description:
name: args name: args
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.0" version: "2.0.0"
async: async:
dependency: transitive dependency: transitive
description: description:
name: async name: async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.5.0-nullsafety.1" version: "2.6.1"
boolean_selector: boolean_selector:
dependency: transitive dependency: transitive
description: description:
name: boolean_selector name: boolean_selector
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.1" version: "2.1.0"
characters: characters:
dependency: transitive dependency: transitive
description: description:
name: characters name: characters
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.3" version: "1.1.0"
charcode: charcode:
dependency: transitive dependency: transitive
description: description:
name: charcode name: charcode
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
chewie: chewie:
dependency: transitive dependency: transitive
description: description:
name: chewie name: chewie
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.2" version: "1.2.0"
chewie_audio: chewie_audio:
dependency: transitive dependency: transitive
description: description:
name: chewie_audio name: chewie_audio
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.2" version: "1.2.0"
circular_reveal_animation: circular_reveal_animation:
dependency: "direct main" dependency: "direct main"
description: description:
name: circular_reveal_animation name: circular_reveal_animation
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.5" version: "2.0.0"
clock: clock:
dependency: transitive dependency: transitive
description: description:
name: clock name: clock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.1" version: "1.1.0"
collection: collection:
dependency: transitive dependency: transitive
description: description:
name: collection name: collection
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.15.0-nullsafety.3" version: "1.15.0"
convert:
dependency: transitive
description:
name: convert
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.1"
convex_bottom_bar: convex_bottom_bar:
dependency: "direct main" dependency: "direct main"
description: description:
name: convex_bottom_bar name: convex_bottom_bar
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.7.1+2" version: "3.0.0"
crypto: crypto:
dependency: transitive dependency: transitive
description: description:
name: crypto name: crypto
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "3.0.1"
css_colors:
dependency: transitive
description:
name: css_colors
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
csslib: csslib:
dependency: transitive dependency: transitive
description: description:
name: csslib name: csslib
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.16.2" version: "0.17.0"
cupertino_icons: cupertino_icons:
dependency: "direct main" dependency: "direct main"
description: description:
name: cupertino_icons name: cupertino_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0" version: "1.0.3"
device_info: device_info:
dependency: "direct main" dependency: "direct main"
description: description:
name: device_info name: device_info
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0" version: "2.0.2"
device_info_platform_interface: device_info_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: device_info_platform_interface name: device_info_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" version: "2.0.1"
fake_async: fake_async:
dependency: transitive dependency: transitive
description: description:
name: fake_async name: fake_async
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
ffi: ffi:
dependency: transitive dependency: transitive
description: description:
name: ffi name: ffi
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "1.1.1"
file: file:
dependency: transitive dependency: transitive
description: description:
name: file name: file
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.2.1" version: "6.1.1"
firebase_core:
dependency: "direct main"
description:
name: firebase_core
url: "https://pub.dartlang.org"
source: hosted
version: "1.2.0"
firebase_core_platform_interface:
dependency: transitive
description:
name: firebase_core_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "4.0.1"
firebase_core_web:
dependency: transitive
description:
name: firebase_core_web
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
firebase_messaging: firebase_messaging:
dependency: "direct main" dependency: "direct main"
description: description:
name: firebase_messaging name: firebase_messaging
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "6.0.16" version: "10.0.0"
firebase_messaging_platform_interface:
dependency: transitive
description:
name: firebase_messaging_platform_interface
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.0"
firebase_messaging_web:
dependency: transitive
description:
name: firebase_messaging_web
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
flutter: flutter:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_cache_manager:
dependency: transitive
description:
name: flutter_cache_manager
url: "https://pub.dartlang.org"
source: hosted
version: "2.1.2"
flutter_html: flutter_html:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_html name: flutter_html
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0" version: "2.0.0"
flutter_inappwebview: flutter_inappwebview:
dependency: transitive dependency: transitive
description: description:
name: flutter_inappwebview name: flutter_inappwebview
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.0.0+4" version: "5.3.2"
flutter_launcher_icons: flutter_launcher_icons:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: flutter_launcher_icons name: flutter_launcher_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.8.1" version: "0.9.0"
flutter_layout_grid: flutter_layout_grid:
dependency: transitive dependency: transitive
description: description:
name: flutter_layout_grid name: flutter_layout_grid
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.10.5" version: "1.0.1"
flutter_localizations: flutter_localizations:
dependency: "direct main" dependency: "direct main"
description: flutter description: flutter
source: sdk source: sdk
version: "0.0.0" version: "0.0.0"
flutter_math_fork:
dependency: transitive
description:
name: flutter_math_fork
url: "https://pub.dartlang.org"
source: hosted
version: "0.3.3"
flutter_native_splash: flutter_native_splash:
dependency: "direct dev" dependency: "direct dev"
description: description:
name: flutter_native_splash name: flutter_native_splash
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.3.2" version: "1.1.8+4"
flutter_pdfview:
dependency: "direct main"
description:
name: flutter_pdfview
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.0"
flutter_staggered_animations: flutter_staggered_animations:
dependency: "direct main" dependency: "direct main"
description: description:
name: flutter_staggered_animations name: flutter_staggered_animations
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.3" version: "1.0.0"
flutter_svg: flutter_svg:
dependency: transitive dependency: transitive
description: description:
name: flutter_svg name: flutter_svg
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.19.1" version: "0.22.0"
flutter_test: flutter_test:
dependency: "direct dev" dependency: "direct dev"
description: flutter description: flutter
@@ -265,273 +286,252 @@ packages:
name: get name: get
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.26.0" version: "4.1.4"
html: html:
dependency: transitive dependency: transitive
description: description:
name: html name: html
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.14.0+4" version: "0.15.0"
http: http:
dependency: "direct main" dependency: "direct main"
description: description:
name: http name: http
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.2" version: "0.13.3"
http_parser: http_parser:
dependency: transitive dependency: transitive
description: description:
name: http_parser name: http_parser
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.4" version: "4.0.0"
image: image:
dependency: transitive dependency: transitive
description: description:
name: image name: image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.19" version: "3.0.2"
import_js_library:
dependency: transitive
description:
name: import_js_library
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.2"
infinite_listview:
dependency: transitive
description:
name: infinite_listview
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.1+1"
intl: intl:
dependency: transitive dependency: transitive
description: description:
name: intl name: intl
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.16.1" version: "0.17.0"
js: js:
dependency: transitive dependency: transitive
description: description:
name: js name: js
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.2" version: "0.6.3"
line_icons: line_icons:
dependency: "direct main" dependency: "direct main"
description: description:
name: line_icons name: line_icons
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.2" version: "2.0.1"
matcher: matcher:
dependency: transitive dependency: transitive
description: description:
name: matcher name: matcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.12.10-nullsafety.1" version: "0.12.10"
meta: meta:
dependency: transitive dependency: transitive
description: description:
name: meta name: meta
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
mime: mime:
dependency: transitive dependency: transitive
description: description:
name: mime name: mime
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.9.7" version: "1.0.0"
numberpicker: nested:
dependency: transitive dependency: transitive
description: description:
name: numberpicker name: nested
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0" version: "1.0.0"
page_transition: page_transition:
dependency: transitive dependency: transitive
description: description:
name: page_transition name: page_transition
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.7+6" version: "2.0.1-nullsafety.0"
path: path:
dependency: transitive dependency: transitive
description: description:
name: path name: path
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0-nullsafety.1" version: "1.8.0"
path_drawing: path_drawing:
dependency: transitive dependency: transitive
description: description:
name: path_drawing name: path_drawing
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.4.1+1" version: "0.5.1"
path_parsing: path_parsing:
dependency: transitive dependency: transitive
description: description:
name: path_parsing name: path_parsing
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4" version: "0.2.1"
path_provider: path_provider:
dependency: "direct main" dependency: "direct main"
description: description:
name: path_provider name: path_provider
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.6.28" version: "2.0.2"
path_provider_linux: path_provider_linux:
dependency: transitive dependency: transitive
description: description:
name: path_provider_linux name: path_provider_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+2" version: "2.0.0"
path_provider_macos: path_provider_macos:
dependency: transitive dependency: transitive
description: description:
name: path_provider_macos name: path_provider_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.4+8" version: "2.0.0"
path_provider_platform_interface: path_provider_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: path_provider_platform_interface name: path_provider_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "2.0.1"
path_provider_windows: path_provider_windows:
dependency: transitive dependency: transitive
description: description:
name: path_provider_windows name: path_provider_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.4+3" version: "2.0.1"
pedantic: pedantic:
dependency: transitive dependency: transitive
description: description:
name: pedantic name: pedantic
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.9.2" version: "1.11.0"
petitparser: petitparser:
dependency: transitive dependency: transitive
description: description:
name: petitparser name: petitparser
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.1.0" version: "4.1.0"
platform: platform:
dependency: transitive dependency: transitive
description: description:
name: platform name: platform
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "3.0.0"
plugin_platform_interface: plugin_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: plugin_platform_interface name: plugin_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.3" version: "2.0.0"
process: process:
dependency: transitive dependency: transitive
description: description:
name: process name: process
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "3.0.13" version: "4.2.1"
provider:
dependency: transitive
description:
name: provider
url: "https://pub.dartlang.org"
source: hosted
version: "5.0.0"
quiver: quiver:
dependency: transitive dependency: transitive
description: description:
name: quiver name: quiver
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.5" version: "3.0.1"
rxdart:
dependency: transitive
description:
name: rxdart
url: "https://pub.dartlang.org"
source: hosted
version: "0.25.0"
sa_v1_migration:
dependency: transitive
description:
name: sa_v1_migration
url: "https://pub.dartlang.org"
source: hosted
version: "1.1.2"
share: share:
dependency: "direct main" dependency: "direct main"
description: description:
name: share name: share
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.6.5+4" version: "2.0.4"
shared_preferences: shared_preferences:
dependency: "direct main" dependency: "direct main"
description: description:
name: shared_preferences name: shared_preferences
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.5.12+4" version: "2.0.6"
shared_preferences_linux: shared_preferences_linux:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_linux name: shared_preferences_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.2+4" version: "2.0.0"
shared_preferences_macos: shared_preferences_macos:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_macos name: shared_preferences_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+11" version: "2.0.0"
shared_preferences_platform_interface: shared_preferences_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_platform_interface name: shared_preferences_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.4" version: "2.0.0"
shared_preferences_web: shared_preferences_web:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_web name: shared_preferences_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.2+7" version: "2.0.0"
shared_preferences_windows: shared_preferences_windows:
dependency: transitive dependency: transitive
description: description:
name: shared_preferences_windows name: shared_preferences_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.2+3" version: "2.0.0"
simple_animations: simple_animations:
dependency: "direct main" dependency: "direct main"
description: description:
name: simple_animations name: simple_animations
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.5.1" version: "3.1.1"
sky_engine: sky_engine:
dependency: transitive dependency: transitive
description: flutter description: flutter
@@ -543,231 +543,231 @@ packages:
name: source_span name: source_span
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.8.0-nullsafety.2" version: "1.8.1"
sqflite:
dependency: transitive
description:
name: sqflite
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.2+4"
sqflite_common:
dependency: transitive
description:
name: sqflite_common
url: "https://pub.dartlang.org"
source: hosted
version: "1.0.3+3"
stack_trace: stack_trace:
dependency: transitive dependency: transitive
description: description:
name: stack_trace name: stack_trace
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.10.0-nullsafety.1" version: "1.10.0"
stream_channel: stream_channel:
dependency: transitive dependency: transitive
description: description:
name: stream_channel name: stream_channel
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.1" version: "2.1.0"
string_scanner: string_scanner:
dependency: transitive dependency: transitive
description: description:
name: string_scanner name: string_scanner
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.1.0-nullsafety.1" version: "1.1.0"
supercharged: supercharged:
dependency: "direct main" dependency: "direct main"
description: description:
name: supercharged name: supercharged
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.12.0" version: "2.0.0"
supercharged_dart: supercharged_dart:
dependency: transitive dependency: transitive
description: description:
name: supercharged_dart name: supercharged_dart
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.4.0" version: "2.0.0"
synchronized:
dependency: transitive
description:
name: synchronized
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.0+2"
term_glyph: term_glyph:
dependency: transitive dependency: transitive
description: description:
name: term_glyph name: term_glyph
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.2.0-nullsafety.1" version: "1.2.0"
test_api: test_api:
dependency: transitive dependency: transitive
description: description:
name: test_api name: test_api
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.19-nullsafety.2" version: "0.3.0"
transparent_image: transparent_image:
dependency: "direct main" dependency: "direct main"
description: description:
name: transparent_image name: transparent_image
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.0" version: "2.0.0"
tuple:
dependency: transitive
description:
name: tuple
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.0"
typed_data: typed_data:
dependency: transitive dependency: transitive
description: description:
name: typed_data name: typed_data
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.3.0-nullsafety.3" version: "1.3.0"
universal_io:
dependency: transitive
description:
name: universal_io
url: "https://pub.dartlang.org"
source: hosted
version: "2.0.4"
url_launcher: url_launcher:
dependency: "direct main" dependency: "direct main"
description: description:
name: url_launcher name: url_launcher
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "5.7.10" version: "6.0.4"
url_launcher_linux: url_launcher_linux:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_linux name: url_launcher_linux
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+4" version: "2.0.0"
url_launcher_macos: url_launcher_macos:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_macos name: url_launcher_macos
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+9" version: "2.0.0"
url_launcher_platform_interface: url_launcher_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_platform_interface name: url_launcher_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.9" version: "2.0.3"
url_launcher_web: url_launcher_web:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_web name: url_launcher_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.5+3" version: "2.0.0"
url_launcher_windows: url_launcher_windows:
dependency: transitive dependency: transitive
description: description:
name: url_launcher_windows name: url_launcher_windows
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.0.1+3" version: "2.0.0"
uuid:
dependency: transitive
description:
name: uuid
url: "https://pub.dartlang.org"
source: hosted
version: "2.2.2"
vector_math: vector_math:
dependency: transitive dependency: transitive
description: description:
name: vector_math name: vector_math
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.1.0-nullsafety.3" version: "2.1.0"
video_player: video_player:
dependency: transitive dependency: transitive
description: description:
name: video_player name: video_player
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.1" version: "2.1.4"
video_player_platform_interface: video_player_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: video_player_platform_interface name: video_player_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.0" version: "4.1.0"
video_player_web: video_player_web:
dependency: transitive dependency: transitive
description: description:
name: video_player_web name: video_player_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.4+1" version: "2.0.0"
wakelock: wakelock:
dependency: transitive dependency: transitive
description: description:
name: wakelock name: wakelock
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.2.1+1" version: "0.5.2"
wakelock_macos:
dependency: transitive
description:
name: wakelock_macos
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.0+1"
wakelock_platform_interface: wakelock_platform_interface:
dependency: transitive dependency: transitive
description: description:
name: wakelock_platform_interface name: wakelock_platform_interface
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.0+1" version: "0.2.1+1"
wakelock_web: wakelock_web:
dependency: transitive dependency: transitive
description: description:
name: wakelock_web name: wakelock_web
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.0+3" version: "0.2.0+1"
wakelock_windows:
dependency: transitive
description:
name: wakelock_windows
url: "https://pub.dartlang.org"
source: hosted
version: "0.1.0"
webview_flutter: webview_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: webview_flutter name: webview_flutter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.0.7" version: "2.0.8"
win32: win32:
dependency: transitive dependency: transitive
description: description:
name: win32 name: win32
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "1.7.4+1" version: "2.1.2"
xdg_directories: xdg_directories:
dependency: transitive dependency: transitive
description: description:
name: xdg_directories name: xdg_directories
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "0.1.2" version: "0.2.0"
xml: xml:
dependency: transitive dependency: transitive
description: description:
name: xml name: xml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "4.5.1" version: "5.1.1"
yaml: yaml:
dependency: transitive dependency: transitive
description: description:
name: yaml name: yaml
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "2.2.1" version: "3.1.0"
youtube_player_flutter: youtube_player_flutter:
dependency: "direct main" dependency: "direct main"
description: description:
name: youtube_player_flutter name: youtube_player_flutter
url: "https://pub.dartlang.org" url: "https://pub.dartlang.org"
source: hosted source: hosted
version: "7.0.0+7" version: "8.0.0"
sdks: sdks:
dart: ">=2.10.2 <2.11.0" dart: ">=2.13.0 <3.0.0"
flutter: ">=1.22.2 <2.0.0" flutter: ">=2.0.0"
pubspec.yaml
+27 -25
View File
@@ -18,7 +18,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.0+1 version: 1.0.0+1
environment: environment:
sdk: ">=2.7.0 <3.0.0" sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
flutter: flutter:
@@ -29,34 +29,36 @@ dependencies:
# The following adds the Cupertino Icons font to your application. # The following adds the Cupertino Icons font to your application.
# Use with the CupertinoIcons class for iOS style icons. # Use with the CupertinoIcons class for iOS style icons.
cupertino_icons: ^1.0.0 cupertino_icons: ^1.0.3
webview_flutter: ^1.0.7 webview_flutter: ^2.0.8
convex_bottom_bar: ^2.7.1+2 convex_bottom_bar: ^3.0.0
http: ^0.12.2 http: ^0.13.3
transparent_image: ^1.0.0 transparent_image: ^2.0.0
flutter_staggered_animations: ^0.1.3 flutter_staggered_animations: ^1.0.0
simple_animations: ^2.5.1 simple_animations: ^3.1.1
circular_reveal_animation: ^1.1.5 circular_reveal_animation: ^2.0.0
supercharged: ^1.12.0 supercharged: ^2.0.0
url_launcher: ^5.7.10 url_launcher: ^6.0.4
flutter_html: ^1.2.0 flutter_html: ^2.0.0
device_info: ^1.0.0 device_info: ^2.0.2
firebase_messaging: 6.0.16 firebase_core: ^1.2.0
get: ^3.26.0 firebase_messaging: ^10.0.0
line_icons: ^1.3.2 get: ^4.1.4
animated_splash_screen: ^1.0.1+2 line_icons: ^2.0.1
animations: ^1.1.2 animated_splash_screen: ^1.1.0
shared_preferences: ^0.5.12+4 animations: ^2.0.0
youtube_player_flutter: ^7.0.0+7 shared_preferences: ^2.0.6
share: ^0.6.5+4 youtube_player_flutter: ^8.0.0
advance_pdf_viewer: ^1.2.2 share: ^2.0.4
path_provider: ^1.6.28 #advance_pdf_viewer: ^2.0.0
path_provider: ^2.0.2
flutter_pdfview: ^1.1.0
dev_dependencies: dev_dependencies:
flutter_test: flutter_test:
sdk: flutter sdk: flutter
flutter_launcher_icons: ^0.8.1 flutter_launcher_icons: ^0.9.0
flutter_native_splash: ^0.3.2 flutter_native_splash: ^1.1.8+4
flutter_icons: flutter_icons:
android: true android: true