mirror of
https://github.com/SyncrowIOT/syncrow-app.git
synced 2026-10-23 09:37:55 +00:00
Added latest changes from dev and solved conflicts
This commit is contained in:
@@ -63,9 +63,16 @@ class StringHelpers {
|
||||
}
|
||||
|
||||
static String toTitleCase(String text) {
|
||||
return text
|
||||
.split(' ')
|
||||
.map((word) => word[0].toUpperCase() + word.substring(1))
|
||||
.join(' ');
|
||||
if (text.contains(' ')) {
|
||||
//remove empty elements
|
||||
String title = text.split(' ').where((element) => element.isNotEmpty).join(' ');
|
||||
String result = title
|
||||
.split(' ')
|
||||
.map((element) => element[0].toUpperCase() + element.substring(1))
|
||||
.join(' ');
|
||||
return result;
|
||||
} else {
|
||||
return text.toUpperCase();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,9 +4,8 @@ abstract class ColorsManager {
|
||||
static const Color textPrimaryColor = Color(0xFF5D5D5D);
|
||||
static const Color switchOffColor = Color(0x7F8D99AE);
|
||||
static const Color primaryColor = Color(0xFF0030CB);
|
||||
static Color primaryColorWithOpacity =
|
||||
const Color(0xFF023DFE).withOpacity(0.6);
|
||||
static const Color secondaryTextColor = Color(0xFF848484);
|
||||
static Color primaryColorWithOpacity = const Color(0xFF023DFE).withOpacity(0.6);
|
||||
static const Color onPrimaryColor = Colors.white;
|
||||
static const Color secondaryColor = Color(0xFF023DFE);
|
||||
static const Color onSecondaryColor = Color(0xFF023DFE);
|
||||
@@ -20,4 +19,9 @@ abstract class ColorsManager {
|
||||
static const Color relaxColor = Color(0xFFFBD288);
|
||||
static const Color readingColor = Color(0xFFF7D69C);
|
||||
static const Color energizingColor = Color(0xFFEDEDED);
|
||||
static const Color dividerColor = Color(0xFFEBEBEB);
|
||||
static const Color slidingBlueColor = Color(0x99023DFE);
|
||||
static const Color blackColor = Color(0xFF000000);
|
||||
static const Color lightGreen = Color(0xFF00FF0A);
|
||||
static const Color grayColor = Color(0xFF999999);
|
||||
}
|
||||
|
||||
@@ -1,43 +1,41 @@
|
||||
// ignore_for_file: lines_longer_than_80_chars, constant_identifier_names
|
||||
|
||||
class StringsManager {
|
||||
static const noRouteFound = 'No route found';
|
||||
static const noInternetConnection = 'No internet connection';
|
||||
|
||||
static const dashboard = 'Dashboard';
|
||||
static const devices = 'Devices';
|
||||
static const routine = 'Routines';
|
||||
static const tapToRunRoutine = 'Tap to run routine';
|
||||
static const wizard = 'Wizard';
|
||||
static const active = 'Active';
|
||||
static const current = 'Current';
|
||||
static const frequency = 'Frequency';
|
||||
static const energyUsage = 'Energy Usage';
|
||||
static const totalConsumption = 'Total Consumption';
|
||||
static const ACConsumption = 'AC Consumption';
|
||||
static const units = 'Units';
|
||||
static const emissions = 'Emissions';
|
||||
static const reductions = 'Reductions';
|
||||
static const winter = 'Winter';
|
||||
static const winterMode = 'Winter Mode';
|
||||
static const summer = 'Summer';
|
||||
static const summerMode = 'Summer Mode';
|
||||
static const on = 'ON';
|
||||
static const off = 'OFF';
|
||||
static const timer = 'Timer';
|
||||
static const dimmerAndColor = "Dimmer & color";
|
||||
static const recentlyUsed = "Recently used colors";
|
||||
static const lightingModes = "Lighting modes";
|
||||
static const doze = "Doze";
|
||||
static const relax = "Relax";
|
||||
static const reading = "Reading";
|
||||
static const energizing = "Energizing";
|
||||
static const createScene = 'Create Scene';
|
||||
static const tapToRun = 'Launch: Tap - To - Run';
|
||||
static const turnOffAllLights =
|
||||
'Example: turn off all lights in the with one tap.';
|
||||
static const whenDeviceStatusChanges = 'When device status changes';
|
||||
static const whenUnusualActivityIsDetected =
|
||||
static const String dashboard = 'Dashboard';
|
||||
static const String devices = 'Devices';
|
||||
static const String routine = 'Routines';
|
||||
static const String tapToRunRoutine = 'Tap to run routine';
|
||||
static const String wizard = 'Wizard';
|
||||
static const String active = 'Active';
|
||||
static const String current = 'Current';
|
||||
static const String frequency = 'Frequency';
|
||||
static const String energyUsage = 'Energy Usage';
|
||||
static const String totalConsumption = 'Total Consumption';
|
||||
static const String ACConsumption = 'AC Consumption';
|
||||
static const String units = 'Units';
|
||||
static const String emissions = 'Emissions';
|
||||
static const String reductions = 'Reductions';
|
||||
static const String winter = 'Winter';
|
||||
static const String winterMode = 'Winter Mode';
|
||||
static const String summer = 'Summer';
|
||||
static const String summerMode = 'Summer Mode';
|
||||
static const String on = 'ON';
|
||||
static const String off = 'OFF';
|
||||
static const String timer = 'Timer';
|
||||
static const String dimmerAndColor = "Dimmer & color";
|
||||
static const String recentlyUsed = "Recently used colors";
|
||||
static const String lightingModes = "Lighting modes";
|
||||
static const String doze = "Doze";
|
||||
static const String relax = "Relax";
|
||||
static const String reading = "Reading";
|
||||
static const String energizing = "Energizing";
|
||||
static const String createScene = 'Create Scene';
|
||||
static const String tapToRun = 'Launch: Tap - To - Run';
|
||||
static const String turnOffAllLights = 'Example: turn off all lights in the with one tap.';
|
||||
static const String whenDeviceStatusChanges = 'When device status changes';
|
||||
static const String whenUnusualActivityIsDetected =
|
||||
'Example: when an unusual activity is detected.';
|
||||
static const functions = "Functions";
|
||||
static const String functions = "Functions";
|
||||
static const String firstLaunch = "firstLaunch";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user