Skip to content

Commit 53b861b

Browse files
thiago-tavares-brisathiago-tavares-brisa
authored
Feature/revse 3691 (#9)
* [feature/REVSE-3664] Ajuste na fonte do IonTitle * [feature/REVSE-3664] Ajuste de padding no dialog e button, permitir imagem externa no IonMedia * [feature/REVSE-3664] Ajuste de espaçamento * [feature/REVSE-3664] Ajuste no tamanho da fonte e quebra de linha para título * [feature/REVSE-3664] Ajustes de tamanho, responsividade. * [feature/REVSE-3691] Componentização do IonAnimatedIconText * [feature/REVSE-3691] Atualização na main * [feature/REVSE-3691] Adicionado lottie as dependências e ajustes na main * [feature/REVSE-3691] Atualização do gradle para nova versão do flutter * [feature/REVSE-3691] Ajustando lib lottie
1 parent d33bf29 commit 53b861b

File tree

18 files changed

+444
-151
lines changed

18 files changed

+444
-151
lines changed

‎.flutter-plugins‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# This is a generated file; do not edit or check into version control.
2-
video_player=/home/brisanet/.pub-cache/hosted/pub.dev/video_player-2.9.1/
3-
video_player_android=/home/brisanet/.pub-cache/hosted/pub.dev/video_player_android-2.7.5/
4-
video_player_avfoundation=/home/brisanet/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.1/
5-
video_player_web=/home/brisanet/.pub-cache/hosted/pub.dev/video_player_web-2.3.2/
2+
video_player=/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player-2.9.2/
3+
video_player_android=/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_android-2.7.17/
4+
video_player_avfoundation=/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.7/
5+
video_player_web=/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_web-2.3.3/

‎.flutter-plugins-dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"video_player_avfoundation","path":"/home/brisanet/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"video_player_android","path":"/home/brisanet/.pub-cache/hosted/pub.dev/video_player_android-2.7.5/","native_build":true,"dependencies":[]}],"macos":[{"name":"video_player_avfoundation","path":"/home/brisanet/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.1/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"video_player_web","path":"/home/brisanet/.pub-cache/hosted/pub.dev/video_player_web-2.3.2/","dependencies":[]}]},"dependencyGraph":[{"name":"video_player","dependencies":["video_player_android","video_player_avfoundation","video_player_web"]},{"name":"video_player_android","dependencies":[]},{"name":"video_player_avfoundation","dependencies":[]},{"name":"video_player_web","dependencies":[]}],"date_created":"2024-10-01 09:22:23.271175","version":"3.24.2","swift_package_manager_enabled":false}
1+
{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"video_player_avfoundation","path":"/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.7/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"android":[{"name":"video_player_android","path":"/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_android-2.7.17/","native_build":true,"dependencies":[]}],"macos":[{"name":"video_player_avfoundation","path":"/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_avfoundation-2.6.7/","shared_darwin_source":true,"native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"video_player_web","path":"/home/thiago.tavares/.pub-cache/hosted/pub.dev/video_player_web-2.3.3/","dependencies":[]}]},"dependencyGraph":[{"name":"video_player","dependencies":["video_player_android","video_player_avfoundation","video_player_web"]},{"name":"video_player_android","dependencies":[]},{"name":"video_player_avfoundation","dependencies":[]},{"name":"video_player_web","dependencies":[]}],"date_created":"2025-01-28 10:16:59.034024","version":"3.27.3","swift_package_manager_enabled":false}

‎.vscode/settings.json‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"java.configuration.updateBuildConfiguration": "interactive"
3+
}

‎example/android/app/build.gradle‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ apply plugin: 'kotlin-android'
2626
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"
2727

