Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/main' into development
Browse files Browse the repository at this point in the history
  • Loading branch information
@beastoin
beastoin committed Nov 15, 2024
2 parents 170aa12 + 3825401 commit 49c8fa3
Show file tree
Hide file tree
Showing 20 changed files with 1,109 additions and 263 deletions.
4 changes: 2 additions & 2 deletions app/lib/pages/apps/add_app.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,13 @@ class _AddAppPageState extends State<AddAppPage> {
MixpanelManager().publicAppSubmitted({
'app_name': provider.appNameController.text,
'app_category': provider.appCategory,
'app_capabilities': provider.capabilities,
'app_capabilities': provider.capabilities.map((e) => e.id).toList(),
});
} else {
MixpanelManager().privateAppSubmitted({
'app_name': provider.appNameController.text,
'app_category': provider.appCategory,
'app_capabilities': provider.capabilities,
'app_capabilities': provider.capabilities.map((e) => e.id).toList(),
});
}
SharedPreferencesUtil().showSubmitAppConfirmation = showSubmitAppConfirmation;
Expand Down
4 changes: 2 additions & 2 deletions app/lib/pages/apps/app_detail.dart
View file
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,7 @@ class _AppDetailPageState extends State<AppDetailPage> {
),
),
),
widget.app.isUnderReview() && !widget.app.private
widget.app.isUnderReview() && !widget.app.private && widget.app.isOwner(SharedPreferencesUtil().uid)
? Column(
children: [
const SizedBox(
Expand Down Expand Up @@ -444,7 +444,7 @@ class _AppDetailPageState extends State<AppDetailPage> {
child: Container(
width: double.infinity,
padding: const EdgeInsets.all(16.0),
margin: const EdgeInsets.only(left: 6.0, right: 6.0, top: 12, bottom: 6),
margin: const EdgeInsets.only(left: 8.0, right: 8.0, top: 12, bottom: 6),
decoration: BoxDecoration(
color: Colors.grey.shade900,
borderRadius: BorderRadius.circular(16.0),
Expand Down
275 changes: 275 additions & 0 deletions app/lib/pages/apps/explore_install_page.dart
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,275 @@
import 'package:flutter/material.dart';
import 'package:friend_private/backend/schema/app.dart';
import 'package:friend_private/pages/apps/providers/add_app_provider.dart';
import 'package:friend_private/pages/apps/widgets/app_section_card.dart';
import 'package:friend_private/pages/apps/widgets/filter_sheet.dart';
import 'package:friend_private/pages/apps/list_item.dart';
import 'package:friend_private/providers/app_provider.dart';
import 'package:friend_private/providers/home_provider.dart';
import 'package:provider/provider.dart';

String filterValueToString(dynamic value) {
if (value.runtimeType == String) {
return value;
} else if (value.runtimeType == Category) {
return (value as Category).title;
} else if (value.runtimeType == AppCapability) {
return (value as AppCapability).title;
}
return '';
}

class ExploreInstallPage extends StatefulWidget {
const ExploreInstallPage({super.key});

@override
State<ExploreInstallPage> createState() => _ExploreInstallPageState();
}

class _ExploreInstallPageState extends State<ExploreInstallPage> with AutomaticKeepAliveClientMixin {
late TextEditingController searchController;

@override
void initState() {
searchController = TextEditingController();
WidgetsBinding.instance.addPostFrameCallback((_) {
context.read<AddAppProvider>().init();
});
super.initState();
}

@override
void dispose() {
searchController.dispose();
super.dispose();
}

@override
Widget build(BuildContext context) {
super.build(context);
return Consumer<AppProvider>(builder: (context, provider, child) {
return CustomScrollView(
slivers: [
const SliverToBoxAdapter(child: SizedBox(height: 18)),
SliverToBoxAdapter(
child: SizedBox(
height: 50,
child: Row(
children: [
Padding(
padding: const EdgeInsets.only(left: 8.0),
child: ChoiceChip(
label: Row(
children: [
const Icon(
Icons.filter_list_alt,
size: 15,
),
const SizedBox(width: 4),
const Padding(
padding: EdgeInsets.symmetric(vertical: 6.5),
child: Text(
'Filter ',
style: TextStyle(fontSize: 16),
),
),
provider.isFilterActive() ? Text("(${provider.filters.length})") : const SizedBox.shrink(),
],
),
selected: false,
showCheckmark: true,
backgroundColor: Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
onSelected: (bool selected) {
showModalBottomSheet(
context: context,
isScrollControlled: true,
shape: const RoundedRectangleBorder(
borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
),
builder: (context) => const FilterBottomSheet(),
).whenComplete(() {
context.read<AppProvider>().filterApps();
});
},
),
),
const SizedBox(
width: 12,
),
provider.isFilterActive()
? Expanded(
child: ListView.separated(
scrollDirection: Axis.horizontal,
itemBuilder: (ctx, idx) {
return ChoiceChip(
labelPadding: const EdgeInsets.only(left: 8),
label: Row(
children: [
Padding(
padding: const EdgeInsets.symmetric(vertical: 6.5),
child: Text(
filterValueToString(provider.filters.values.elementAt(idx)),
style: const TextStyle(fontSize: 16),
),
),
const SizedBox(width: 6),
const Icon(
Icons.close,
size: 15,
),
],
),
selected: false,
showCheckmark: true,
backgroundColor: Colors.transparent,
shape: RoundedRectangleBorder(
borderRadius: BorderRadius.circular(8),
),
onSelected: (bool selected) {
provider.removeFilter(provider.filters.keys.elementAt(idx));
},
);
},
separatorBuilder: (ctx, idx) {
return const SizedBox(
width: 10,
);
},
itemCount: provider.filters.length,
))
: SizedBox(
width: MediaQuery.sizeOf(context).width * 0.72,
height: 40,
child: TextFormField(
controller: searchController,
focusNode: context.read<HomeProvider>().appsSearchFieldFocusNode,
onChanged: (value) {
provider.searchApps(value);
},
decoration: InputDecoration(
hintText: 'Search apps',
hintStyle: const TextStyle(color: Colors.white),
filled: true,
fillColor: Colors.grey[800],
border: OutlineInputBorder(
borderRadius: BorderRadius.circular(8),
borderSide: BorderSide.none,
),
suffixIcon: provider.isSearchActive()
? GestureDetector(
onTap: () {
context.read<HomeProvider>().appsSearchFieldFocusNode.unfocus();
provider.searchApps('');
searchController.clear();
},
child: const Icon(
Icons.close,
color: Colors.white,
),
)
: null,
contentPadding: const EdgeInsets.symmetric(horizontal: 12),
),
style: const TextStyle(color: Colors.white),
),
)
],
),
),
),
provider.isFilterActive() || provider.isSearchActive()
? const SliverToBoxAdapter(child: SizedBox.shrink())
: const SliverToBoxAdapter(
child: SizedBox(
height: 10,
)),
!provider.isFilterActive() && !provider.isSearchActive()
? const SliverToBoxAdapter(child: SizedBox.shrink())
: Consumer<AppProvider>(
builder: (context, provider, child) {
if (provider.filteredApps.isEmpty) {
return SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.only(top: MediaQuery.sizeOf(context).height * 0.28),
child: const Text(
'No apps found',
style: TextStyle(fontSize: 18),
textAlign: TextAlign.center,
),
),
);
}
return SliverToBoxAdapter(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
ListView.separated(
physics: const NeverScrollableScrollPhysics(),
shrinkWrap: true,
itemBuilder: (ctx, idx) {
return AppListItem(
app: provider.filteredApps[idx],
index:
provider.apps.indexWhere((element) => element.id == provider.filteredApps[idx].id),
);
},
separatorBuilder: (ctx, idx) {
return const SizedBox(height: 8);
},
itemCount: provider.filteredApps.length,
),
const SizedBox(height: 64),
],
),
);
},
),
!provider.isFilterActive() && !provider.isSearchActive()
? SliverToBoxAdapter(
child: AppSectionCard(
title: 'Popular Apps',
apps: context
.read<AppProvider>()
.apps
.where((p) => (p.installs > 50 && (p.ratingAvg ?? 0.0) > 4.0))
.toList(),
),
)
: const SliverToBoxAdapter(child: SizedBox.shrink()),
!provider.isFilterActive() && !provider.isSearchActive()
? const SliverToBoxAdapter(
child: Padding(
padding: EdgeInsets.only(left: 12.0, top: 18, bottom: 0),
child: Text('All Apps', style: TextStyle(fontSize: 18)),
),
)
: const SliverToBoxAdapter(child: SizedBox.shrink()),
!provider.isFilterActive() && !provider.isSearchActive()
? Selector<AppProvider, List<App>>(
selector: (context, provider) => provider.apps,
builder: (context, memoryIntegrationApps, child) {
return SliverList(
delegate: SliverChildBuilderDelegate(
(context, index) {
return AppListItem(
app: memoryIntegrationApps[index],
index: index,
);
},
childCount: memoryIntegrationApps.length,
),
);
},
)
: const SliverToBoxAdapter(child: SizedBox.shrink()),
],
);
});
}

@override
bool get wantKeepAlive => true;
}
Loading

0 comments on commit 49c8fa3

Please sign in to comment.