diff --git a/iOS/Runner/Info.plist b/iOS/Runner/Info.plist index ffae33c80..2d8014e73 100644 --- a/iOS/Runner/Info.plist +++ b/iOS/Runner/Info.plist @@ -2,6 +2,8 @@ + NSBluetoothAlwaysUsageDescription + This app needs Bluetooth to function CFBundleDevelopmentRegion $(DEVELOPMENT_LANGUAGE) CFBundleDisplayName diff --git a/lib/bademagic_module/utils/data_to_bytearray_converter.dart b/lib/bademagic_module/utils/data_to_bytearray_converter.dart index 0782e8e6d..ea0048e4b 100644 --- a/lib/bademagic_module/utils/data_to_bytearray_converter.dart +++ b/lib/bademagic_module/utils/data_to_bytearray_converter.dart @@ -200,17 +200,17 @@ String getTime(DateTime now) { return ans; } -//Function to get messages +//takes the list of hexstrings generated by the message to hex function +//and converts them to a single string +//ignoring the [] due to the list object using regexp +//and returns a single string String getMessage(Data data) { - String msg = data.messages - .map((e) => e.text) - .join(' ') - .split("") - .where((element) => charCodes.containsKey(element)) - .map((e) => charCodes[e]) - .join(); - logger.d("get message = $msg"); - return msg; + String ans = data.messages + .map( + (message) => message.text.join('').replaceAll(RegExp(r'^\[|\]$'), '')) + .join(''); + logger.d("Get message = $ans"); + return ans; } //filling he rest length with the 0 diff --git a/lib/view/widgets/animation_container.dart b/lib/view/widgets/animation_container.dart index 7750d500d..cf8bd03ce 100644 --- a/lib/view/widgets/animation_container.dart +++ b/lib/view/widgets/animation_container.dart @@ -26,7 +26,7 @@ class _AniContainerState extends State { double width = MediaQuery.of(context).size.width; return Container( margin: const EdgeInsets.all(5), - height: height * 0.15, + height: height * 0.09, width: width * 0.307, child: GestureDetector( onTap: () { @@ -37,12 +37,12 @@ class _AniContainerState extends State { color: animationcardstate.getAnimationIndex() == widget.index ? Colors.red : Colors.white, - elevation: 10, + elevation: 5, child: Column( children: [ Image( image: AssetImage(widget.animation), - height: height * 0.1, + height: height * 0.04, ), Text(widget.aniName), ], diff --git a/lib/view/widgets/effects_container.dart b/lib/view/widgets/effects_container.dart index 0eac7d3a7..beaa52f67 100644 --- a/lib/view/widgets/effects_container.dart +++ b/lib/view/widgets/effects_container.dart @@ -35,7 +35,7 @@ class _EffectContainerState extends State { color: effectcardstate.getEffectIndex(widget.index) == 1 ? Colors.red : Colors.white, - elevation: 10, + elevation: 5, child: Column( children: [ Image( diff --git a/lib/view/widgets/speedial.dart b/lib/view/widgets/speedial.dart index 411239608..20ab62cae 100644 --- a/lib/view/widgets/speedial.dart +++ b/lib/view/widgets/speedial.dart @@ -91,7 +91,7 @@ class InnerPointerPainter extends CustomPainter { @override void paint(Canvas canvas, Size size) { final center = Offset(size.width / 2, size.height / 2); - final radius = min(size.width / 2, size.height / 2) * 0.8; + final radius = min(size.width / 2, size.height / 2) * 0.4; final pointerAngle = 3 * pi / 4 + 6 * pi / 4 * (value / max); final pointerLength = radius + 25; @@ -232,8 +232,8 @@ class _RadialDialState extends State { max: maxValue, color: Colors.red), child: const SizedBox( - width: 80, - height: 80, + width: 180, + height: 180, ), ), ),