2828
android {
29+
namespace 'com.example.example'
2930
compileSdkVersion flutter.compileSdkVersion
3031
ndkVersion flutter.ndkVersion
3132

‎example/android/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
buildscript {
2-
ext.kotlin_version = '1.7.0'
2+
ext.kotlin_version = '1.9.10'
33
repositories {
44
google()
55
mavenCentral()
66
}
77

88
dependencies {
9-
classpath 'com.android.tools.build:gradle:7.1.2'
9+
classpath 'com.android.tools.build:gradle:8.1.2'
1010
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1111
}
1212
}

‎example/android/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

‎example/assets/lottie/searching.json‎

Lines changed: 1 addition & 0 deletions
Large diffs are not rendered by default.

‎example/lib/main.dart‎

Lines changed: 78 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ import 'package:ion_mobile/design/dialogs/component_dialog/ion_icon_text.dart';
1212
import 'package:ion_mobile/design/dialogs/component_dialog/ion_media.dart';
1313
import 'package:ion_mobile/design/dialogs/component_dialog/ion_progress.dart';
1414
import 'package:ion_mobile/design/dialogs/component_dialog/ion_title.dart';
15+
import 'package:ion_mobile/design/dialogs/component_dialog/ion_animated_icon_text.dart';
1516
import 'package:ion_mobile/design/dialogs/custom_dialog/custom_dialog.dart';
1617
import 'package:ion_mobile/design/iconography/ion_icons.dart';
1718
import 'package:ion_mobile/ion_mobile.dart';
19+
import 'package:ion_mobile/utils/constants.dart';
1820
import 'package:ion_mobile/widgets/input/input.dart';
21+
import 'package:lottie/lottie.dart';
1922
import 'package:video_player/video_player.dart';
2023
import 'widgets/date_picker.component.dart';
2124

25+
2226
void main() {
2327
runApp(ScreenUtilInit(
2428
designSize: const Size(360, 800),
@@ -50,12 +54,11 @@ class _HomeState extends State<Home> {
5054
"assets/videos/tutorial_route_1.mp4",
5155
videoPlayerOptions: VideoPlayerOptions(allowBackgroundPlayback: true));
5256

53-
Future<void> initVideos() async {
57+
Future<void> initVideos() async {
5458
if (initialized) return;
5559
initialized = true;
5660
await videoController.initialize();
5761
videoController.setLooping(true);
58-
5962
}
6063

6164
@override
@@ -92,90 +95,95 @@ class _HomeState extends State<Home> {
9295
isLoading = !isLoading;
9396
showDialog(
9497
context: context,
95-
builder: (_) => IonCustomDialog(
96-
97-
componentDialogList: [
98-
99-
IonTitle(title: 'Título aqui', divider: true, close: true),
100-
IonProgress(loading: true, text: 'Carregando', padding: 20),
101-
IonIconMessage(
102-
typeIcon: IconTypeIcon.positive,
103-
message: 'Mensagem aqui!',
104-
),
105-
IonMedia(
106-
imageUrl: IonImages.securityPolicies,
107-
// videoController: videoController,
108-
// future: initVideos()
109-
),
110-
IonIconText(
111-
icon: IonIcons.pencil,
112-
text: RichText(
113-
textAlign: TextAlign.center,
114-
text: TextSpan(
115-
text: 'Texto regular, ',
98+
builder: (_) => IonCustomDialog(componentDialogList: [
99+
IonTitle(
100+
title: 'Título aqui', divider: true, close: true),
101+
IonProgress(
102+
loading: true, text: 'Carregando', padding: 20),
103+
IonIconMessage(
104+
typeIcon: IconTypeIcon.positive,
105+
message: 'Mensagem aqui!',
106+
),
107+
IonAnimatedIconText(
108+
cardPadding: const EdgeInsets.symmetric(
109+
horizontal: 24, vertical: 14),
110+
icon: SizedBox(
111+
height: 128,
112+
child:
113+
Lottie.asset(AnimationConstants.searching)),
114+
messages: const [
115+
'Por favor, aguarde nessa tela enquanto buscamos uma ordem de serviço para você!',
116+
'Aguarde mais um momento... estamos realizando uma nova busca.',
117+
'Continue aqui, ainda estamos buscando uma ordem de serviço para você.'
118+
],
119+
),
120+
IonIconText(
121+
icon: IonIcons.pencil,
122+
text: RichText(
123+
textAlign: TextAlign.center,
124+
text: TextSpan(
125+
text: 'Texto regular, ',
126+
style: TextStyle(
127+
fontSize: 16.sp,
128+
height: 1.4,
129+
color: IonMainColors.neutral7,
130+
),
131+
children: [
132+
TextSpan(
133+
text: ' bold ',
116134
style: TextStyle(
117135
fontSize: 16.sp,
118136
height: 1.4,
119137
color: IonMainColors.neutral7,
138+
fontWeight: FontWeight.bold,
120139
),
121-
children: [
122-
TextSpan(
123-
text: ' bold ',
124-
style: TextStyle(
125-
fontSize: 16.sp,
126-
height: 1.4,
127-
color: IonMainColors.neutral7,
128-
fontWeight: FontWeight.bold,
129-
),
130-
),
131-
TextSpan(
132-
text: 'ou',
133-
style: TextStyle(
134-
fontSize: 16.sp,
135-
height: 1.4,
136-
color: IonMainColors.neutral7,
137-
),
138-
),
139-
TextSpan(
140-
text: ' itálico!',
141-
style: TextStyle(
142-
fontSize: 16.sp,
143-
fontStyle: FontStyle.italic,
144-
height: 1.4,
145-
color: IonMainColors.neutral7,
146-
),
147-
),
148-
],
149140
),
150-
)),
151-
152-
IonIconText(
153-
icon: IonIcons.localization,
154-
text: Expanded(
155-
child: Text(
156-
'Testando este componente',
141+
TextSpan(
142+
text: 'ou',
157143
style: TextStyle(
158144
fontSize: 16.sp,
145+
height: 1.4,
159146
color: IonMainColors.neutral7,
160147
),
161148
),
162-
)),
163-
IonIconText(
164-
text: Expanded(
165-
child: Text(
166-
'Testando este componente asasasasas asdfsdgvfdgbsfsd asdsadasdad asdsadsadsad asdss',
149+
TextSpan(
150+
text: ' itálico!',
167151
style: TextStyle(
168152
fontSize: 16.sp,
153+
fontStyle: FontStyle.italic,
154+
height: 1.4,
169155
color: IonMainColors.neutral7,
170156
),
171157
),
172-
)),
173-
IonDoubleButtom(
174-
// divider: true,
175-
txtFirstButton: 'Ação Principal',
176-
txtSecondButton: 'Fechar',
177-
onTapFirstButton: () {})
178-
]));
158+
],
159+
),
160+
)),
161+
IonIconText(
162+
icon: IonIcons.localization,
163+
text: Expanded(
164+
child: Text(
165+
'Testando este componente',
166+
style: TextStyle(
167+
fontSize: 16.sp,
168+
color: IonMainColors.neutral7,
169+
),
170+
),
171+
)),
172+
IonIconText(
173+
text: Expanded(
174+
child: Text(
175+
'Testando este componente asasasasas asdfsdgvfdgbsfsd asdsadasdad asdsadsadsad asdss',
176+
style: TextStyle(
177+
fontSize: 16.sp,
178+
color: IonMainColors.neutral7,
179+
),
180+
),
181+
)),
182+
IonDoubleButtom(
183+
txtFirstButton: 'Ação Principal',
184+
txtSecondButton: 'Fechar',
185+
onTapFirstButton: () {})
186+
]));
179187
}),
180188
),
181189
const SizedBox(

0 commit comments

Comments
 (0)