Skip to content

Commit

Permalink
Merge pull request #261 from dherediat97/feature/add-horus-vision
Browse files Browse the repository at this point in the history
feature: add horus vision
  • Loading branch information
dherediat97 authored Aug 28, 2024
2 parents cd1f6c3 + ff3fa4c commit 1fd49ed
Show file tree
Hide file tree
Showing 20 changed files with 81 additions and 8 deletions.
3 changes: 2 additions & 1 deletion lib/app/l10n/app_es.arb
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"add_to_my_list": "Añadir a mi lista",
"unknown": "Desconocido",
"search": "Buscar",
"percentange_vote":"% de los usuarios les gusta"
"percentange_vote":"% de los usuarios les gusta",
"buy_tickets":"Reserva entradas"
}
6 changes: 6 additions & 0 deletions lib/app/l10n/localizations/app_localizations.dart
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,12 @@ abstract class AppLocalizations {
/// In es, this message translates to:
/// **'% de los usuarios les gusta'**
String get percentange_vote;

/// No description provided for @buy_tickets.
///
/// In es, this message translates to:
/// **'Reserva entradas'**
String get buy_tickets;
}

class _AppLocalizationsDelegate extends LocalizationsDelegate<AppLocalizations> {
Expand Down
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_de.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsDe extends AppLocalizations {

@override
String get percentange_vote => '% Likes';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_en.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsEn extends AppLocalizations {

@override
String get percentange_vote => '% likes';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_es.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsEs extends AppLocalizations {

@override
String get percentange_vote => '% de los usuarios les gusta';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_fi.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsFi extends AppLocalizations {

@override
String get percentange_vote => '% tykkäyksiä';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_fr.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsFr extends AppLocalizations {

@override
String get percentange_vote => '% goûts';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_hi.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsHi extends AppLocalizations {

@override
String get percentange_vote => '% पसंद';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_is.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsIs extends AppLocalizations {

@override
String get percentange_vote => '% líkar við';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_it.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsIt extends AppLocalizations {

@override
String get percentange_vote => '% Mi piace';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_ja.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsJa extends AppLocalizations {

@override
String get percentange_vote => '% いいね!';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_nl.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsNl extends AppLocalizations {

@override
String get percentange_vote => '% vind-ik-leuks';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_pt.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsPt extends AppLocalizations {

@override
String get percentange_vote => '% curtidas';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_sk.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsSk extends AppLocalizations {

@override
String get percentange_vote => '% páči sa mi';

@override
String get buy_tickets => 'Reserva entradas';
}
3 changes: 3 additions & 0 deletions lib/app/l10n/localizations/app_localizations_sv.dart
Original file line number Diff line number Diff line change
Expand Up @@ -124,4 +124,7 @@ class AppLocalizationsSv extends AppLocalizations {

@override
String get percentange_vote => '% gillar';

@override
String get buy_tickets => 'Reserva entradas';
}
1 change: 1 addition & 0 deletions lib/app/routes/app_paths.dart
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,5 @@ class AppRoutePaths {
static String personDetailsRoute = '/personDetails';

static String settingsRoute = '/settings';
static String horusVisionRoute = '/horusVision';
}
1 change: 0 additions & 1 deletion lib/main.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ GetIt getIt = GetIt.instance;

void main() async {
await initDi();
//await horus_vision.initDi();
WidgetsFlutterBinding.ensureInitialized();

runApp(FilmFlu());
Expand Down
33 changes: 29 additions & 4 deletions lib/presentation/features/media_details/media_detail_screen.dart
Original file line number Diff line number Diff line change
@@ -1,13 +1,18 @@
import 'package:film_flu/app/constants/app_colors.dart';
import 'package:film_flu/app/extensions/localizations_extensions.dart';
import 'package:film_flu/app/routes/app_paths.dart';
import 'package:film_flu/presentation/features/bottom_app_bar/bloc/home_bloc.dart';
import 'package:film_flu/presentation/features/media_details/bloc/media_detail_bloc.dart';
import 'package:film_flu/presentation/features/media_details/widgets/detail_tab_media_item.dart';
import 'package:film_flu/presentation/widgets/custom_scaffold_page.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:go_router/go_router.dart';
import 'package:youtube_player_iframe/youtube_player_iframe.dart';

import 'package:horusvision/app/di/di.dart' as horus_vision;

class MediaItemScreenDetails extends StatefulWidget {
const MediaItemScreenDetails({
super.key,
Expand All @@ -27,6 +32,7 @@ class _MovieDetailsPageState extends State<MediaItemScreenDetails> {
void initState() {
super.initState();
_trailerController = initTrailerController();
_trailerController?.toggleFullScreen(lock: false);
}

@override
Expand All @@ -47,8 +53,24 @@ class _MovieDetailsPageState extends State<MediaItemScreenDetails> {
return ScaffoldPage(
floatingActionButton: Padding(
padding: const EdgeInsets.all(4.0),
child: state.trailerId.isNotEmpty
? !state.isTrailerOpened
child: Column(
mainAxisSize: MainAxisSize.max,
crossAxisAlignment: CrossAxisAlignment.center,
mainAxisAlignment: MainAxisAlignment.end,
children: [
FloatingActionButton.extended(
foregroundColor: AppColors.primaryColor,
backgroundColor: AppColors.backgroundColorLight,
onPressed: () {
// context.go(AppRoutePaths.horusVisionRoute);
},
icon: const Icon(Icons.local_movies_outlined),
label: Text(context.localizations.buy_tickets),
),
const SizedBox(
height: 20,
),
state.trailerId.isNotEmpty
? FloatingActionButton.extended(
icon: const Icon(Icons.play_arrow),
label: Text(context.localizations.play_trailer),
Expand Down Expand Up @@ -83,6 +105,7 @@ class _MovieDetailsPageState extends State<MediaItemScreenDetails> {
height: MediaQuery.of(context).size.height,
width: MediaQuery.of(context).size.width,
child: YoutubePlayerScaffold(
aspectRatio: 100.0,
controller: _trailerController!,
builder: (context, player) {
return player;
Expand All @@ -94,8 +117,9 @@ class _MovieDetailsPageState extends State<MediaItemScreenDetails> {
);
},
)
: Container()
: Container(),
: Container(),
],
),
),
child: DetailTabMediaItem(
mediaTypeSelected: mediaTypeSelected,
Expand All @@ -106,6 +130,7 @@ class _MovieDetailsPageState extends State<MediaItemScreenDetails> {
}

initTrailerController() {
// await horus_vision.initDi();
return YoutubePlayerController(
params: const YoutubePlayerParams(
showControls: false,
Expand Down
2 changes: 2 additions & 0 deletions lib/presentation/widgets/custom_scaffold_page.dart
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@ class _ScaffoldPageState extends State<ScaffoldPage> {
},
builder: (context, state) {
return Scaffold(
floatingActionButtonLocation: FloatingActionButtonLocation.endFloat,
floatingActionButton: widget.floatingActionButton,
appBar: !widget.fullScreenMode
? PreferredSize(
preferredSize: const Size.fromHeight(70),
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: film_flu
description: A project of movies and something more
publish_to: 'none' # Remove this line if you wish to publish to pub.dev
version: 1.0.1+15
version: 1.0.2+15

environment:
sdk: '>=3.0.5 <4.0.0'
Expand All @@ -12,7 +12,7 @@ dependencies:
flutter_localizations:
sdk: flutter

horusvision: ^0.0.5
horusvision: ^0.1.1

go_router: ^14.2.0

Expand Down

0 comments on commit 1fd49ed

Please sign in to comment.