Skip to content
This repository was archived by the owner on Apr 6, 2024. It is now read-only.

replaced memory magic with memorez #111

Open
The-Jewell wants to merge 3 commits into
base: development
Choose a base branch
from
Open

replaced memory magic with memorez #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d48383
replaced memory magic with memorez
The-Jewell Apr 2, 2022
d9e5270
Update i18n.dart
Daryle Apr 2, 2022
f10062f
Merge branch 'development' into bug/memorez_again
Tomentosa Apr 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions i18n/ar-SY.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"walkthroughScreen": "مقدمة",
"cloudSetupPrompt": "هل ترغب في إعداد حساب سحابي؟",
"no": "لا",
"welcome": "مرحبًا بك في Memory Magic",
"welcome": "مرحبًا بك في Memoreez",
"back": "خلف",
"next": "التالي",
"selectLanguage": "الرجاء تحديد لغتك الأساسية.",
Expand Down Expand Up @@ -68,7 +68,7 @@
"turnOnHourlyWalkNotification": "قم بتشغيل الإعلام للمشي كل ساعة",
"turnOnHourlyWaterNotification": "قم بتشغيل الإخطار للحصول على المياه كل ساعة",
"turnOnBathroomNotification": "قم بتشغيل الإعلام للحمام",
"walkthroughVideoLine": "إليك مقطع فيديو لتوضيح موجز حول كيفية استخدام تطبيق Memory Magic",
"walkthroughVideoLine": "إليك مقطع فيديو لتوضيح موجز حول كيفية استخدام تطبيق Memoreez",
"micLimitedAccess": "سيتم تقييد الميزات دون السماح بالوصول إلى الميكروفون الخاص بك.",
"notesNotificiations": "ملاحظات الإخطارات",
"generalSettingsScreen": "إعدادات",
Expand Down
4 changes: 2 additions & 2 deletions i18n/en-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"walkthroughScreen": "Introduction",
"cloudSetupPrompt": "Would you like to setup a cloud account?",
"no": "No",
"welcome": "Welcome to Memory Magic",
"welcome": "Welcome to Memoreez",
"back": "Back",
"next": "Next",
"selectLanguage": "Please select your primary language.",
Expand Down Expand Up @@ -70,7 +70,7 @@
"turnOnHourlyWalkNotification": "Turn on Notification for hourly Walk",
"turnOnHourlyWaterNotification": "Turn on Notification for hourly Water",
"turnOnBathroomNotification": "Turn on Notification for Bathroom",
"walkthroughVideoLine": "Here is a video to a brief walkthrough of how to use Memory Magic App",
"walkthroughVideoLine": "Here is a video to a brief walkthrough of how to use Memoreez App",
"micLimitedAccess": "Features will be limited without allowing access to your microphone.",
"shouldICreateANote": "Should I create a note?",
"willNotCreateNote": "Ok, I will not create a note.",
Expand Down
4 changes: 2 additions & 2 deletions i18n/es-US.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"walkthroughScreen": "Introducción",
"cloudSetupPrompt": "¿Le gustaría configurar una cuenta en la nube?",
"no": "No",
"welcome": "Bienvenido a Memory Magic",
"welcome": "Bienvenido a Memoreez",
"back": "atrás",
"next": "próximo",
"selectLanguage": "Seleccione su idioma principal.",
Expand Down Expand Up @@ -68,7 +68,7 @@
"turnOnHourlyWalkNotification": "Activar Notificación para Caminata por horas",
"turnOnHourlyWaterNotification": "Activar la notificación de agua por hora",
"turnOnBathroomNotification": "Activar la notificación para el baño",
"walkthroughVideoLine": "Aquí hay un video de un breve tutorial sobre cómo usar la aplicación Memory Magic",
"walkthroughVideoLine": "Aquí hay un video de un breve tutorial sobre cómo usar la aplicación Memoreez",
"micLimitedAccess": "Las funciones serán limitadas sin permitir el acceso a su micrófono.",
"notesNotificiations": "Notificaciones de notas",
"generalSettingsScreen": "Ajustes",
Expand Down
4 changes: 2 additions & 2 deletions i18n/pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"walkthroughScreen": "Introdução",
"cloudSetupPrompt": "Você gostaria de configurar uma conta na nuvem?",
"no": "Não",
"welcome": "Bem-vindo ao Memory Magic",
"welcome": "Bem-vindo ao Memoreez",
"back": "Voltar",
"next": "Próximo",
"selectLanguage": "Selecione seu idioma principal.",
Expand Down Expand Up @@ -68,7 +68,7 @@
"turnOnHourlyWalkNotification": "Ativar notificação para caminhada de hora em hora",
"turnOnHourlyWaterNotification": "Ativar notificação para água de hora em hora",
"turnOnBathroomNotification": "Ativar notificação para banheiro",
"walkthroughVideoLine": "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memory Magic",
"walkthroughVideoLine": "Aqui está um vídeo com um breve passo a passo de como usar o aplicativo Memoreez",
"micLimitedAccess": "Os recursos serão limitados sem permitir o acesso ao seu microfone.",
"notesNotificiations": "Notificações de notas",
"generalSettingsScreen": "Definições",
Expand Down
2 changes: 1 addition & 1 deletion i18n/zh-CN.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"turnOnHourlyWalkNotification": "打开每小时步行的通知",
"turnOnHourlyWaterNotification": "打开每小时水的通知",
"turnOnBathroomNotification": "打开浴室通知",
"walkthroughVideoLine": "以下视频简要介绍了如何使用 Memory Magic App",
"walkthroughVideoLine": "以下视频简要介绍了如何使用 Memoreez App",
"micLimitedAccess": "功能将受到限制，不允许访问您的麦克风。",
"notesNotificiations": "笔记通知",
"generalSettingsScreen": "设置",
Expand Down
18 changes: 9 additions & 9 deletions lib/Screens/Components/VideoPlayer.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,13 @@ class VideoPlayerScreen extends StatefulWidget {
//String tab;
String title;
String videoUrl;
VideoPlayerScreen({Key? key, this.title="Memory Magic Preview", this.videoUrl=""}) : super(key: key);
VideoPlayerScreen(
{Key? key, this.title = "Memoreez Preview", this.videoUrl = ""})
: super(key: key);

@override
_VideoPlayerScreenState createState() => _VideoPlayerScreenState(this.title, this.videoUrl);
_VideoPlayerScreenState createState() =>
_VideoPlayerScreenState(this.title, this.videoUrl);
}

