diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts index dd18bb154..80fa5fe97 100644 --- a/android/app/build.gradle.kts +++ b/android/app/build.gradle.kts @@ -17,7 +17,7 @@ plugins { android { namespace = "com.pranshulgg.weather_master_app" compileSdk = flutter.compileSdkVersion - ndkVersion = flutter.ndkVersion + ndkVersion = "27.0.12077973" compileOptions { diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin index ec27ed8de..943af476d 100644 Binary files a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin and b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.bin differ diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock index 0b49f3823..83f1e96b4 100644 Binary files a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock and b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/fileHashes.lock differ diff --git a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin index 3e036a883..e9cb03e70 100644 Binary files a/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin and b/settings_tiles_custom/example/android/.gradle/8.9/fileHashes/resourceHashesCache.bin differ diff --git a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_346_timing.txt b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_346_timing.txt new file mode 100644 index 000000000..d55f500dd --- /dev/null +++ b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_346_timing.txt @@ -0,0 +1,31 @@ +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 19ms + create-variant-model 17ms + create-ARMEABI_V7A-model 39ms + [gap of 14ms] + create-ARM64_V8A-model 11ms + [gap of 25ms] + create-X86-model 14ms + [gap of 10ms] + create-module-model 11ms + [gap of 50ms] + create-ARMEABI_V7A-model 18ms + create-ARM64_V8A-model 13ms + create-X86-model 17ms + create-X86_64-model 10ms + [gap of 14ms] + create-ARMEABI_V7A-model 12ms + create-ARM64_V8A-model 14ms + create-X86-model 11ms + [gap of 10ms] + create-initial-cxx-model completed in 342ms + [gap of 11ms] +create_cxx_tasks completed in 353ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 94ms +create_cxx_tasks completed in 98ms + diff --git a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt index 6766a2328..8b761a91e 100644 --- a/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt +++ b/settings_tiles_custom/example/build/app/intermediates/cxx/create_cxx_tasks_38_timing.txt @@ -330,11 +330,161 @@ create_cxx_tasks completed in 218ms # C/C++ build system timings create_cxx_tasks create-initial-cxx-model - create-module-model 39ms - create-variant-model 15ms - create-ARMEABI_V7A-model 48ms - [gap of 105ms] - create-initial-cxx-model completed in 211ms - [gap of 27ms] -create_cxx_tasks completed in 248ms + create-module-model 57ms + create-variant-model 23ms + create-ARMEABI_V7A-model 54ms + create-ARM64_V8A-model 12ms + create-X86-model 18ms + create-X86_64-model 11ms + [gap of 32ms] + create-X86-model 11ms + [gap of 41ms] + create-X86-model 24ms + create-initial-cxx-model completed in 301ms + [gap of 29ms] +create_cxx_tasks completed in 348ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 32ms + create-variant-model 13ms + create-ARMEABI_V7A-model 40ms + [gap of 89ms] + create-initial-cxx-model completed in 179ms + [gap of 20ms] +create_cxx_tasks completed in 207ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 24ms] + create-X86-model 19ms + [gap of 57ms] + create-ARM64_V8A-model 16ms + [gap of 14ms] + create-initial-cxx-model completed in 130ms +create_cxx_tasks completed in 135ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 33ms + create-variant-model 14ms + create-ARMEABI_V7A-model 36ms + [gap of 79ms] + create-initial-cxx-model completed in 166ms + [gap of 20ms] +create_cxx_tasks completed in 192ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 15ms] + create-ARM64_V8A-model 17ms + [gap of 77ms] + create-initial-cxx-model completed in 109ms +create_cxx_tasks completed in 116ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 32ms + create-variant-model 11ms + create-ARMEABI_V7A-model 32ms + [gap of 85ms] + create-initial-cxx-model completed in 166ms + [gap of 20ms] +create_cxx_tasks completed in 192ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + [gap of 37ms] + create-ARMEABI_V7A-model 14ms + [gap of 41ms] + create-initial-cxx-model completed in 92ms +create_cxx_tasks completed in 95ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 45ms + create-variant-model 19ms + create-ARMEABI_V7A-model 43ms + [gap of 93ms] + create-initial-cxx-model completed in 206ms + [gap of 24ms] +create_cxx_tasks completed in 240ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 121ms +create_cxx_tasks completed in 127ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 62ms + [gap of 14ms] + create-variant-model 24ms + create-ARMEABI_V7A-model 81ms + [gap of 16ms] + create-X86_64-model 10ms + [gap of 39ms] + create-X86_64-model 10ms + create-module-model 10ms + [gap of 40ms] + create-initial-cxx-model completed in 311ms + [gap of 26ms] +create_cxx_tasks completed in 349ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 10ms + [gap of 67ms] + create-X86-model 10ms + [gap of 51ms] + create-initial-cxx-model completed in 138ms +create_cxx_tasks completed in 141ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 31ms + create-variant-model 14ms + create-ARMEABI_V7A-model 40ms + [gap of 89ms] + create-initial-cxx-model completed in 181ms + [gap of 20ms] +create_cxx_tasks completed in 209ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 91ms +create_cxx_tasks completed in 96ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model + create-module-model 46ms + create-variant-model 21ms + create-ARMEABI_V7A-model 54ms + create-ARM64_V8A-model 10ms + [gap of 10ms] + create-X86_64-model 11ms + [gap of 14ms] + create-ARMEABI_V7A-model 11ms + create-ARM64_V8A-model 10ms + create-X86-model 11ms + [gap of 51ms] + create-initial-cxx-model completed in 257ms + [gap of 36ms] +create_cxx_tasks completed in 304ms + +# C/C++ build system timings +create_cxx_tasks + create-initial-cxx-model 96ms +create_cxx_tasks completed in 101ms diff --git a/settings_tiles_custom/lib/src/section/setting_section.dart b/settings_tiles_custom/lib/src/section/setting_section.dart index de1138b30..76c9b6552 100644 --- a/settings_tiles_custom/lib/src/section/setting_section.dart +++ b/settings_tiles_custom/lib/src/section/setting_section.dart @@ -28,61 +28,61 @@ class SettingSection extends StatelessWidget { final bool PrimarySwitch; final bool errorTile; + Widget _wrapStyledTile(BuildContext context, Widget tile, + {required bool isFirst, required bool isLast, required bool isOnly}) { + final borderRadius = isOnly + ? BorderRadius.circular(18) + : isFirst + ? const BorderRadius.only( + topLeft: Radius.circular(18), + topRight: Radius.circular(18), + bottomLeft: Radius.circular(0), + bottomRight: Radius.circular(0), + ) + : isLast + ? const BorderRadius.only( + topLeft: Radius.circular(0), + topRight: Radius.circular(0), + bottomLeft: Radius.circular(18), + bottomRight: Radius.circular(18), + ) + : BorderRadius.circular(0); - -Widget _wrapStyledTile(BuildContext context, Widget tile, - {required bool isFirst, required bool isLast, required bool isOnly}) { - final borderRadius = isOnly - ? BorderRadius.circular(18) - : isFirst - ? const BorderRadius.only( - topLeft: Radius.circular(18), - topRight: Radius.circular(18), - bottomLeft: Radius.circular(6), - bottomRight: Radius.circular(6), - ) - : isLast - ? const BorderRadius.only( - topLeft: Radius.circular(6), - topRight: Radius.circular(6), - bottomLeft: Radius.circular(18), - bottomRight: Radius.circular(18), - ) - : BorderRadius.circular(6); - - return Material( - color: PrimarySwitch ? Theme.of(context).colorScheme.primaryContainer : errorTile ? Theme.of(context).colorScheme.errorContainer : Theme.of(context).colorScheme.surfaceContainerLowest, - shape: RoundedRectangleBorder(borderRadius: borderRadius), - clipBehavior: Clip.hardEdge, - child: tile, - ); -} - + return Material( + color: PrimarySwitch + ? Theme.of(context).colorScheme.primaryContainer + : errorTile + ? Theme.of(context).colorScheme.errorContainer + : Theme.of(context).colorScheme.surfaceContainerLowest, + shape: RoundedRectangleBorder(borderRadius: borderRadius), + clipBehavior: Clip.hardEdge, + child: tile, + ); + } @override Widget build(BuildContext context) { return Padding( - padding: EdgeInsets.fromLTRB(styleTile ? 10 : 0, 0, styleTile ? 10 : 0, 0), - child: Column( - spacing: styleTile ? 4 : 0, - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - if (title != null) title!, - for (final (index, tile) in tiles.indexed) ...[ - if (divider != null && index != 0) divider!, - if (styleTile) - _wrapStyledTile( - context, - tile, - isFirst: index == 0, - isLast: index == tiles.length - 1, - isOnly: tiles.length == 1, - ) - else - tile, - ], - ], - ) - ); + padding: EdgeInsets.fromLTRB(styleTile ? 10 : 0, 0, styleTile ? 10 : 0, 0), + child: Column( + spacing: styleTile ? 2 : 0, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + if (title != null) title!, + for (final (index, tile) in tiles.indexed) ...[ + if (divider != null && index != 0) divider!, + if (styleTile) + _wrapStyledTile( + context, + tile, + isFirst: index == 0, + isLast: index == tiles.length - 1, + isOnly: tiles.length == 1, + ) + else + tile, + ], + ], + )); } } diff --git a/settings_tiles_custom/lib/src/tiles/setting_text_field/setting_text_field_dialog.dart b/settings_tiles_custom/lib/src/tiles/setting_text_field/setting_text_field_dialog.dart index 80a05ae42..c9b79f8d6 100644 --- a/settings_tiles_custom/lib/src/tiles/setting_text_field/setting_text_field_dialog.dart +++ b/settings_tiles_custom/lib/src/tiles/setting_text_field/setting_text_field_dialog.dart @@ -34,11 +34,14 @@ class _SettingTextFieldDialogState extends State { return AlertDialog.adaptive( title: Text(widget.title), content: Padding( - padding: const EdgeInsets.all(16), + padding: const EdgeInsets.all(0), child: SingleChildScrollView( child: TextField( controller: _textEditingController, autofocus: true, + decoration: InputDecoration( + border: OutlineInputBorder(), + ), ), ), ),