Skip to content

Commit

Permalink
Theme changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@KyleKun
KyleKun committed Dec 24, 2023
1 parent 25ffda4 commit f78abd3
Show file tree
Hide file tree
Showing 28 changed files with 246 additions and 90 deletions.
2 changes: 1 addition & 1 deletion lib/lang/ca.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ const Map<String, String> ca = {
'sendLogsDescription':
'Si us trobeu davant d’un problema, premeu «Sí» per incloure els registres que m’ajudaran a trobar el problema. Si voleu suggerir una característica o qualsevol altra cosa, premeu «No».',
'whatsNewDescv152':
'La versió 1.6.0 porta diverses correccions i millores!\n\nFeu-hi una ullada a les següents pàgines 😊',
'La versió 1.5.2 porta diverses correccions i millores!\n\nFeu-hi una ullada a les següents pàgines 😊',
'feat1v152': 'Processament de vídeo més ràpid',
'featDesc1v152': 'El procés d’edició de vídeos llargs ara és molt més ràpid 🚀',
'feat2v152': 'Millora en la retallada dels vídeos',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/cs.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const Map<String, String> cs = {
'sendLogsDescription':
'Pokud se potýkáte s problémem, klepněte prosím na "Ano", abyste zahrnuli záznamy, které mi pomohou problém najít. Pokud jde o návrh funkce nebo jiné téma, klepněte prosím na "Ne".',
'whatsNewDescv152':
'Verze 1.6.0 přinesla několik oprav a vylepšení!\n\nPodívejte se na následujících stránkách 😊',
'Verze 1.5.2 přinesla několik oprav a vylepšení!\n\nPodívejte se na následujících stránkách 😊',
'feat1v152': 'Rychlejší zpracování videa',
'featDesc1v152': 'Úprava velkých videí je nyní mnohem rychlejší 🚀',
'feat2v152': 'Vylepšené zastřihávání videa',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/de.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const Map<String, String> de = {
'sendLogsDescription':
'Wenn Sie auf ein Problem stoßen, tippen Sie bitte auf "Ja", um die Protokolle einzuschließen, die mir helfen, das Problem zu finden. Wenn es sich um einen Verbesserungsvorschlag oder ein anderes Thema handelt, tippen Sie bitte auf "Nein".',
'whatsNewDescv152':
'Version 1.6.0 brachte mehrere Korrekturen und Verbesserungen!\n\nSchauen Sie sich die nächsten Seiten an 😊',
'Version 1.5.2 brachte mehrere Korrekturen und Verbesserungen!\n\nSchauen Sie sich die nächsten Seiten an 😊',
'feat1v152': 'Schnellere Videobearbeitung',
'featDesc1v152': 'Die Bearbeitung großer Videos geht jetzt viel schneller 🚀',
'feat2v152': 'Verbessertes Videoschneiden',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/en.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ const Map<String, String> en = {
'sendLogsDescription':
'If you are facing an issue, please tap "Yes" to include the logs that will help me find the problem. If it\'s a feature suggestion or other topic, please tap "No".',
'whatsNewDescv152':
'Version 1.6.0 brought several fixes and improvements!\n\nCheck it out in the next pages 😊',
'Version 1.5.2 brought several fixes and improvements!\n\nCheck it out in the next pages 😊',
'feat1v152': 'Faster Video Processing',
'featDesc1v152': 'Editing large videos is now much faster 🚀',
'feat2v152': 'Improved Video Trimming',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/es.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const Map<String, String> es = {
'sendLogsDescription':
'Si te enfrentas a un problema, por favor toca "Sí" para incluir los registros que me ayudarán a encontrar el problema. Si es una sugerencia de función u otro tema, por favor toca "No".',
'whatsNewDescv152':
'¡La versión 1.6.0 trajo varias correcciones y mejoras!\n\n¡Échale un vistazo en las próximas páginas 😊!',
'¡La versión 1.5.2 trajo varias correcciones y mejoras!\n\n¡Échale un vistazo en las próximas páginas 😊!',
'feat1v152': 'Procesamiento de video más rápido',
'featDesc1v152': 'Editar videos grandes es ahora mucho más rápido 🚀',
'feat2v152': 'Mejora en el recorte de video',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/fr.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const Map<String, String> fr = {
'sendLogsDescription':
'Si vous rencontrez un problème, veuillez appuyer sur "Oui" pour inclure les journaux qui m\'aideront à trouver le problème. Si c\'est une suggestion de fonctionnalité ou un autre sujet, veuillez appuyer sur "Non".',
'whatsNewDescv152':
'La version 1.6.0 a apporté plusieurs corrections et améliorations!\n\nDécouvrez-le dans les pages suivantes 😊',
'La version 1.5.2 a apporté plusieurs corrections et améliorations!\n\nDécouvrez-le dans les pages suivantes 😊',
'feat1v152': 'Traitement vidéo plus rapide',
'featDesc1v152': 'L\'édition de grandes vidéos est maintenant beaucoup plus rapide 🚀',
'feat2v152': 'Amélioration de la découpe vidéo',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/id.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ const Map<String, String> id = {
'sendLogsDescription':
'Jika Anda menghadapi masalah, silakan tekan "Ya" untuk menyertakan log yang akan membantu saya menemukan masalahnya. Jika ini adalah saran fitur atau topik lain, silakan tekan "Tidak".',
'whatsNewDescv152':
'Versi 1.6.0 membawa berbagai perbaikan dan peningkatan!\n\nLihat di halaman berikutnya 😊',
'Versi 1.5.2 membawa berbagai perbaikan dan peningkatan!\n\nLihat di halaman berikutnya 😊',
'feat1v152': 'Pemrosesan Video Lebih Cepat',
'featDesc1v152': 'Mengedit video besar kini jauh lebih cepat 🚀',
'feat2v152': 'Pemotongan Video Ditingkatkan',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/pt.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ const Map<String, String> pt = {
'sendLogsDescription':
'Se você está enfrentando um problema, por favor toque em "Sim" para incluir os logs que me ajudarão a encontrar o problema. Se for uma sugestão ou outro tópico, por favor toque em "Não".',
'whatsNewDescv152':
'A versão 1.6.0 trouxe várias correções e melhorias!\n\nConfira nas próximas páginas 😊',
'A versão 1.5.2 trouxe várias correções e melhorias!\n\nConfira nas próximas páginas 😊',
'feat1v152': 'Processamento Mais Rápido',
'featDesc1v152': 'Editar vídeos grandes ficou muito mais rápido 🚀',
'feat2v152': 'Melhoria na Edição de Vídeos',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/ru.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,7 @@ const Map<String, String> ru = {
'sendLogsDescription':
'Если у вас возникла проблема, пожалуйста, нажмите "Да", чтобы включить журналы, которые помогут мне найти проблему. Если это предложение по функционалу или другая тема, пожалуйста, нажмите "Нет".',
'whatsNewDescv152':
'Версия 1.6.0 принесла несколько исправлений и улучшений!\n\nПосмотрите на следующих страницах 😊',
'Версия 1.5.2 принесла несколько исправлений и улучшений!\n\nПосмотрите на следующих страницах 😊',
'feat1v152': 'Быстрее обработка видео',
'featDesc1v152': 'Редактирование больших видео теперь намного быстрее 🚀',
'feat2v152': 'Улучшенное обрезание видео',
Expand Down
2 changes: 1 addition & 1 deletion lib/lang/zh.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ const Map<String, String> zh = {
'change': '更改',
'sendLogs': '发送日志？',
'sendLogsDescription': '如果您遇到问题，请点击“是”以包含将帮助我找到问题的日志。如果这是一个功能建议或其他话题，请点击“否”。',
'whatsNewDescv152': '1.6.0版本带来了几个修复和改进！\n\n在接下来的页面中查看 😊',
'whatsNewDescv152': '1.5.2版本带来了几个修复和改进！\n\n在接下来的页面中查看 😊',
'feat1v152': '更快的视频处理',
'featDesc1v152': '现在编辑大视频更加快速 🚀',
'feat2v152': '改进的视频剪辑',
Expand Down
10 changes: 9 additions & 1 deletion lib/pages/donation/donation_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,15 @@ class DonationPage extends StatelessWidget {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('donationPageTitle'.tr),
iconTheme: const IconThemeData(
color: Colors.white,
),
title: Text(
'donationPageTitle'.tr,
style: const TextStyle(
color: Colors.white,
),
),
),
body: Column(
children: [
Expand Down
2 changes: 2 additions & 0 deletions lib/pages/home/base/widgets/app_bar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,12 @@ class CustomAppBar extends StatelessWidget implements PreferredSizeWidget {
style: TextStyle(
fontFamily: 'Magic',
fontSize: MediaQuery.of(context).size.width * 0.05,
color: Colors.white,
),
),
actions: [
PopupMenuButton<String>(
iconColor: Colors.white,
onSelected: popupAction,
itemBuilder: (BuildContext context) {
return options.map((String option) {
Expand Down
56 changes: 28 additions & 28 deletions lib/pages/home/base/widgets/bottom_app_bar.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import 'package:salomon_bottom_bar/salomon_bottom_bar.dart';

import '../../../../controllers/bottom_app_bar_index_controller.dart';
import '../../../../utils/constants.dart';
import '../../../../utils/theme.dart';

SalomonBottomBarItem _bottomBarItem({
required IconData icon,
Expand All @@ -25,34 +26,33 @@ SalomonBottomBarItem _bottomBarItem({
class CustomBottomAppBar extends GetView<BottomAppBarIndexController> {
@override
Widget build(BuildContext context) {
return BottomAppBar(
child: Obx(
() => SalomonBottomBar(
currentIndex: controller.activeIndex.value,
onTap: controller.setBottomAppBarIndex,
items: [
_bottomBarItem(
icon: Icons.add_a_photo_outlined,
title: 'record'.tr,
color: AppColors.green,
),
_bottomBarItem(
icon: Icons.calendar_month_outlined,
title: 'calendar'.tr,
color: AppColors.yellow,
),
_bottomBarItem(
icon: Icons.movie_filter_outlined,
title: 'movies'.tr,
color: AppColors.mainColor,
),
_bottomBarItem(
icon: Icons.settings_outlined,
title: 'settings'.tr,
color: AppColors.purple,
),
],
),
return Obx(
() => SalomonBottomBar(
backgroundColor: ThemeService().isDarkTheme() ? AppColors.dark : AppColors.light,
currentIndex: controller.activeIndex.value,
onTap: controller.setBottomAppBarIndex,
items: [
_bottomBarItem(
icon: Icons.add_a_photo_outlined,
title: 'record'.tr,
color: AppColors.green,
),
_bottomBarItem(
icon: Icons.calendar_month_outlined,
title: 'calendar'.tr,
color: AppColors.yellow,
),
_bottomBarItem(
icon: Icons.movie_filter_outlined,
title: 'movies'.tr,
color: AppColors.mainColor,
),
_bottomBarItem(
icon: Icons.settings_outlined,
title: 'settings'.tr,
color: AppColors.purple,
),
],
),
);
}
Expand Down
21 changes: 18 additions & 3 deletions lib/pages/home/calendar_editor/calendar_editor_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
}

bool shouldIgnoreExperimentalFilter() {
final useFilter = SharedPrefsUtil.getBool('useFilterInExperimentalPicker') ?? true;
final useFilter = SharedPrefsUtil.getBool('useFilterInExperimentalPicker') ?? false;
if (!useFilter) return true;
if (_selectedDate.day == DateTime.now().day &&
_selectedDate.month == DateTime.now().month &&
Expand Down Expand Up @@ -275,7 +275,10 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
style: TextButton.styleFrom(
foregroundColor: ThemeService().isDarkTheme() ? AppColors.light : AppColors.dark,
),
child: Text('no'.tr),
child: Text(
'no'.tr,
style: const TextStyle(color: Colors.white),
),
),
TextButton(
onPressed: () async {
Expand Down Expand Up @@ -308,7 +311,10 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
style: TextButton.styleFrom(
foregroundColor: Colors.red,
),
child: Text('yes'.tr),
child: Text(
'yes'.tr,
style: const TextStyle(color: Colors.white),
),
)
],
),
Expand Down Expand Up @@ -527,6 +533,9 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
child: Text(
'deleteVideo'.tr,
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
),
),
),
),
Expand Down Expand Up @@ -568,6 +577,9 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
? 'addSubtitles'.tr
: 'editSubtitles'.tr,
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
),
),
),
),
Expand Down Expand Up @@ -603,6 +615,9 @@ class _CalendarEditorPageState extends State<CalendarEditorPage> {
child: Text(
'addVideo'.tr,
textAlign: TextAlign.center,
style: const TextStyle(
color: Colors.white,
),
),
),
),
Expand Down
14 changes: 13 additions & 1 deletion lib/pages/home/calendar_editor/video_subtitles_editor_page.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import '../../../utils/constants.dart';
import '../../../utils/ffmpeg_api_wrapper.dart';
import '../../../utils/shared_preferences_util.dart';
import '../../../utils/storage_utils.dart';
import '../../../utils/theme.dart';
import '../../../utils/utils.dart';

class VideoSubtitlesEditorPage extends StatefulWidget {
Expand Down Expand Up @@ -67,7 +68,13 @@ class _VideoSubtitlesEditorPageState extends State<VideoSubtitlesEditorPage> {
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: Text('subtitles'.tr),
iconTheme: const IconThemeData(
color: Colors.white,
),
title: Text(
'subtitles'.tr,
style: const TextStyle(color: Colors.white),
),
),
floatingActionButton: FloatingActionButton(
backgroundColor: AppColors.green,
Expand Down Expand Up @@ -201,13 +208,18 @@ class _VideoSubtitlesEditorPageState extends State<VideoSubtitlesEditorPage> {
controller: subtitlesController,
style: TextStyle(
fontFamily: DefaultTextStyle.of(context).style.fontFamily,
color: ThemeService().isDarkTheme() ? Colors.white : Colors.black,
),
maxLines: null,
onChanged: (value) => setState(() {
_subtitles = value;
}),
decoration: InputDecoration(
hintText: 'enterSubtitles'.tr.split('(').first,
fillColor: ThemeService().isDarkTheme() ? Colors.black : Colors.white,
hintStyle: TextStyle(
color: ThemeService().isDarkTheme() ? Colors.black : Colors.white,
),
filled: true,
border: const OutlineInputBorder(
borderSide: BorderSide(color: AppColors.green),
Expand Down
4 changes: 4 additions & 0 deletions lib/pages/home/create_movie/widgets/create_movie_options.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,15 @@ class _CreateMovieOptionsState extends State<CreateMovieOptions> {
},
child: Scaffold(
appBar: AppBar(
iconTheme: const IconThemeData(
color: Colors.white,
),
title: Text(
'createMovie'.tr,
style: TextStyle(
fontFamily: 'Magic',
fontSize: MediaQuery.of(context).size.width * 0.05,
color: Colors.white,
),
),
),
Expand Down
34 changes: 14 additions & 20 deletions lib/pages/home/create_movie/widgets/select_video_from_storage.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,16 @@ class _SelectVideoFromStorageState extends State<SelectVideoFromStorage> {
@override
Widget build(BuildContext context) {
// Count all true in isSelected and return quantity
final int totalSelected =
isSelected?.where((element) => element).length ?? 0;
final int totalSelected = isSelected?.where((element) => element).length ?? 0;
return Scaffold(
appBar: AppBar(
title: Text('selectVideos'.tr),
iconTheme: const IconThemeData(
color: Colors.white,
),
title: Text(
'selectVideos'.tr,
style: const TextStyle(color: Colors.white),
),
actions: [
IconButton(
icon: Icon(navigationIcon),
Expand Down Expand Up @@ -110,8 +115,7 @@ class _SelectVideoFromStorageState extends State<SelectVideoFromStorage> {
cacheExtent: 99999,
shrinkWrap: true,
controller: scrollController,
gridDelegate:
const SliverGridDelegateWithFixedCrossAxisCount(
gridDelegate: const SliverGridDelegateWithFixedCrossAxisCount(
crossAxisCount: 2,
childAspectRatio: 1.12,
),
Expand All @@ -121,11 +125,7 @@ class _SelectVideoFromStorageState extends State<SelectVideoFromStorage> {
children: [
Text(
DateFormatUtils.parseDateStringAccordingLocale(
allVideos![index]
.split('/')
.last
.split('.mp4')
.first,
allVideos![index].split('/').last.split('.mp4').first,
),
key: globalKeys![index],
),
Expand All @@ -134,12 +134,9 @@ class _SelectVideoFromStorageState extends State<SelectVideoFromStorage> {
setState(() {
isSelected![index] = !isSelected![index];
});
if (isSelected![index] &&
index != allVideos!.length - 1) {
if (isSelected![index] && index != allVideos!.length - 1) {
scrollController.position.ensureVisible(
globalKeys![index + 1]
.currentContext!
.findRenderObject()!,
globalKeys![index + 1].currentContext!.findRenderObject()!,
duration: const Duration(milliseconds: 750),
);
}
Expand All @@ -148,18 +145,15 @@ class _SelectVideoFromStorageState extends State<SelectVideoFromStorage> {
margin: const EdgeInsets.all(15.0),
decoration: BoxDecoration(
border: Border.all(
color: isSelected![index]
? AppColors.green
: Colors.white,
color: isSelected![index] ? AppColors.green : Colors.white,
width: isSelected![index] ? 4 : 1,
),
borderRadius: BorderRadius.circular(5),
),
child: LazyFutureBuilder(
future: () => getThumbnail(allVideos![index]),
builder: (context, snapshot) {
if (snapshot.connectionState ==
ConnectionState.waiting) {
if (snapshot.connectionState == ConnectionState.waiting) {
return const Center(
child: SizedBox(
height: 30,
Expand Down
Loading

0 comments on commit f78abd3

Please sign in to comment.