mirror of
https://github.com/Such-Software/hash-wallet.git
synced 2026-10-18 05:51:34 +02:00
* Add theme base v2 * Initial new theme base files * Typos * Fixes * Update theme files * feat: Migrate to Material 3 Theming Foundation, Theme Data Refactor, and First Extension Cleanup Batch. This commit completes the first major phase of migrating to Material 3 theming by setting up the foundations for material 3 integration and begins the initial migration, removing custom theme extensions, updating theme data, and refactoring all relevant widget and page theming to use Material 3’s built-in color and typography tokens. These changes: - Lays the groundwork for Material 3 theming by restructuring the app’s theme configuration to use Material 3’s ColorScheme and TextTheme as the primary sources of color and typography throughout the app. - Refactors the core theme config files by removing legacy custom color roles ensuring all color definitions now map directly to Material 3’s role. - Begins the first batch migration of custom theme extensions (InfoTheme, PlaceholderTheme, KeyboardTheme, PinCodeTheme) and updates all affected widgets and pages to use Material 3 color and typography tokens instead of the custom properties. - Cleans up the codebase by deleting the files of the initial set of migrated extensions and eliminating all related imports and usages. * feat: Migrate to Material 3 Theming. This change: - Updates the themes README.md file to reflect the current structure and give more information based on the first major phase that was completed. * feat: Migrate to Material 3 Theming Deleting previous theme extensions * feat: Migrate to Material 3 Theming Another batch of migrations from existing extensions * feat: Migration to Material 3 Theming Third Migration batch for theme extensions * fwat: Migration to Material 3 Theming Final Migration batch for previous theme extensions * Update onboarding hero * Update button radius * Add surfaceContainer to light theme * feat(themes): Migrate to Material 3 Theming This change: - Adds new set of hero images - Modifies the core structure for the themes - Add missing color tokens to the theme classes - Adds a CustomThemeColor class for custom color tokens - Modifies the themelist to have a fall back for previous theme implementation - Adds localization for some texts - Modifies the flow for loading the theme on app start - Add a WidgetsBindingObserver that listens for changes in the device theme and updates the app theme when there is a change - Registers the themeStore as a Singleton for codebase wide use * feat(themes): Migrate to Material 3 theming This change: - Migrates UI flows across the app to the new themes - Confirms styling and typography of components across the app uses the new themes - Remove instances of Palette use - Switch TextStyles across the app to use theme text styles * feat(themes): Migrate to Material 3 Theming. This change: - Adjusts bottomsheets styling and removes duplicate close button - Removes more themedata extensions from the previous implementation * - Remove outlines from cards and dock - Update menu colors - Update padding/divider size for cards * - Update PIN screen - Fix navigation dock shadow - Update wallet screen colors * Update border radius --skip-ci * feat(themes): Migrate to Material 3 Theming. This change: - Adds gradient backgrounds to the dashbaord and balance cards. - Migrates the input fields across the app to BaseTextFormFields. - Removes dependence of input fields on individual styling, focusing instead on using theme defined InputDecoration styling with adjustments on individual components where needed. - Applies new theme styling to BaseTextFormField, AddressTextField and CurrencyAmountTextField. * - Switch some hero images to PNG - Fix nagivation_dock shadow - Minor fixes * feat: Add fallback to previous underline styling in central widgets This change: - Adds a fallback to CurrencyAmountTextField, AddressTextField, and BaseTextFormField, allowing them use the previous theme styling. - Adds localization for new texts * feat(themes): Update warning box colors for dark and light themes * feat(themes): Relaod themes when user restores from backup, ensuring the user previous theme preference is used. * feat(themes): Handle themes logic during restore from backup This change: - Refactors theme loading logic to handle backup restore edgecase - Refreshes the theme based on the user saved preference during restore from backup flow * Fix card gradients and spacing * Fix even more radiuses Test new icons for navigation_dock.dart * Update onboarding flow backgrounds Fix swap icon clipping Fix some text colors Add more hero images * Fix incorrect color for light theme * Fix more hero images and cleanup * Update text field icons Fix info box CTA colors Fix sync indicator colors * Update toggle colors Update dark theme colors (minor) Update crypto_balance_widget.dart icon * Update page transitions in router.dart Fix some colors * feat(themes): Display label by default for filled textfields * feat(themes): Refactor theme handling across various components This change: - Fixes issue with themeMode resetting to system mode when app is restarted causing a UI glitch - Updates theme checks from `currentTheme.type == ThemeType.dark` to `currentTheme.isDark` for consistency - Adjusts UI components to use the theme directly from the themeStore * feat(themes): Add animating tagline to the create pin welcome screen * Revert text fields label temporarily, fix a couple colors, and cleanup some images --------- Co-authored-by: OmarHatem <omarh.ismail1@gmail.com> Co-authored-by: Blazebrain <davidadegoke16@gmail.com>
202 lines
5.7 KiB
Dart
202 lines
5.7 KiB
Dart
import 'package:cw_core/utils/text_normalizer.dart';
|
|
import 'package:flutter/material.dart';
|
|
|
|
extension Compare<T> on Comparable<T> {
|
|
bool operator <=(T other) => compareTo(other) <= 0;
|
|
bool operator >=(T other) => compareTo(other) >= 0;
|
|
bool operator <(T other) => compareTo(other) < 0;
|
|
bool operator >(T other) => compareTo(other) > 0;
|
|
}
|
|
|
|
class Annotation implements Comparable<Annotation> {
|
|
Annotation({required this.range, required this.style});
|
|
|
|
final TextRange range;
|
|
final TextStyle style;
|
|
|
|
@override
|
|
int compareTo(Annotation other) => range.start.compareTo(other.range.start);
|
|
}
|
|
|
|
class TextAnnotation implements Comparable<TextAnnotation> {
|
|
TextAnnotation({required this.text, required this.style});
|
|
|
|
final TextStyle style;
|
|
final String text;
|
|
|
|
@override
|
|
int compareTo(TextAnnotation other) => text.compareTo(other.text);
|
|
}
|
|
|
|
class ValidatableAnnotatedEditableText extends EditableText {
|
|
ValidatableAnnotatedEditableText({
|
|
Key? key,
|
|
required FocusNode focusNode,
|
|
required TextEditingController controller,
|
|
// required List<String> wordList,
|
|
required Color cursorColor,
|
|
required Color backgroundCursorColor,
|
|
required this.validStyle,
|
|
required this.invalidStyle,
|
|
required this.words,
|
|
this.normalizeSeed = false,
|
|
TextStyle textStyle = const TextStyle(
|
|
color: Colors.black,
|
|
backgroundColor: Colors.transparent,
|
|
fontWeight: FontWeight.normal,
|
|
fontSize: 16,
|
|
),
|
|
TextSelectionControls? selectionControls,
|
|
Color? selectionColor,
|
|
ValueChanged<String>? onChanged,
|
|
ValueChanged<String>? onSubmitted,
|
|
}) : super(
|
|
maxLines: null,
|
|
key: key,
|
|
focusNode: focusNode,
|
|
controller: controller,
|
|
cursorColor: cursorColor,
|
|
style: validStyle,
|
|
keyboardType: TextInputType.visiblePassword,
|
|
autocorrect: false,
|
|
autofocus: false,
|
|
selectionColor: selectionColor,
|
|
selectionControls: selectionControls,
|
|
backgroundCursorColor: backgroundCursorColor,
|
|
onChanged: onChanged,
|
|
onSubmitted: onSubmitted,
|
|
|
|
toolbarOptions: const ToolbarOptions(
|
|
copy: true,
|
|
cut: true,
|
|
paste: true,
|
|
selectAll: true,
|
|
),
|
|
enableSuggestions: false,
|
|
enableInteractiveSelection: true,
|
|
showSelectionHandles: true,
|
|
showCursor: true,
|
|
);
|
|
|
|
final bool normalizeSeed;
|
|
final List<String> words;
|
|
final TextStyle validStyle;
|
|
final TextStyle invalidStyle;
|
|
|
|
@override
|
|
ValidatableAnnotatedEditableTextState createState() => ValidatableAnnotatedEditableTextState();
|
|
}
|
|
|
|
class ValidatableAnnotatedEditableTextState extends EditableTextState {
|
|
@override
|
|
ValidatableAnnotatedEditableText get widget => super.widget as ValidatableAnnotatedEditableText;
|
|
|
|
List<Annotation> getRanges() {
|
|
final result = <Annotation>[];
|
|
// Replace Ideographic Space (U+3000) with a normal space
|
|
final text = textEditingValue.text.replaceAll("\u3000", " ");
|
|
final source = text
|
|
.split(' ')
|
|
.map((word) {
|
|
final ranges = range(word, text);
|
|
final isValid = validate(word);
|
|
|
|
return ranges.map(
|
|
(range) => Annotation(
|
|
style: isValid ? widget.validStyle : widget.invalidStyle,
|
|
range: range,
|
|
),
|
|
);
|
|
})
|
|
.expand((e) => e)
|
|
.toList();
|
|
source.sort();
|
|
Annotation? prev;
|
|
|
|
for (var item in source) {
|
|
Annotation? annotation;
|
|
|
|
if (prev == null) {
|
|
annotation = Annotation(
|
|
range: TextRange(start: 0, end: item.range.start),
|
|
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
backgroundColor: Colors.transparent,
|
|
),
|
|
);
|
|
} else if (prev.range.end < item.range.start) {
|
|
annotation = Annotation(
|
|
range: TextRange(start: prev.range.end, end: item.range.start),
|
|
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
|
color: Theme.of(context).colorScheme.onError,
|
|
backgroundColor: Colors.transparent,
|
|
),
|
|
);
|
|
}
|
|
|
|
if (annotation != null) {
|
|
result.add(annotation);
|
|
result.add(item);
|
|
prev = item;
|
|
}
|
|
}
|
|
|
|
if (result.length > 0 && result.last.range.end < text.length) {
|
|
result.add(
|
|
Annotation(
|
|
range: TextRange(start: result.last.range.end, end: text.length),
|
|
style: Theme.of(context).textTheme.bodyMedium!.copyWith(
|
|
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
|
backgroundColor: Colors.transparent,
|
|
),
|
|
),
|
|
);
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
bool validate(String source) =>
|
|
widget.words.indexOf(widget.normalizeSeed ? normalizeText(source) : source) >= 0;
|
|
|
|
List<TextRange> range(String pattern, String source) {
|
|
final result = <TextRange>[];
|
|
|
|
if (pattern.isEmpty || source.isEmpty) {
|
|
return result;
|
|
}
|
|
|
|
for (int index = source.indexOf(pattern);
|
|
index >= 0;
|
|
index = source.indexOf(pattern, index + 1)) {
|
|
final start = index;
|
|
final end = start + pattern.length;
|
|
result.add(TextRange(start: start, end: end));
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
@override
|
|
TextSpan buildTextSpan() {
|
|
final text = textEditingValue.text;
|
|
final ranges = getRanges().toSet();
|
|
|
|
if (ranges.isNotEmpty) {
|
|
return TextSpan(
|
|
style: widget.style,
|
|
children: ranges
|
|
.map(
|
|
(item) => TextSpan(
|
|
style: item.style,
|
|
text: item.range.textInside(text),
|
|
),
|
|
)
|
|
.toList(),
|
|
);
|
|
}
|
|
|
|
return TextSpan(style: widget.style, text: text);
|
|
}
|
|
}
|