Skip to content

Commit

Permalink
chown windows
Browse files Browse the repository at this point in the history
  • Loading branch information
@Lenny4
Lenny4 committed Jun 21, 2023
1 parent 6a16043 commit 6140214
Show file tree
Hide file tree
Showing 17 changed files with 213 additions and 348 deletions.
25 changes: 21 additions & 4 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,21 @@

### Removed

## [0.3.0] - 2023-06-20

### Added

- Add self promotion on the home screen and help screen
- Add more info on release (download count, release date)

### Changed

- Copy `msvcp140.dll` `vcruntime140.dll` and `vcruntime140_1.dll` directly from the github host (
windows)

see `Copy dll files` in `.github/workflows/release.yml`
- Change screen `Tutorials` to `Help` and add more useful links

## [0.2.0] - 2023-06-18

### Added
Expand All @@ -22,20 +37,22 @@ Note: need to install it manually from the github if on windows.

### Fixed

- Fix the bug on windows which erased DeepFaceLabClient when trying to install a release (/!\ the bug is still present in earlier versions)
- Fix the bug on windows which erased DeepFaceLabClient when trying to install a release (/!\ the
bug is still present in earlier versions)

## [0.1.1] - 2023-06-13

Note: on this version installing another release doesn't work (on windows), you need to install it manually from the github.
Note: on this version installing another release doesn't work (on windows), you need to install it
manually from the github.

### Fixed

- Fix download Miniconda3-latest-Linux-x86_64.sh with no certificate


## [0.1.0] - 2023-06-12

Note: on this version installing another release doesn't work (on windows), you need to install it manually from the github.
Note: on this version installing another release doesn't work (on windows), you need to install it
manually from the github.

### Added

Expand Down
3 changes: 3 additions & 0 deletions lib/class/release.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,14 @@ class Release {
@JsonKey(name: 'tag_name')
String tagName;
List<ReleaseAsset> assets;
@JsonKey(name: 'published_at')
DateTime publishedAt;

Release({
required this.body,
required this.assets,
required this.tagName,
required this.publishedAt,
});

factory Release.fromJson(Map<String, dynamic> json) =>
Expand Down
2 changes: 2 additions & 0 deletions lib/class/release.g.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions lib/class/release_asset.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ part 'release_asset.g.dart';
class ReleaseAsset {
@JsonKey(name: 'browser_download_url')
String browserDownloadUrl;
String name;
@JsonKey(name: 'download_count')
int downloadCount;

ReleaseAsset({
required this.browserDownloadUrl,
required this.name,
required this.downloadCount,
});

factory ReleaseAsset.fromJson(Map<String, dynamic> json) =>
Expand Down
4 changes: 4 additions & 0 deletions lib/class/release_asset.g.dart
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 13 additions & 23 deletions lib/main.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,18 +6,18 @@ import 'package:deepfacelab_client/class/storage.dart';
import 'package:deepfacelab_client/class/window_command.dart';
import 'package:deepfacelab_client/class/workspace.dart';
import 'package:deepfacelab_client/screens/dashboard_screen.dart';
import 'package:deepfacelab_client/screens/help_screen.dart';
import 'package:deepfacelab_client/screens/loading_screen.dart';
import 'package:deepfacelab_client/screens/settings_screen.dart';
import 'package:deepfacelab_client/screens/tutorial_screen.dart';
import 'package:deepfacelab_client/screens/window_command_screen.dart';
import 'package:deepfacelab_client/screens/workspace_screen.dart';
import 'package:deepfacelab_client/service/locale_storage_service.dart';
import 'package:deepfacelab_client/widget/installation/has_requirements_widget.dart';
import 'package:file_sizes/file_sizes.dart';
import 'package:filesystem_picker/filesystem_picker.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:flutter_redux_hooks/flutter_redux_hooks.dart';
import 'package:package_info_plus/package_info_plus.dart';
import 'package:redux/redux.dart' as redux;
Expand Down Expand Up @@ -134,9 +134,9 @@ class Root extends HookWidget {
destination: const NavigationRailDestination(
icon: Icon(Icons.lightbulb),
selectedIcon: Icon(Icons.lightbulb),
label: Text('Tutorials'),
label: Text('Help'),
),
widget: const TutorialScreen()),
widget: const HelpScreen()),
);
return result;
}
Expand Down Expand Up @@ -181,25 +181,15 @@ class Root extends HookWidget {
alignment: Alignment.bottomCenter,
child: Padding(
padding: const EdgeInsets.only(bottom: 8.0),
child: SelectableText.rich(
TextSpan(
children: [
TextSpan(
text: packageInfo?.version ?? "",
style: const TextStyle(
color: Colors.blue),
recognizer: TapGestureRecognizer()
..onTap = () {
launchUrl(
Uri.parse(
'https://github.com/Lenny4/DeepFaceLabClient/releases'),
mode: LaunchMode
.platformDefault);
},
),
],
),
),
child: MarkdownBody(
selectable: true,
data:
"[${packageInfo?.version ?? ''}](https://github.com/Lenny4/DeepFaceLabClient/releases)",
onTapLink: (text, url, title) {
if (url != null) {
launchUrl(Uri.parse(url));
}
}),
),
),
),
Expand Down
66 changes: 66 additions & 0 deletions lib/screens/help_screen.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import 'package:deepfacelab_client/widget/common/self_promotion_widget.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:url_launcher/url_launcher.dart';

