Fixes ICS' internal AGL-48,49,50.
Original from Sabin Sajeevan <ssajeevan@ics.com>
Bug-AGL: SPEC-4971
Change-Id: I66c875551a69a1b53eee2d6e1d3fa725b20ff41b
Signed-off-by: Lisandro Pérez Meyer <lpmeyer@ics.com>
import 'package:flutter_ics_homescreen/data/data_providers/datetime_notifier.dart';
import 'package:flutter_ics_homescreen/data/data_providers/hybrid_notifier.dart';
import 'package:flutter_ics_homescreen/data/data_providers/signal_notifier.dart';
+import 'package:flutter_ics_homescreen/data/data_providers/time_notifier.dart';
import 'package:flutter_ics_homescreen/data/data_providers/units_notifier.dart';
import 'package:flutter_ics_homescreen/data/data_providers/audio_notifier.dart';
import 'package:flutter_ics_homescreen/data/data_providers/users_notifier.dart';
final hybridtateProvider = StateNotifierProvider<HybridNotifier, Hybrid>((ref) {
return HybridNotifier(const Hybrid.initial());
});
+
+final currentTimeProvider =
+ StateNotifierProvider<CurrentTimeNotifier, DateTime>((ref) {
+ return CurrentTimeNotifier();
+});
--- /dev/null
+import 'dart:async';
+
+import 'package:flutter_ics_homescreen/export.dart';
+
+class CurrentTimeNotifier extends StateNotifier<DateTime> {
+ CurrentTimeNotifier() : super(DateTime.now()) {
+ if (!_hasInitialized) {
+ _initializeTimer();
+ _hasInitialized = true;
+ }
+ }
+
+ bool _hasInitialized = false;
+
+ void _initializeTimer() {
+ Timer.periodic(const Duration(seconds: 1), (timer) {
+ state = state.add(const Duration(seconds: 1));
+ });
+ }
+
+ void setCurrentTime(DateTime newTime) {
+ state = newTime;
+ }
+}
void main() async {
WidgetsFlutterBinding.ensureInitialized();
runApp(DevicePreview(
- enabled: false,
+ enabled: true,
tools: const [
...DevicePreview.defaultTools,
],
final singnalsConnection =
ref.watch(signalsProvider.select((sinals) => sinals));
final user = ref.watch(usersProvider.select((user) => user));
- final time2 =
- ref.watch(dateTimeStateProvider.select((dateTime) => dateTime));
-
- DateFormat dateFormat = DateFormat('HH:mm');
- //var time = dateFormat.format(DateTime.now());
- var time = time2.time;
+ DateFormat dateFormat = DateFormat('hh:mm a');
+ final currentime = ref.watch(currentTimeProvider);
return AppBar(
elevation: 0,
children: [
RichText(
text: TextSpan(
- text: '$time ',
+ text: dateFormat.format(currentime),
style: const TextStyle(color: Colors.white, fontSize: 26),
children: <InlineSpan>[
const WidgetSpan(
highlightColor: Colors.transparent,
customBorder: const CircleBorder(),
onTap: () {
- _isPlaying ? null : _controller.isActive = true;
setState(() {
if (controlProgress >= 0.80) {
controlProgress = 0.0;
isMainACSelected = false;
+ _isPlaying = false;
animationController.reverse();
} else {
+ _isPlaying ? null : _controller.isActive = true;
isMainACSelected = true;
_controller.isActive = true;
_isPlaying = true;
PlayListModel(songName: "Hey Ya!", albumName: "Outkast"),
PlayListModel(songName: "One, Two, Step", albumName: "Ciara, Missy Elliot"),
PlayListModel(songName: "Don’t Trust Me", albumName: "3OH!3"),
- PlayListModel(songName: "Feel Good Inc.", albumName: "Gorillaz"),
- PlayListModel(songName: "Feel Good Inc.", albumName: "Gorillaz"),
- PlayListModel(songName: "Feel Good Inc.", albumName: "Gorillaz"),
- PlayListModel(songName: "Feel Good Inc.", albumName: "Gorillaz"),
];
String selectedPlayListSongName = "Feel Good Inc.";
Widget build(BuildContext context) {
double albumArtSize = 460;
return Column(
- crossAxisAlignment: CrossAxisAlignment.stretch,
- children: [
- // const PlayerNavigation(),
- SegmentedButtons(
- navItems: navItems,
- selectedNav: selectedNav,
- ),
- const SizedBox(
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ // const PlayerNavigation(),
+ SegmentedButtons(
+ navItems: navItems,
+ selectedNav: selectedNav,
+ ),
+ const SizedBox(
height: 32,
- ),
- Row(
- mainAxisAlignment: MainAxisAlignment.center,
- children: [
- Image.asset(
- "assets/AlbumArtMedia.png",
- width: albumArtSize,
- height: albumArtSize,
- )
- ],
- ),
- const SizedBox(
+ ),
+ Row(
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ Image.asset(
+ "assets/AlbumArtMedia.png",
+ width: albumArtSize,
+ height: albumArtSize,
+ )
+ ],
+ ),
+ const SizedBox(
height: 40,
- ),
+ ),
Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
type: "media",
),
],
- )
+ )
],
);
}
},
),
Padding(
- padding: const EdgeInsets.symmetric(horizontal: 144),
+ padding: const EdgeInsets.symmetric(horizontal: 80),
child: SingleChildScrollView(
child: selectedNav == "My Media"
? const MediaPlayer()
: Container(),
),
),
- const Padding(
- padding: EdgeInsets.symmetric(horizontal: 144, vertical: 23.5),
- child: CustomVolumeSlider(),
- ),
+ if (selectedNav == "My Media" || selectedNav == "FM")
+ const Padding(
+ padding: EdgeInsets.symmetric(horizontal: 144, vertical: 23.5),
+ child: CustomVolumeSlider(),
+ ),
],
),
);
+import 'package:auto_size_text/auto_size_text.dart';
import 'package:flutter_ics_homescreen/core/utils/helpers.dart';
import 'package:flutter_ics_homescreen/export.dart';
children: [
Expanded(
flex: 6,
- child: Text(
+ child: AutoSizeText(
index.songName,
+ maxLines: 1,
style: TextStyle(
color: Colors.white,
fontSize: 40,
child: Row(
children: navItems
.map((e) => Container(
- padding: const EdgeInsets.symmetric(
- vertical: 24, horizontal: 32),
decoration: BoxDecoration(
borderRadius: selectedNav == e
? BorderRadius.circular(40)
? AGLDemoColors.backgroundInsetColor
: null,
),
- child: InkWell(
- borderRadius: BorderRadius.circular(40),
- onTap: () {
- setState(() {
- selectedNav = e;
- });
- },
- child: Text(
- e,
- style: TextStyle(
- color: selectedNav == e
- ? Colors.white
- : AGLDemoColors.periwinkleColor,
- fontSize: 26,
- fontWeight: selectedNav == e
- ? FontWeight.w700
- : FontWeight.w500),
+ child: Material(
+ color: Colors.transparent,
+ child: InkWell(
+ borderRadius: BorderRadius.circular(40),
+ onTap: () {
+ setState(() {
+ selectedNav = e;
+ });
+ },
+ child: Padding(
+ padding: const EdgeInsets.symmetric(
+ vertical: 24, horizontal: 32),
+ child: Text(
+ e,
+ style: TextStyle(
+ color: selectedNav == e
+ ? Colors.white
+ : AGLDemoColors.periwinkleColor,
+ fontSize: 26,
+ fontWeight: selectedNav == e
+ ? FontWeight.w700
+ : FontWeight.w500),
+ ),
+ ),
),
),
))
child: Row(
children: [
Padding(
- padding: const EdgeInsets.only(left: 10.0),
- child: SizedBox(
- width: 50,
- child: IconButton(
- padding: EdgeInsets.zero,
- onPressed: () {
+ padding: const EdgeInsets.only(left: 20),
+ child: Material(
+ color: Colors.transparent,
+ child: InkWell(
+ customBorder: const CircleBorder(),
+ onTap: () {
_dercrease();
},
- icon: const Icon(
- CustomIcons.vol_min,
- color: AGLDemoColors.periwinkleColor,
- size: 48,
- )),
+ child: const Padding(
+ padding: EdgeInsets.all(8.0),
+ child: Icon(
+ CustomIcons.vol_min,
+ color: AGLDemoColors.periwinkleColor,
+ size: 60,
+ ))),
),
),
+ // Padding(
+ // padding: const EdgeInsets.only(left: 10.0),
+ // child: SizedBox(
+ // width: 50,
+ // child: IconButton(
+ // padding: EdgeInsets.zero,
+ // onPressed: () {
+ // _dercrease();
+ // },
+ // icon: const Icon(
+ // CustomIcons.vol_min,
+ // color: AGLDemoColors.periwinkleColor,
+ // size: 48,
+ // )),
+ // ),
+ // ),
Expanded(
child: SliderTheme(
data: SliderThemeData(
),
),
Padding(
- padding: const EdgeInsets.only(right: 10.0),
- child: SizedBox(
- width: 60,
- child: IconButton(
- padding: EdgeInsets.zero,
- onPressed: () {
+ padding: const EdgeInsets.only(right: 20),
+ child: Material(
+ color: Colors.transparent,
+ child: InkWell(
+ customBorder: const CircleBorder(),
+ onTap: () {
_increase();
},
- icon: const Icon(
- CustomIcons.vol_max,
- color: AGLDemoColors.periwinkleColor,
- size: 48,
- )),
+ child: const Padding(
+ padding: EdgeInsets.all(8.0),
+ child: Icon(
+ CustomIcons.vol_max,
+ color: AGLDemoColors.periwinkleColor,
+ size: 60,
+ ))),
),
),
+ // Padding(
+ // padding: const EdgeInsets.only(right: 10.0),
+ // child: SizedBox(
+ // width: 60,
+ // child: IconButton(
+ // padding: EdgeInsets.zero,
+ // onPressed: () {
+ // _increase();
+ // },
+ // icon: const Icon(
+ // CustomIcons.vol_max,
+ // color: AGLDemoColors.periwinkleColor,
+ // size: 48,
+ // )),
+ // ),
+ // ),
],
),
),
mainAxisAlignment: MainAxisAlignment.center,
children: [
CustomTrebleSlider(),
+ SizedBox(
+ height: 120,
+ ),
CustomBassSlider(),
+ SizedBox(
+ height: 120,
+ ),
CustomRearFrontSlider(),
],
),
text: 'Reset to Default',
onTap: () {
ref.read(audioStateProvider.notifier).resetToDefaults();
- },
- ),
-
+ },
+ ),
),
],
),
import 'package:flutter_ics_homescreen/export.dart';
+import 'package:intl/intl.dart';
class DateTimePage extends ConsumerWidget {
const DateTimePage({super.key});
@override
Widget build(BuildContext context, WidgetRef ref) {
final dateTime = ref.watch(dateTimeStateProvider.select((val) => val));
+ DateFormat dateFormat = DateFormat('hh:mm a');
+ final currentime = ref.watch(currentTimeProvider);
return Scaffold(
body: Column(
UnitsTile(
image: "assets/Time.svg",
title: 'Time',
- unitName: dateTime.time,
+ unitName: dateFormat.format(currentime),
hasSwich: true,
voidCallback: () {
context
import 'package:flutter_ics_homescreen/export.dart';
import 'package:flutter/services.dart';
import 'package:intl/intl.dart';
+import 'package:new_virtual_keyboard/virtual_keyboard.dart';
class TimePage extends ConsumerWidget {
const TimePage({super.key});
onPressed({required String type}) {
if (type == "confirm") {
- ref.read(dateTimeStateProvider.notifier).setTime(
- "${hourController.text}:${minuteController.text} $selectedMeridien");
- context.flow<AppState>().update((state) => AppState.dateTime);
+ if (hourController.text.isNotEmpty && minuteController.text.isNotEmpty) {
+ String input =
+ '${hourController.text}:${minuteController.text} $selectedMeridien';
+ DateTime selectedeDatetime = DateFormat.jm().parse(input);
+
+ ref
+ .read(currentTimeProvider.notifier)
+ .setCurrentTime(selectedeDatetime);
+
+ // ref.read(dateTimeStateProvider.notifier).setTime(
+ // "${hourController.text}:${minuteController.text} $selectedMeridien");
+ context.flow<AppState>().update((state) => AppState.dateTime);
+ } else {
+ ScaffoldMessenger.of(context).showSnackBar(
+ const SnackBar(content: Text("Time can't be empty!")));
+ }
} else if (type == "cancel") {
context.flow<AppState>().update((state) => AppState.dateTime);
}
@override
void initState() {
- String time = ref.read(dateTimeStateProvider).time;
- if (time == "hh:mm a") {
- time = DateFormat('hh:mm a').format(DateTime.now());
- }
+ DateTime currentTime = ref.read(currentTimeProvider);
+ String time = DateFormat('hh:mm a').format(currentTime);
+
List<String> split = time.split(":");
selectedTimeHour = int.parse(split[0]);
List<String> splitMeridian = split[1].split(" ");
return KeyEventResult.ignored;
}
+ void showKeyboard() {
+ var ctx = homeScaffoldKey.currentContext;
+ showModalBottomSheet(
+ elevation: 0.0,
+ backgroundColor: Colors.transparent,
+ barrierColor: Colors.transparent,
+ context: ctx!,
+ builder: (ctx) {
+ return Container(
+ height: 479,
+ width: 1080,
+ decoration: const BoxDecoration(
+ color: AGLDemoColors.resolutionBlueColor,
+ border: Border(
+ top: BorderSide(
+ color: Color(0xFF295EF7),
+ width: 1,
+ )),
+ ),
+ child: VirtualKeyboard(
+ height: 478,
+ textColor: AGLDemoColors.periwinkleColor,
+ fontSize: 40,
+ // [A-Z, 0-9]
+ type: VirtualKeyboardType.Numeric,
+ // Callback for key press event
+ onKeyPress: (key) {
+ _onKeyPress(key);
+ },
+ ),
+ );
+ },
+ );
+ }
+
+ _onKeyPress(VirtualKeyboardKey key) {
+ String text = controller.text;
+
+ if (key.keyType == VirtualKeyboardKeyType.String) {
+ if (key.text != ".") {
+ text = text + key.text!;
+ int value = int.parse(text);
+
+ if (widget.type == "hour") {
+ if (value > 11) {
+ text = "12";
+ }
+ } else if (widget.type == "minute") {
+ if (value > 58) {
+ text = "59";
+ }
+ }
+ }
+ } else if (key.keyType == VirtualKeyboardKeyType.Action) {
+ switch (key.action) {
+ case VirtualKeyboardKeyAction.Backspace:
+ if (text.isEmpty) return;
+ text = text.substring(0, text.length - 1);
+ break;
+ // case VirtualKeyboardKeyAction.Return:
+ // text = '$text\n';
+ // break;
+ default:
+ }
+ }
+ controller.text = text;
+ }
+
@override
Widget build(BuildContext context) {
return SizedBox(
return onKeyBoardEvent(event);
}),
child: TextField(
+ onTap: () {
+ showKeyboard();
+ },
style: const TextStyle(color: Colors.white, fontSize: 40),
decoration: InputDecoration(
contentPadding: const EdgeInsets.symmetric(vertical: 23),
+import 'package:flutter_ics_homescreen/core/utils/helpers.dart';
import 'package:flutter_ics_homescreen/export.dart';
+import 'package:get_ip_address/get_ip_address.dart';
class WiredPage extends ConsumerWidget {
const WiredPage({super.key});
static Page<void> page() => const MaterialPage<void>(child: WiredPage());
@override
Widget build(BuildContext context, WidgetRef ref) {
- return Scaffold(
- body: Column(
- children: [
- CommonTitle(
- title: 'Wired',
- hasBackButton: true,
- onPressed: () {
- context.flow<AppState>().update((state) => AppState.settings);
- },
+ return const Scaffold(body: WiredScreen());
+ }
+}
+
+class WiredScreen extends StatefulWidget {
+ const WiredScreen({super.key});
+
+ @override
+ State<WiredScreen> createState() => _WiredScreenState();
+}
+
+class _WiredScreenState extends State<WiredScreen> {
+ String deviceIP = "192.168.234.120";
+ @override
+ void initState() {
+ super.initState();
+ getIPAddress();
+ }
+
+ getIPAddress() async {
+ try {
+ /// Initialize Ip Address
+ var ipAddress = IpAddress(type: RequestType.text);
+
+ /// Get the IpAddress based on requestType.
+ dynamic data = await ipAddress.getIpAddress();
+ setState(() {
+ deviceIP = data.toString();
+ });
+ } on IpAddressException catch (exception) {
+ /// Handle the exception.
+ print(exception.message);
+ }
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ return Column(
+ children: [
+ CommonTitle(
+ title: 'Wired',
+ hasBackButton: true,
+ onPressed: () {
+ context.flow<AppState>().update((state) => AppState.settings);
+ },
+ ),
+ Container(
+ margin: const EdgeInsets.symmetric(horizontal: 120, vertical: 40),
+ padding: const EdgeInsets.symmetric(vertical: 17, horizontal: 24),
+ height: 140,
+ alignment: Alignment.center,
+ decoration: BoxDecoration(
+ gradient: LinearGradient(
+ begin: Alignment.centerLeft,
+ end: Alignment.centerRight,
+ stops: const [
+ 0,
+ 0.01,
+ 0.8
+ ],
+ colors: <Color>[
+ Colors.white,
+ AGLDemoColors.neonBlueColor,
+ AGLDemoColors.neonBlueColor.withOpacity(0.15)
+ ]),
),
- Padding(
- padding: const EdgeInsets.symmetric(vertical: 50, horizontal: 80),
- child: Container(
- height: 130,
- decoration: const BoxDecoration(
- gradient: LinearGradient(
- begin: Alignment.centerLeft,
- end: Alignment.centerRight,
- stops: [
- 0,
- 0.01,
- 0.8
+ child: Row(
+ crossAxisAlignment: CrossAxisAlignment.center,
+ mainAxisAlignment: MainAxisAlignment.center,
+ children: [
+ // const SizedBox(
+ // width: 20,
+ // ),
+ Expanded(
+ child: Column(
+ mainAxisAlignment: MainAxisAlignment.center,
+ crossAxisAlignment: CrossAxisAlignment.stretch,
+ children: [
+ const Text(
+ 'hernet_0090451v407b_cable',
+ style: TextStyle(color: Colors.white, fontSize: 40),
+ ),
+ Text(
+ 'connected, $deviceIP',
+ style:
+ const TextStyle(color: Colors.white, fontSize: 26),
+ ),
],
- colors: <Color>[
- Colors.white,
- Colors.blue,
- Color.fromARGB(16, 41, 98, 255)
- ]),
- ),
- child: ListTile(
- contentPadding:
- const EdgeInsets.symmetric(vertical: 41, horizontal: 24),
-
- title: const Text(
- 'hernet_0090451v407b_cable',
- style: TextStyle(color: Colors.white, fontSize: 40),
- ),
- subtitle: const Text(
- 'connected, 192.168.234.120',
- style: TextStyle(color: Colors.white, fontSize: 26),
- ),
- trailing: ElevatedButton(
- style: ElevatedButton.styleFrom(
- backgroundColor: const Color(0xFF1C2D92),
- side: const BorderSide(color: Color(0xFF285DF4), width: 2),
),
- child: const Padding(
- padding:
- EdgeInsets.symmetric(vertical: 15.0, horizontal: 0),
- child: Text(
-
- 'Configure',
- style: TextStyle(
- color: Color(0xFFC1D8FF),
- fontSize: 26,
+ ),
+ Container(
+ decoration: BoxDecoration(
+ borderRadius: BorderRadius.circular(4),
+ color: AGLDemoColors.buttonFillEnabledColor,
+ border: Border.all(color: AGLDemoColors.neonBlueColor),
+ boxShadow: [Helpers.boxDropShadowRegular]),
+ child: Material(
+ color: Colors.transparent,
+ child: InkWell(
+ onTap: () {},
+ borderRadius: BorderRadius.circular(4),
+ child: const Padding(
+ padding:
+ EdgeInsets.symmetric(vertical: 30, horizontal: 40),
+ child: Text(
+ "Configure",
+ style: TextStyle(
+ color: AGLDemoColors.periwinkleColor,
+ fontSize: 26),
+ ),
),
),
),
- onPressed: () {},
),
- ),
- ),
- ),
- ],
- ),
+ // ElevatedButton(
+ // style: ElevatedButton.styleFrom(
+ // backgroundColor: const Color(0xFF1C2D92),
+ // side:
+ // const BorderSide(color: Color(0xFF285DF4), width: 2),
+ // ),
+ // child: const Padding(
+ // padding:
+ // EdgeInsets.symmetric(vertical: 15.0, horizontal: 0),
+ // child: Text(
+ // 'Configure',
+ // style: TextStyle(
+ // color: Color(0xFFC1D8FF),
+ // fontSize: 26,
+ // ),
+ // ),
+ // ),
+ // onPressed: () {},
+ // ),
+ ]),
+ ),
+ ],
);
}
}
}
class _HourlyForecastState extends State<HourlyForecast> {
- String selectedForescastTime = "13:00";
+ String selectedForescastTime = "01:00 pm";
List<ForecastModel> foreCastList = [
ForecastModel(
- time: "13:00", image: "assets/weatherStat.svg", weather: "29.1°"),
+ time: "01:00 pm", image: "assets/weatherStat.svg", weather: "29.1°"),
ForecastModel(
- time: "14:00", image: "assets/weatherStat.svg", weather: "28.1°"),
+ time: "02:00 pm", image: "assets/weatherStat.svg", weather: "28.1°"),
ForecastModel(
- time: "15:00", image: "assets/weatherStat.svg", weather: "27.1°"),
+ time: "03:00 pm", image: "assets/weatherStat.svg", weather: "27.1°"),
ForecastModel(
- time: "16:00", image: "assets/weatherStat.svg", weather: "29.1°"),
- ForecastModel(
- time: "13:00", image: "assets/weatherStat.svg", weather: "29.1°"),
- ForecastModel(
- time: "14:00", image: "assets/weatherStat.svg", weather: "28.1°"),
- ForecastModel(
- time: "15:00", image: "assets/weatherStat.svg", weather: "27.1°"),
- ForecastModel(
- time: "16:00", image: "assets/weatherStat.svg", weather: "29.1°"),
+ time: "04:00 pm", image: "assets/weatherStat.svg", weather: "29.1°"),
];
@override
Widget build(BuildContext context) {
@override
Widget build(BuildContext context, WidgetRef ref) {
double weatherIconSize = MediaQuery.sizeOf(context).width * 0.278;
+ final unit =
+ ref.watch(unitStateProvider.select((unit) => unit.temperatureUnit));
return Column(
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
height: 60,
),
Text(
- "28.3°C",
+ "28.3°${unit == TemperatureUnit.celsius ? "C" : "F"}",
style: GoogleFonts.brunoAce(
color: Colors.white, fontSize: 128),
),
PODFILE CHECKSUM: 236401fc2c932af29a9fcf0e97baeeb2d750d367
-COCOAPODS: 1.12.1
+COCOAPODS: 1.11.3
url: "https://pub.dev"
source: hosted
version: "2.11.0"
+ auto_size_text:
+ dependency: "direct main"
+ description:
+ name: auto_size_text
+ sha256: "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599"
+ url: "https://pub.dev"
+ source: hosted
+ version: "3.0.0"
boolean_selector:
dependency: transitive
description:
url: "https://pub.dev"
source: hosted
version: "2.4.1"
+ get_ip_address:
+ dependency: "direct main"
+ description:
+ name: get_ip_address
+ sha256: "0e973f1ad61bc4b0b1d99abc2c023d91d1ddb09709f5546f6972ace067c8576d"
+ url: "https://pub.dev"
+ source: hosted
+ version: "0.0.6"
google_fonts:
dependency: "direct main"
description:
device_preview: ^1.1.0
rive: ^0.12.3
new_virtual_keyboard: ^0.1.4
+ auto_size_text: ^3.0.0
+ get_ip_address: ^0.0.6
dev_dependencies:
Code Review / apps / flutter-ics-homescreen.git / commitdiff