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

fix: Use correct title size for bottom sheet #1687

Merged
merged 4 commits into from
Feb 12, 2024
Merged

fix: Use correct title size for bottom sheet #1687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dd85741
fix: Use correct title size for bottom sheet
TheAabedKhan Feb 12, 2024
6b5f7a6
fix: Use primary color for Markdown links
TheAabedKhan Feb 12, 2024
a0f7524
fix: Use correct names in contributors screen
TheAabedKhan Feb 12, 2024
e8817a9
Merge branch 'dev' into fix/bottomsheet
oSumAtrIX Feb 12, 2024
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
Empty file added assets/i18n/en_US.json
View file
Open in desktop
Empty file.
10 changes: 5 additions & 5 deletions assets/i18n/strings.i18n.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,11 +270,11 @@
},
"contributorsView": {
"widgetTitle": "Contributors",
"patcherContributors": "Patcher contributors",
"patchesContributors": "Patches contributors",
"integrationsContributors": "Integrations contributors",
"cliContributors": "CLI contributors",
"managerContributors": "Manager contributors"
"patcherContributors": "ReVanced Patcher",
"patchesContributors": "ReVanced Patches",
"integrationsContributors": "ReVanced Integrations",
"cliContributors": "ReVanced CLI",
"managerContributors": "ReVanced Manager"
},
"installErrorDialog": {
"mount_version_mismatch": "Version mismatch",
Expand Down
112 changes: 63 additions & 49 deletions lib/ui/widgets/homeView/update_confirmation_sheet.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ import 'package:revanced_manager/gen/strings.g.dart';
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';

class UpdateConfirmationSheet extends StatelessWidget {
const UpdateConfirmationSheet({super.key, required this.isPatches, this.changelog = false});
const UpdateConfirmationSheet({
super.key,
required this.isPatches,
this.changelog = false,
});

final bool isPatches;
final bool changelog;
Expand Down Expand Up @@ -38,70 +42,75 @@ class UpdateConfirmationSheet extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
if (!changelog)
Padding(
padding: const EdgeInsets.only(
top: 40.0,
left: 24.0,
right: 24.0,
bottom: 20.0,
),
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Padding(
padding: const EdgeInsets.only(
top: 40.0,
left: 24.0,
right: 24.0,
bottom: 20.0,
),
child: Row(
children: [
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
isPatches
isPatches
? t.homeView.updatePatchesSheetTitle
: t.homeView.updateSheetTitle,
style: const TextStyle(
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
const SizedBox(height: 4.0),
Row(
children: [
Icon(
Icons.new_releases_outlined,
color:
Theme.of(context).colorScheme.secondary,
fontSize: 24,
fontWeight: FontWeight.bold,
),
),
const SizedBox(width: 8.0),
Text(
snapshot.data!['tag_name'] ?? 'Unknown',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
const SizedBox(height: 4.0),
Row(
children: [
Icon(
Icons.new_releases_outlined,
color: Theme.of(context)
.colorScheme
.secondary,
),
),
],
),
],
const SizedBox(width: 8.0),
Text(
snapshot.data!['tag_name'] ?? 'Unknown',
style: TextStyle(
fontSize: 20,
fontWeight: FontWeight.w500,
color: Theme.of(context)
.colorScheme
.secondary,
),
),
],
),
],
),
),
),
FilledButton(
onPressed: () {
Navigator.of(context).pop();
isPatches
? model.updatePatches(context)
: model.updateManager(context);
},
FilledButton(
onPressed: () {
Navigator.of(context).pop();
isPatches
? model.updatePatches(context)
: model.updateManager(context);
},
child: Text(t.updateButton),
),
],
),
],
),
),
),
Padding(
padding: const EdgeInsets.only(top: 12.0, left: 24.0, bottom: 12.0),
padding: const EdgeInsets.only(
top: 12.0,
left: 24.0,
bottom: 12.0,
),
child: Text(
t.homeView.updateChangelogTitle,
style: TextStyle(
fontSize: 20,
fontSize: changelog ? 24 : 20,
fontWeight: FontWeight.w500,
color:
Theme.of(context).colorScheme.onSecondaryContainer,
Expand All @@ -115,6 +124,11 @@ class UpdateConfirmationSheet extends StatelessWidget {
borderRadius: BorderRadius.circular(12.0),
),
child: Markdown(
styleSheet: MarkdownStyleSheet(
a: TextStyle(
color: Theme.of(context).colorScheme.primary,
),
),
shrinkWrap: true,
physics: const NeverScrollableScrollPhysics(),
padding: const EdgeInsets.all(20.0),
Expand Down