class HelpScreen extends HookWidget {
const HelpScreen({Key? key}) : super(key: key);

@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const SelectableText('Help'),
),
body: SingleChildScrollView(
child: Container(
margin: const EdgeInsets.all(10.0),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
const Padding(
padding: EdgeInsets.only(bottom: 16),
child: SelfPromotionWidget(),
),
Padding(
padding: const EdgeInsets.only(bottom: 8.0),
child: MarkdownBody(
selectable: true,
data: """
## Video tutorials
Watching all videos takes time (about 7h20) but worth it.
Please not that none of these tutorials have been made with DeepFaceLabClient but only with DeepFaceLab.
1. [DeepFace Lab Tutorial: How to make a DeepFake](https://www.youtube.com/watch?v=QSmHho1uHFM) by Druuzil [Dec 17, 2021]
2. [Deepface Live Tutorial - How to make your own Live Model!](https://www.youtube.com/watch?v=_bc3SPbCdW8) by Druuzil [Apr 14, 2022]
3. [Deepface Lab Tutorial - Advanced Training Methods](https://www.youtube.com/watch?v=1Bt5wyGqdk4) by Druuzil [Aug 29, 2022]
""",
onTapLink: (text, url, title) {
if (url != null) launchUrl(Uri.parse(url));
}),
),
Padding(
padding: const EdgeInsets.only(top: 8.0),
child: MarkdownBody(
selectable: true,
data: """
## DeepfakeVFX
If you don't know where to start we suggest you to visit [deepfakevfx.com](https://www.deepfakevfx.com/)
- [Deepfake Guides](https://www.deepfakevfx.com/guides/)
- [Deepfake Tutorials](https://www.deepfakevfx.com/tutorials/)
- [Deepfake Downloads](https://www.deepfakevfx.com/downloads/)
""",
onTapLink: (text, url, title) {
if (url != null) launchUrl(Uri.parse(url));
}),
),
],
)),
),
);
}
}
115 changes: 0 additions & 115 deletions lib/screens/tutorial_screen.dart
View file

This file was deleted.

25 changes: 8 additions & 17 deletions lib/widget/common/deepfacelab_command_widget.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import 'package:deepfacelab_client/class/workspace.dart';
import 'package:deepfacelab_client/service/window_command_service.dart';
import 'package:deepfacelab_client/widget/common/form/deepfacelab_command_form_widget.dart';
import 'package:desktop_multi_window/desktop_multi_window.dart';
import 'package:flutter/gestures.dart';
import 'package:flutter/material.dart';
import 'package:flutter_hooks/flutter_hooks.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:flutter_redux_hooks/flutter_redux_hooks.dart';
import 'package:url_launcher/url_launcher.dart';

Expand Down Expand Up @@ -45,22 +45,13 @@ class _SingleDeepfacelabCommandWidget extends HookWidget {
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
SelectableText.rich(
TextSpan(
children: [
TextSpan(
text: "Documentation",
style: const TextStyle(color: Colors.blue),
recognizer: TapGestureRecognizer()
..onTap = () {
launchUrl(
Uri.parse(windowCommand.documentationLink),
mode: LaunchMode.platformDefault);
},
),
],
),
),
MarkdownBody(
selectable: true,
data:
"[Documentation](${windowCommand.documentationLink})",
onTapLink: (text, url, title) {
if (url != null) launchUrl(Uri.parse(url));
}),
if (workspace != null)
DeepfacelabCommandFormWidget(
workspace: workspace!,
Expand Down
Loading

0 comments on commit 6140214

Please sign in to comment.