Merge remote-tracking branch 'origin/main' into feat/share/share-social

VGVentures · Apr 24, 2024 · aeaaa89 · aeaaa89
2 parents 238531d + e16aca4
commit aeaaa89
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 5 deletions.
diff --git a/lib/crossword2/view/crossword2_view.dart b/lib/crossword2/view/crossword2_view.dart
@@ -20,7 +20,12 @@ class Crossword2View extends StatelessWidget {
     return CrosswordLayoutScope(
       data: CrosswordLayoutData.fromConfiguration(
         configuration: configuration,
-        cellSize: theme.io.wordInput.secondary.empty.size,
+        cellSize: Size(
+          theme.io.wordInput.secondary.empty.size.width +
+              theme.io.wordInput.secondary.padding.horizontal,
+          theme.io.wordInput.secondary.empty.size.height +
+              theme.io.wordInput.secondary.padding.vertical,
+        ),
       ),
       child: DefaultTransformationController(
         child: CrosswordInteractiveViewer(

diff --git a/lib/crossword2/widgets/crossword_letter.dart b/lib/crossword2/widgets/crossword_letter.dart
@@ -130,7 +130,10 @@ class CrosswordLetter extends StatelessWidget {
       onTap: () => _onTap(context),
       child: SizedBox.fromSize(
         size: crosswordData.cellSize,
-        child: IoCrosswordLetter(data.character, style: style),
+        child: Padding(
+          padding: theme.io.wordInput.secondary.padding,
+          child: IoCrosswordLetter(data.character, style: style),
+        ),
       ),
     );
   }

diff --git a/packages/io_crossword_ui/lib/src/theme/io_crossword_theme.dart b/packages/io_crossword_ui/lib/src/theme/io_crossword_theme.dart
@@ -122,11 +122,11 @@ class IoCrosswordTheme {
         color: letterTheme.empty.backgroundColor,
         width: 1.74,
       );
-      const size = Size.square(48);
+      const size = Size.square(53);
       final backgroundColor = letterTheme.empty.backgroundColor;
 
       return IoWordInputStyle(
-        padding: EdgeInsets.zero,
+        padding: const EdgeInsets.all(1.4),
         empty: IoWordInputCharacterFieldStyle(
           backgroundColor: backgroundColor,
           border: Border.all(

diff --git a/packages/io_crossword_ui/lib/src/widgets/io_crossword_letter.dart b/packages/io_crossword_ui/lib/src/widgets/io_crossword_letter.dart
@@ -27,8 +27,8 @@ class IoCrosswordLetter extends StatelessWidget {
 
     return DecoratedBox(
       decoration: BoxDecoration(
-        border: style.border,
         color: style.backgroundColor,
+        backgroundBlendMode: BlendMode.clear,
       ),
       child: data == null
           ? null

diff --git a/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_android.png b/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_android.png
diff --git a/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_dash.png b/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_dash.png
diff --git a/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_dino.png b/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_dino.png
diff --git a/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_empty.png b/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_empty.png
diff --git a/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_sparky.png b/packages/io_crossword_ui/test/src/widgets/goldens/io_crossword_letter_sparky.png
diff --git a/...rd_ui/test/src/widgets/goldens/io_word_input/io_word_input__secondary_style.png b/...rd_ui/test/src/widgets/goldens/io_word_input/io_word_input__secondary_style.png