beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into theme

Browse source
This commit is contained in:
Neeraj Gupta 2022-03-08 21:17:28 +05:30
parent 7a04fd5f9c 2712fd73c5
commit e1ceb7f531
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
7 changed files with 135 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/app.dart
View file

@ -151,6 +151,12 @@ class _EnteAppState extends State<EnteApp> with WidgetsBindingObserver {
);
}
@override
void dispose() {
WidgetsBinding.instance.removeObserver(this);
super.dispose();
}
@override
void didChangeAppLifecycleState(AppLifecycleState state) {
if (state == AppLifecycleState.resumed) {

46
lib/ui/common/report_bug_popup.dart
View file

@ -1,29 +1,27 @@
import 'package:flutter/material.dart';
import 'package:photos/utils/email_util.dart';
PopupMenuButton<dynamic> reportBugPopupMenu(BuildContext context) {
return PopupMenuButton(
itemBuilder: (context) {
final List<PopupMenuItem> items = [];
items.add(
PopupMenuItem(
value: 1,
child: Row(
children: const [
Text("contact support"),
],
),
return PopupMenuButton(
itemBuilder: (context) {
final List<PopupMenuItem> items = [];
items.add(
PopupMenuItem(
value: 1,
child: Row(
children: const [
Text("contact support"),
],
),
);
return items;
},
onSelected: (value) async {
if (value == 1) {
await sendLogs(context, "contact support", "support@ente.io", postShare: () {
});
}
},
);
}
),
);
return items;
},
onSelected: (value) async {
if (value == 1) {
await sendLogs(context, "contact support", "support@ente.io",
postShare: () {});
}
},
);
}

70
lib/ui/settings/info_section_widget.dart
View file

@ -1,5 +1,3 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:photos/services/update_service.dart';
import 'package:photos/ui/app_update_dialog.dart';
@ -69,46 +67,38 @@ class InfoSectionWidget extends StatelessWidget {
child:
SettingsTextItem(text: "source code", icon: Icons.navigate_next),
),
Divider(height: 4),
UpdateService.instance.isIndependent()
? GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () async {
final dialog = createProgressDialog(context, "checking...");
await dialog.show();
final shouldUpdate =
await UpdateService.instance.shouldUpdate();
await dialog.hide();
if (shouldUpdate) {
showDialog(
context: context,
builder: (BuildContext context) {
return AppUpdateDialog(
UpdateService.instance.getLatestVersionInfo());
},
barrierColor: Colors.black.withOpacity(0.85),
);
} else {
showToast("you are on the latest version");
}
},
child: SettingsTextItem(
text: "check for updates", icon: Icons.navigate_next),
? Column(
children: [
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () async {
final dialog =
createProgressDialog(context, "checking...");
await dialog.show();
final shouldUpdate =
await UpdateService.instance.shouldUpdate();
await dialog.hide();
if (shouldUpdate) {
showDialog(
context: context,
builder: (BuildContext context) {
return AppUpdateDialog(
UpdateService.instance.getLatestVersionInfo());
},
barrierColor: Colors.black.withOpacity(0.85),
);
} else {
showToast("you are on the latest version");
}
},
child: SettingsTextItem(
text: "check for updates", icon: Icons.navigate_next),
),
],
)
: GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
if (Platform.isAndroid) {
launch(
"https://play.google.com/store/apps/details?id=io.ente.photos");
} else {
launch(
"https://apps.apple.com/in/app/ente-photos/id1542026904");
}
},
child: SettingsTextItem(
text: "store rating", icon: Icons.navigate_next),
),
: Container(),
],
);
}

65
lib/ui/settings/social_section_widget.dart Normal file
View file