class _VideoPlayerScreenState extends State<VideoPlayerScreen> {
Expand All @@ -19,14 +22,14 @@ class _VideoPlayerScreenState extends State<VideoPlayerScreen> {
//late String tab;
late String title;
late String videoUrlpath;
_VideoPlayerScreenState( this.title, this.videoUrlpath);
_VideoPlayerScreenState(this.title, this.videoUrlpath);

@override
void initState() {
// Create and store the VideoPlayerController. The VideoPlayerController
// offers several different constructors to play videos from assets, files,
// or the internet.
//_controller = VideoPlayerController.network(
//_controller = VideoPlayerController.network(
// 'https://assets.mixkit.co/videos/preview/mixkit-daytime-city-traffic-aerial-view-56-large.mp4');
_controller = VideoPlayerController.asset(this.videoUrlpath);

Expand Down Expand Up @@ -54,8 +57,6 @@ class _VideoPlayerScreenState extends State<VideoPlayerScreen> {

@override
Widget build(BuildContext context) {


return Scaffold(
appBar: AppBar(
title: Text("${this.title}"),
Expand All @@ -74,9 +75,8 @@ class _VideoPlayerScreenState extends State<VideoPlayerScreen> {
//child: VideoPlayer(_controller),
Center(
child: AspectRatio(
aspectRatio: _controller.value.aspectRatio,
child: Chewie(controller: chewieController
),
aspectRatio: _controller.value.aspectRatio,
child: Chewie(controller: chewieController),
));
} else {
// If the VideoPlayerController is still initializing, show a
Expand Down
Loading