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.

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

twemoji_v2からflutter_twemojiへの移行 #657

Open
wants to merge 5 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,8 @@ app.*.map.json

# Snap package related
*.snap
# Windows Installer related
*.isl
miria-installer*.exe
# FVM Version Cache
.fvm/
2 changes: 1 addition & 1 deletion lib/view/common/misskey_notes/custom_emoji.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import "package:miria/model/misskey_emoji_data.dart";
import "package:miria/providers.dart";
import "package:miria/view/common/misskey_notes/network_image.dart";
import "package:miria/view/themes/app_theme.dart";
import "package:twemoji_v2/twemoji_v2.dart";
import "package:flutter_twemoji/flutter_twemoji.dart";

class CustomEmoji extends ConsumerStatefulWidget {
final MisskeyEmojiData emojiData;
Expand Down
2 changes: 1 addition & 1 deletion lib/view/common/misskey_notes/mfm_text.dart
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import "package:miria/view/common/misskey_notes/link_navigator.dart";
import "package:miria/view/common/misskey_notes/network_image.dart";
import "package:miria/view/themes/app_theme.dart";
import "package:misskey_dart/misskey_dart.dart";
import "package:twemoji_v2/twemoji_v2.dart";
import "package:flutter_twemoji/flutter_twemoji.dart";
import "package:url_launcher/url_launcher.dart";

InlineSpan _unicodeEmojiBuilder(
Expand Down
16 changes: 8 additions & 8 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -629,6 +629,14 @@ packages:
description: flutter
source: sdk
version: "0.0.0"
flutter_twemoji:
dependency: "direct main"
description:
name: flutter_twemoji
sha256: "82d88c8df300f133dcc02a97829537b0861527d6d2f3315ed20c7b735b7b30ff"
url: "https://pub.dev"
source: hosted
version: "1.0.1"
flutter_web_plugins:
dependency: transitive
description: flutter
Expand Down Expand Up @@ -1662,14 +1670,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.2"
twemoji_v2:
dependency: "direct main"
description:
name: twemoji_v2
sha256: "1894d08626e6f07cb3dcd6286855407b322c157445008b54f683058fb868e1fb"
url: "https://pub.dev"
source: hosted
version: "0.6.0"
typed_data:
dependency: transitive
description:
Expand Down
3 changes: 1 addition & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ dependencies:
device_info_plus: ^10.1.0
colorfilter_generator: ^0.0.8
matrix2d: ^1.0.4
# TODO: DISCONTINUED
twemoji_v2: ^0.6.0
flutter_image_compress: ^2.0.4
webview_flutter: ^4.3.0
webview_flutter_android: ^3.12.0
Expand All @@ -77,6 +75,7 @@ dependencies:
flutter_hooks: ^0.20.5
punycode: ^1.0.0
image: ^4.3.0
flutter_twemoji: ^1.0.1
mime: ^1.0.6

dependency_overrides:
Expand Down
6 changes: 4 additions & 2 deletions windows/innosetup.iss
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,9 @@ DefaultDirName={autopf}\{#MyAppName}
DisableProgramGroupPage=yes
LicenseFile={#MyWorkDir}\LICENSE
; Uncomment the following line to run in non administrative install mode (install for current user only.)
;PrivilegesRequired=lowest
PrivilegesRequired=lowest
PrivilegesRequiredOverridesAllowed=dialog
UsePreviousPrivileges=yes
OutputDir={#MyWorkDir}
OutputBaseFilename=miria-installer
SetupIconFile={#MyWorkDir}\windows\runner\resources\app_icon.ico
Expand Down Expand Up @@ -55,7 +56,8 @@ Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: de
Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange (MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent

[UninstallDelete]
Type: files; Name: {userappdata}\info.shiosyakeyakini\miria\*
Type: filesandordirs; Name: {userappdata}\info.shiosyakeyakini\miria

[InstallDelete]
Type: files; Name: {app}/api-ms-*.dll
Type: filesandordirs; Name: {app}/data/flutter_assets/packages/twemoji_v2