@ -0,0 +1,65 @@
import 'dart:io';
import 'package:flutter/material.dart';
import 'package:photos/services/update_service.dart';
import 'package:photos/ui/settings/settings_section_title.dart';
import 'package:photos/ui/settings/settings_text_item.dart';
import 'package:url_launcher/url_launcher.dart';
class SocialSectionWidget extends StatelessWidget {
const SocialSectionWidget({Key key}) : super(key: key);
@override
Widget build(BuildContext context) {
return Column(
children: [
SettingsSectionTitle("social"),
Padding(padding: EdgeInsets.all(4)),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
launch("https://twitter.com/enteio");
},
child: SettingsTextItem(text: "twitter", icon: Icons.navigate_next),
),
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
launch("https://discord.gg/uRqua3jSr5");
},
child: SettingsTextItem(text: "discord", icon: Icons.navigate_next),
),
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
launch("https://reddit.com/r/enteio");
},
child: SettingsTextItem(text: "reddit", icon: Icons.navigate_next),
),
!UpdateService.instance.isIndependent()
? Column(
children: [
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
if (Platform.isAndroid) {
launch(
"https://play.google.com/store/apps/details?id=io.ente.photos");
} else {
launch(
"https://apps.apple.com/in/app/ente-photos/id1542026904");
}
},
child: SettingsTextItem(
text: "rate us! ✨", icon: Icons.navigate_next),
),
],
)
: Container(),
],
);
}
}

8
lib/ui/settings/support_section_widget.dart
View file

@ -56,14 +56,6 @@ class SupportSectionWidget extends StatelessWidget {
child: SettingsTextItem(text: "roadmap", icon: Icons.navigate_next),
),
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () {
launch("https://reddit.com/r/enteio");
},
child: SettingsTextItem(text: "community", icon: Icons.navigate_next),
),
Divider(height: 4),
GestureDetector(
behavior: HitTestBehavior.translucent,
onTap: () async {

3
lib/ui/settings_page.dart
View file

@ -10,6 +10,7 @@ import 'package:photos/ui/settings/debug_section_widget.dart';
import 'package:photos/ui/settings/details_section_widget.dart';
import 'package:photos/ui/settings/info_section_widget.dart';
import 'package:photos/ui/settings/security_section_widget.dart';
import 'package:photos/ui/settings/social_section_widget.dart';
import 'package:photos/ui/settings/support_section_widget.dart';
class SettingsPage extends StatelessWidget {
@ -43,6 +44,8 @@ class SettingsPage extends StatelessWidget {
Padding(padding: EdgeInsets.all(12)),
SupportSectionWidget(),
Padding(padding: EdgeInsets.all(12)),
SocialSectionWidget(),
Padding(padding: EdgeInsets.all(12)),
InfoSectionWidget(),
]);
if (hasLoggedIn) {

9
lib/utils/email_util.dart
View file

@ -3,16 +3,19 @@ import 'dart:io';
import 'package:archive/archive_io.dart';
import 'package:email_validator/email_validator.dart';
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter/widgets.dart';
import 'package:flutter_email_sender/flutter_email_sender.dart';
import 'package:logging/logging.dart';
import 'package:path_provider/path_provider.dart';
import 'package:photos/ui/common/dialogs.dart';
import 'package:photos/ui/log_file_viewer.dart';
import 'package:photos/utils/dialog_util.dart';
import 'package:share_plus/share_plus.dart';
import 'package:super_logging/super_logging.dart';
final Logger _logger = Logger('email_util');
bool isValidEmail(String email) {
return EmailValidator.validate(email);
}
@ -133,6 +136,12 @@ Future<void> _sendLogs(
await FlutterEmailSender.send(email);
} catch (e, s) {
_logger.severe('email sender failed', e, s);
final result = await showChoiceDialog(
context, "email logs", "please send the logs to $toEmail",
firstAction: "copy email", secondAction: "ok");
if (result != null && result == DialogUserChoice.firstChoice) {
await Clipboard.setData(ClipboardData(text: toEmail));
}
await Share.shareFiles([zipFilePath]);
}
}