Skip to content

Commit

Permalink
chore: restructure directories and remove duplicated fonts (#938)
Browse files Browse the repository at this point in the history
* chore: restructure directories and remove duplicated fonts

* fix: add missing async

* fix(pubspec.yaml): correct output_class_file
  • Loading branch information
Feichtmeier authored Oct 24, 2024
1 parent f29d45e commit ba06773
Show file tree
Hide file tree
Showing 39 changed files with 25 additions and 632 deletions.
2 changes: 1 addition & 1 deletion example/lib/pages/theme_page/theme_page.dart
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:yaru/theme.dart';
import 'package:yaru/yaru.dart';

import 'home.dart';

Expand Down
10 changes: 5 additions & 5 deletions lib/icons.dart
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Animated Icons
export 'src/icons_widgets/yaru_animated_icon.dart';
export 'src/icons_widgets/yaru_animated_icons.dart';
export 'src/icons/icons_widgets/yaru_animated_icon.dart';
export 'src/icons/icons_widgets/yaru_animated_icons.dart';
// Widgets
export 'src/icons_widgets/yaru_placeholder_icon.dart';
export 'src/yaru_freedesktop_icons.dart';
export 'src/yaru_icons.dart';
export 'src/icons/icons_widgets/yaru_placeholder_icon.dart';
export 'src/icons/yaru_freedesktop_icons.dart';
export 'src/icons/yaru_icons.dart';
4 changes: 4 additions & 0 deletions lib/settings.dart
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
export 'src/settings/gtk_constants.dart';
export 'src/settings/inherited_theme.dart';
export 'src/settings/settings_service.dart';
export 'src/settings/yaru_settings.dart';
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import 'package:flutter/material.dart';

import '../icons.dart';
import '../../icons.dart';

/// Binding name enumeration between [YaruIcons] and the Freedesktop Icon Naming Specification
/// Based on: https://specifications.freedesktop.org/icon-naming-spec/icon-naming-spec-latest.html
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import 'package:collection/collection.dart';
import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart';
import 'package:platform_linux/platform.dart';
import 'package:yaru/src/theme_widgets/yaru_settings.dart';
import 'package:yaru/src/settings/yaru_settings.dart';

import '../../theme.dart';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ class GSettingsService {
}
}

void dispose() {
Future<void> dispose() async {
for (final settings in _settings.values) {
settings?.dispose();
await settings?.dispose();
}
}
}
Expand All @@ -42,7 +42,7 @@ class GnomeSettings {
}
}

void dispose() => _settings.close();
Future<void> dispose() async => await _settings.close();

bool? boolValue(String key) => getValue<bool>(key);
int? intValue(String key) => getValue<int>(key);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ import 'dart:async';

import 'package:flutter/foundation.dart';
import 'package:gtk/gtk.dart';
import 'package:yaru/src/theme_widgets/gtk_constants.dart';
import 'package:yaru/src/theme_widgets/settings_service.dart';
import 'package:yaru/src/settings/gtk_constants.dart';
import 'package:yaru/src/settings/settings_service.dart';

abstract class YaruSettings {
factory YaruSettings() = YaruGtkSettings;
Expand Down Expand Up @@ -51,7 +51,7 @@ class YaruGtkSettings extends YaruSettings {
@override
Future<void> dispose() async {
await _accentColorController.close();
_gSettingsService.dispose();
await _gSettingsService.dispose();
}

@override
Expand Down
21 changes: 0 additions & 21 deletions lib/src/text/fonts/CONTRIBUTING.txt

This file was deleted.

292 changes: 0 additions & 292 deletions lib/src/text/fonts/FONTLOG.txt

This file was deleted.

Loading

0 comments on commit ba06773

Please sign in to comment.