Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Dependency updates and ZenitUI related changes #379

Merged
merged 2 commits into from
Sep 9, 2023
Merged

Dependency updates and ZenitUI related changes #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b05551
Update dependencies
larsb24 Sep 3, 2023
a909d96
Update to the latest ZenitUI
larsb24 Sep 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 4 additions & 6 deletions lib/components/overlays/quick_settings/quick_settings_overlay.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import 'dart:math';

import 'package:animations/animations.dart';
import 'package:dahlia_shared/dahlia_shared.dart';
import 'package:flutter/material.dart';
import 'package:flutter/rendering.dart';
import 'package:pangolin/components/overlays/quick_settings/pages/qs_account_page.dart';
import 'package:pangolin/components/overlays/quick_settings/pages/qs_language_page.dart';
Expand Down Expand Up @@ -191,9 +190,8 @@ class _QsMainState extends State<QsMain>
onPressed: () => QsController.pushRoute(context, "/pages/account"),
margin: EdgeInsets.zero,
textStyle: TextStyle(
fontSize: 14,
fontWeight: FontWeight.w600,
height: 1.1,
fontSize: 13,
fontWeight: FontWeight.w500,
color: Theme.of(context).foregroundColor,
),
),
Expand Down Expand Up @@ -345,7 +343,7 @@ class _QsMainState extends State<QsMain>
(e) => QsTrayMenuItem(item: e),
)
.toList(),
)
),
],
);
},
Expand Down Expand Up @@ -427,7 +425,7 @@ class _QsMainState extends State<QsMain>
},
),
],
)
),
],
),
),
Expand Down
3 changes: 1 addition & 2 deletions lib/components/overlays/quick_settings/widgets/qs_shortcut_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import 'package:flutter/material.dart';
import 'package:zenit_ui/zenit_ui.dart';

class QsShortcutButton extends StatelessWidget {
Expand Down Expand Up @@ -53,7 +52,7 @@ class QsShortcutButton extends StatelessWidget {
if (title != null)
Text(
title!,
style: const TextStyle(fontSize: 13),
style: const TextStyle(fontSize: 12),
)
else
const SizedBox.shrink(),
Expand Down
6 changes: 3 additions & 3 deletions lib/components/overlays/quick_settings/widgets/qs_slider.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
import 'package:flutter/material.dart';
import 'package:pangolin/widgets/quick_button.dart';
import 'package:zenit_ui/zenit_ui.dart';

Expand All @@ -40,7 +39,7 @@ class QsSlider extends StatelessWidget {
QuickActionButton(
leading: Icon(
icon,
size: 22,
size: 20,
),
margin: EdgeInsets.zero,
onPressed: onIconTap,
Expand All @@ -52,12 +51,13 @@ class QsSlider extends StatelessWidget {
divisions: steps,
label:
value != null ? '${(value! * 100).toStringAsFixed(0)}%' : null,
height: 6,
),
),
const QuickActionButton(
leading: Icon(
Icons.chevron_right,
size: 22,
size: 20,
),
margin: EdgeInsets.zero,
),
Expand Down
3 changes: 1 addition & 2 deletions lib/components/overlays/quick_settings/widgets/qs_toggle_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ limitations under the License.
*/

import 'package:dahlia_shared/dahlia_shared.dart';
import 'package:flutter/material.dart';
import 'package:zenit_ui/zenit_ui.dart';

class QsToggleButton extends StatelessWidget {
Expand Down Expand Up @@ -71,7 +70,7 @@ class QsToggleButton extends StatelessWidget {
overflow: TextOverflow.visible,
maxLines: 2,
style: TextStyle(
fontSize: 14,
fontSize: 12,
fontWeight: FontWeight.w500,
color: theme.computedForegroundColor(color),
),
Expand Down
1 change: 0 additions & 1 deletion lib/main.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ limitations under the License.
*/

import 'package:dahlia_shared/dahlia_shared.dart';
import 'package:flutter/material.dart';
import 'package:flutter_localizations/flutter_localizations.dart';
import "package:intl/locale.dart" as intl;
import 'package:pangolin/components/shell/desktop.dart';
Expand Down
3 changes: 1 addition & 2 deletions lib/widgets/quick_button.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ limitations under the License.
*/

import 'package:dahlia_shared/dahlia_shared.dart';
import 'package:flutter/material.dart';
import 'package:zenit_ui/zenit_ui.dart';

class QuickActionButton extends StatefulWidget {
Expand Down Expand Up @@ -72,7 +71,7 @@ class _QuickActionButtonState extends State<QuickActionButton> {
child: DefaultTextStyle(
style: widget.textStyle ??
context.theme.textTheme.bodyLarge!.copyWith(
fontSize: 13,
fontSize: 12,
fontWeight: FontWeight.normal,
),
child: !titleIsNull
Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ dependencies:
flutter_localizations:
sdk: flutter
gsettings: ^0.2.7
http: ^0.13.5
http: ^1.1.0
intl: ^0.18.0
jovial_svg: ^1.1.5
jovial_svg: ^1.1.17
logging: ^1.0.2
path: ^1.8.2
pausable_timer: ^2.0.0+1
Expand All @@ -40,7 +40,7 @@ dependencies:
git:
url: https://github.com/dahliaOS/utopia.git
ref: utopia
uuid: ^3.0.7
uuid: ^4.0.0
xdg_desktop:
git: https://github.com/HrX03/xdg.dart
xdg_directories: ^1.0.3
Expand All @@ -60,7 +60,7 @@ dependencies:
git:
url: https://github.com/dahliaOS/zenit_ui.git
# change before merge
ref: v0.0.11
ref: Version-0.0.12


dev_dependencies:
Expand Down
Loading