mirror of
https://github.com/revanced/revanced-manager.git
synced 2025-06-12 04:37:37 +02:00
fix: app listing on Home View
This commit is contained in:
@ -1,3 +1,5 @@
|
||||
import 'dart:typed_data';
|
||||
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:flutter_i18n/flutter_i18n.dart';
|
||||
import 'package:google_fonts/google_fonts.dart';
|
||||
@ -32,8 +34,11 @@ class AppSelectorCard extends StatelessWidget {
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
const SizedBox(height: 10),
|
||||
I18nText(
|
||||
'appSelectorCard.widgetTitle',
|
||||
locator<AppSelectorViewModel>().selectedApp == null
|
||||
? 'appSelectorCard.widgetTitle'
|
||||
: 'appSelectorCard.widgetTitleSelected',
|
||||
child: Text(
|
||||
'',
|
||||
style: GoogleFonts.roboto(
|
||||
@ -43,17 +48,35 @@ class AppSelectorCard extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
const SizedBox(height: 10),
|
||||
locator<AppSelectorViewModel>().selectedApp != null
|
||||
? Text(
|
||||
_getAppSelection(),
|
||||
style: robotoTextStyle,
|
||||
)
|
||||
: I18nText(
|
||||
locator<AppSelectorViewModel>().selectedApp == null
|
||||
? I18nText(
|
||||
'appSelectorCard.widgetSubtitle',
|
||||
child: Text(
|
||||
'',
|
||||
style: robotoTextStyle,
|
||||
),
|
||||
)
|
||||
: Row(
|
||||
children: [
|
||||
SizedBox(
|
||||
height: 16.0,
|
||||
child: ClipOval(
|
||||
child: Image.memory(
|
||||
locator<AppSelectorViewModel>().selectedApp == null
|
||||
? Uint8List(0)
|
||||
: locator<AppSelectorViewModel>()
|
||||
.selectedApp!
|
||||
.icon,
|
||||
fit: BoxFit.cover,
|
||||
),
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
_getAppSelection(),
|
||||
style: robotoTextStyle,
|
||||
),
|
||||
],
|
||||
),
|
||||
],
|
||||
),
|
||||
|
@ -12,7 +12,7 @@ class ApplicationItem extends StatelessWidget {
|
||||
final Uint8List icon;
|
||||
final String name;
|
||||
final DateTime patchDate;
|
||||
final String? changelog;
|
||||
final String changelog;
|
||||
final bool isUpdatableApp;
|
||||
final Function()? onPressed;
|
||||
|
||||
@ -21,7 +21,7 @@ class ApplicationItem extends StatelessWidget {
|
||||
required this.icon,
|
||||
required this.name,
|
||||
required this.patchDate,
|
||||
this.changelog = '',
|
||||
required this.changelog,
|
||||
required this.isUpdatableApp,
|
||||
required this.onPressed,
|
||||
}) : super(key: key);
|
||||
@ -66,7 +66,7 @@ class ApplicationItem extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
Text(
|
||||
format(patchDate),
|
||||
format(patchDate, locale: 'en_short'),
|
||||
style: robotoTextStyle.copyWith(
|
||||
color: Theme.of(context).colorScheme.tertiary,
|
||||
),
|
||||
@ -104,7 +104,7 @@ class ApplicationItem extends StatelessWidget {
|
||||
),
|
||||
),
|
||||
Text(
|
||||
changelog!,
|
||||
changelog,
|
||||
style: robotoTextStyle,
|
||||
),
|
||||
],
|
||||
|
@ -1,14 +1,17 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:revanced_manager/app/app.locator.dart';
|
||||
import 'package:revanced_manager/models/patched_application.dart';
|
||||
import 'package:revanced_manager/services/github_api.dart';
|
||||
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
|
||||
import 'package:revanced_manager/ui/widgets/application_item.dart';
|
||||
|
||||
class AvailableUpdatesCard extends StatelessWidget {
|
||||
const AvailableUpdatesCard({
|
||||
AvailableUpdatesCard({
|
||||
Key? key,
|
||||
}) : super(key: key);
|
||||
|
||||
final GithubAPI githubAPI = GithubAPI();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
@ -18,14 +21,26 @@ class AvailableUpdatesCard extends StatelessWidget {
|
||||
FutureBuilder<List<PatchedApplication>>(
|
||||
future: locator<HomeViewModel>().getPatchedApps(true),
|
||||
builder: (context, snapshot) =>
|
||||
snapshot.hasData && snapshot.data!.length > 1
|
||||
snapshot.hasData && snapshot.data!.isNotEmpty
|
||||
? ListView.builder(
|
||||
itemBuilder: (context, index) => ApplicationItem(
|
||||
icon: snapshot.data![index].icon,
|
||||
name: snapshot.data![index].name,
|
||||
patchDate: snapshot.data![index].patchDate,
|
||||
isUpdatableApp: true,
|
||||
onPressed: () => {},
|
||||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
itemCount: snapshot.data!.length,
|
||||
itemBuilder: (context, index) => FutureBuilder<String>(
|
||||
future: githubAPI.getChangelog(
|
||||
snapshot.data![index],
|
||||
'revanced',
|
||||
'revanced-patches',
|
||||
),
|
||||
initialData: '',
|
||||
builder: (context, snapshot2) => ApplicationItem(
|
||||
icon: snapshot.data![index].icon,
|
||||
name: snapshot.data![index].name,
|
||||
patchDate: snapshot.data![index].patchDate,
|
||||
changelog: snapshot2.data!,
|
||||
isUpdatableApp: true,
|
||||
onPressed: () => {},
|
||||
),
|
||||
),
|
||||
)
|
||||
: Container(),
|
||||
|
@ -1,14 +1,17 @@
|
||||
import 'package:flutter/material.dart';
|
||||
import 'package:revanced_manager/app/app.locator.dart';
|
||||
import 'package:revanced_manager/models/patched_application.dart';
|
||||
import 'package:revanced_manager/services/github_api.dart';
|
||||
import 'package:revanced_manager/ui/views/home/home_viewmodel.dart';
|
||||
import 'package:revanced_manager/ui/widgets/application_item.dart';
|
||||
|
||||
class InstalledAppsCard extends StatelessWidget {
|
||||
const InstalledAppsCard({
|
||||
InstalledAppsCard({
|
||||
Key? key,
|
||||
}) : super(key: key);
|
||||
|
||||
final GithubAPI githubAPI = GithubAPI();
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
@ -18,14 +21,26 @@ class InstalledAppsCard extends StatelessWidget {
|
||||
FutureBuilder<List<PatchedApplication>>(
|
||||
future: locator<HomeViewModel>().getPatchedApps(false),
|
||||
builder: (context, snapshot) =>
|
||||
snapshot.hasData && snapshot.data!.length > 1
|
||||
snapshot.hasData && snapshot.data!.isNotEmpty
|
||||
? ListView.builder(
|
||||
itemBuilder: (context, index) => ApplicationItem(
|
||||
icon: snapshot.data![index].icon,
|
||||
name: snapshot.data![index].name,
|
||||
patchDate: snapshot.data![index].patchDate,
|
||||
isUpdatableApp: false,
|
||||
onPressed: () => {},
|
||||
shrinkWrap: true,
|
||||
physics: const NeverScrollableScrollPhysics(),
|
||||
itemCount: snapshot.data!.length,
|
||||
itemBuilder: (context, index) => FutureBuilder<String>(
|
||||
future: githubAPI.getChangelog(
|
||||
snapshot.data![index],
|
||||
'revanced',
|
||||
'revanced-patches',
|
||||
),
|
||||
initialData: '',
|
||||
builder: (context, snapshot2) => ApplicationItem(
|
||||
icon: snapshot.data![index].icon,
|
||||
name: snapshot.data![index].name,
|
||||
patchDate: snapshot.data![index].patchDate,
|
||||
changelog: snapshot2.data!,
|
||||
isUpdatableApp: false,
|
||||
onPressed: () => {},
|
||||
),
|
||||
),
|
||||
)
|
||||
: Container(),
|
||||
|
@ -32,7 +32,9 @@ class PatchSelectorCard extends StatelessWidget {
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
I18nText(
|
||||
'patchSelectorCard.widgetTitle',
|
||||
locator<PatchesSelectorViewModel>().selectedPatches.isEmpty
|
||||
? 'patchSelectorCard.widgetTitle'
|
||||
: 'patchSelectorCard.widgetTitleSelected',
|
||||
child: Text(
|
||||
'',
|
||||
style: GoogleFonts.roboto(
|
||||
|
Reference in New Issue
Block a user