refactor: consolidate codebase into clean architecture

- Remove duplicate features structure from basura_app
- Migrate recycling_guide feature to lib/
- Update main.dart to use new architecture
- Clean up old views structure
- Remove temporary directories (basura_app, basura_backend, wiki_hackathon)
This commit is contained in:
Alan Alonso
2026-05-22 19:13:03 -06:00
parent 2304507670
commit bda677df89
15 changed files with 868 additions and 498 deletions

View File

@@ -0,0 +1,46 @@
// lib/features/recycling_guide/data/datasources/recycling_local_datasource.dart
// Único archivo que sabe que los datos vienen de un JSON en assets.
// Funciona sin conexión a internet.
import 'dart:convert';
import 'package:flutter/services.dart';
import '../../domain/entities/recycling_category.dart';
class RecyclingLocalDatasource {
static const _assetPath = 'assets/recycling_guide.json';
// Cache en memoria — se carga una sola vez durante la sesión
List<RecyclingCategory>? _cache;
Future<List<RecyclingCategory>> cargarCategorias() async {
if (_cache != null) return _cache!;
final raw = await rootBundle.loadString(_assetPath);
final List<dynamic> json = jsonDecode(raw);
_cache = json.map(_mapearCategoria).toList();
return _cache!;
}
RecyclingCategory _mapearCategoria(dynamic json) {
final items = (json['items'] as List)
.map(
(i) => RecyclingItem(
nombre: i['nombre'] as String,
ejemplos: i['ejemplos'] as String,
acepta: i['acepta'] as bool,
),
)
.toList();
return RecyclingCategory(
id: json['id'] as String,
nombre: json['nombre'] as String,
descripcion: json['descripcion'] as String,
colorHex: json['color'] as String,
icono: json['icono'] as String,
consejo: json['consejo'] as String,
items: items,
);
}
}

View File

@@ -0,0 +1,42 @@
// lib/features/recycling_guide/data/repositories/recycling_repository.dart
import '../datasources/recycling_local_datasource.dart';
import '../../domain/entities/recycling_category.dart';
class RecyclingRepository {
final RecyclingLocalDatasource _datasource;
RecyclingRepository({RecyclingLocalDatasource? datasource})
: _datasource = datasource ?? RecyclingLocalDatasource();
Future<List<RecyclingCategory>> obtenerCategorias() =>
_datasource.cargarCategorias();
/// Busca en nombres y ejemplos de todos los items de todas las categorías.
/// Devuelve pares (categoría, item) para que la UI sepa dónde mostrar el resultado.
Future<List<SearchResult>> buscar(String query) async {
if (query.trim().isEmpty) return [];
final q = query.toLowerCase();
final categorias = await obtenerCategorias();
final resultados = <SearchResult>[];
for (final cat in categorias) {
for (final item in cat.items) {
final coincide = item.nombre.toLowerCase().contains(q) ||
item.ejemplos.toLowerCase().contains(q);
if (coincide) {
resultados.add(SearchResult(categoria: cat, item: item));
}
}
}
return resultados;
}
}
class SearchResult {
final RecyclingCategory categoria;
final RecyclingItem item;
const SearchResult({required this.categoria, required this.item});
}

View File

@@ -0,0 +1,42 @@
// lib/features/recycling_guide/domain/entities/recycling_category.dart
// Capa de dominio — cero dependencias de Flutter o paquetes externos.
class RecyclingItem {
final String nombre;
final String ejemplos;
final bool acepta; // true = sí va aquí, false = NO va aquí
const RecyclingItem({
required this.nombre,
required this.ejemplos,
required this.acepta,
});
}
class RecyclingCategory {
final String id;
final String nombre;
final String descripcion;
final String colorHex;
final String icono;
final String consejo;
final List<RecyclingItem> items;
const RecyclingCategory({
required this.id,
required this.nombre,
required this.descripcion,
required this.colorHex,
required this.icono,
required this.consejo,
required this.items,
});
/// Items que SÍ van en esta categoría
List<RecyclingItem> get itemsAceptados =>
items.where((i) => i.acepta).toList();
/// Items que NO van en esta categoría
List<RecyclingItem> get itemsRechazados =>
items.where((i) => !i.acepta).toList();
}

View File

@@ -0,0 +1,64 @@
// lib/features/recycling_guide/presentation/providers/recycling_provider.dart
// Riverpod — compatible con lo que usa Persona C en el resto de la app.
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../../data/repositories/recycling_repository.dart';
import '../../domain/entities/recycling_category.dart';
// ── Repositorio singleton ────────────────────────────────────────────
final recyclingRepositoryProvider = Provider<RecyclingRepository>(
(ref) => RecyclingRepository(),
);
// ── Categorías (carga inicial desde JSON) ────────────────────────────
final recyclingCategoriesProvider =
FutureProvider<List<RecyclingCategory>>((ref) {
return ref.watch(recyclingRepositoryProvider).obtenerCategorias();
});
// ── Estado del buscador ──────────────────────────────────────────────
class RecyclingSearchNotifier extends StateNotifier<RecyclingSearchState> {
final RecyclingRepository _repo;
RecyclingSearchNotifier(this._repo)
: super(const RecyclingSearchState.idle());
Future<void> buscar(String query) async {
if (query.trim().isEmpty) {
state = const RecyclingSearchState.idle();
return;
}
state = const RecyclingSearchState.loading();
final resultados = await _repo.buscar(query);
state = RecyclingSearchState.done(resultados);
}
void limpiar() => state = const RecyclingSearchState.idle();
}
final recyclingSearchProvider =
StateNotifierProvider<RecyclingSearchNotifier, RecyclingSearchState>((ref) {
return RecyclingSearchNotifier(ref.watch(recyclingRepositoryProvider));
});
// ── Estado sellado del buscador ──────────────────────────────────────
sealed class RecyclingSearchState {
const RecyclingSearchState();
const factory RecyclingSearchState.idle() = _Idle;
const factory RecyclingSearchState.loading() = _Loading;
const factory RecyclingSearchState.done(List<SearchResult> results) = _Done;
}
class _Idle extends RecyclingSearchState {
const _Idle();
}
class _Loading extends RecyclingSearchState {
const _Loading();
}
class _Done extends RecyclingSearchState {
final List<SearchResult> results;
const _Done(this.results);
}

View File

@@ -0,0 +1,215 @@
// lib/features/recycling_guide/presentation/screens/category_detail_screen.dart
import 'package:flutter/material.dart';
import '../../domain/entities/recycling_category.dart';
class CategoryDetailScreen extends StatelessWidget {
final RecyclingCategory categoria;
const CategoryDetailScreen({super.key, required this.categoria});
@override
Widget build(BuildContext context) {
final color = _parseColor(categoria.colorHex);
return Scaffold(
body: CustomScrollView(
slivers: [
// ── Header expandible ──────────────────────────────────
SliverAppBar(
expandedHeight: 180,
pinned: true,
backgroundColor: color,
flexibleSpace: FlexibleSpaceBar(
title: Text(
categoria.nombre,
style: const TextStyle(
color: Colors.white,
fontWeight: FontWeight.w700,
),
),
background: Container(
decoration: BoxDecoration(
gradient: LinearGradient(
begin: Alignment.topLeft,
end: Alignment.bottomRight,
colors: [color, color.withOpacity(0.7)],
),
),
child: Center(
child: Icon(
_iconoDesdeNombre(categoria.icono),
size: 80,
color: Colors.white.withOpacity(0.3),
),
),
),
),
),
SliverToBoxAdapter(
child: Padding(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
// Descripción
Text(
categoria.descripcion,
style: TextStyle(fontSize: 15, color: Colors.grey[700]),
),
const SizedBox(height: 16),
// Consejo destacado
Container(
padding: const EdgeInsets.all(14),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
border: Border.all(color: color.withOpacity(0.3)),
),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(Icons.tips_and_updates, color: color, size: 20),
const SizedBox(width: 10),
Expanded(
child: Text(
categoria.consejo,
style: TextStyle(
fontSize: 13,
color: color,
fontWeight: FontWeight.w500,
),
),
),
],
),
),
const SizedBox(height: 24),
// Sección: SÍ van aquí
if (categoria.itemsAceptados.isNotEmpty) ...[
_SectionHeader(
label: 'Sí van aquí',
icon: Icons.check_circle,
color: Colors.green,
),
const SizedBox(height: 8),
...categoria.itemsAceptados.map(
(item) => _ItemTile(item: item, acepta: true),
),
const SizedBox(height: 20),
],
// Sección: NO van aquí
if (categoria.itemsRechazados.isNotEmpty) ...[
_SectionHeader(
label: 'No van aquí',
icon: Icons.cancel,
color: Colors.red,
),
const SizedBox(height: 8),
...categoria.itemsRechazados.map(
(item) => _ItemTile(item: item, acepta: false),
),
],
const SizedBox(height: 32),
],
),
),
),
],
),
);
}
Color _parseColor(String hex) {
final h = hex.replaceFirst('#', '');
return Color(int.parse('FF$h', radix: 16));
}
IconData _iconoDesdeNombre(String nombre) {
return switch (nombre) {
'eco' => Icons.eco,
'recycling' => Icons.recycling,
'masks' => Icons.masks,
'warning_amber' => Icons.warning_amber,
_ => Icons.category,
};
}
}
class _SectionHeader extends StatelessWidget {
final String label;
final IconData icon;
final Color color;
const _SectionHeader({
required this.label,
required this.icon,
required this.color,
});
@override
Widget build(BuildContext context) {
return Row(
children: [
Icon(icon, color: color, size: 18),
const SizedBox(width: 8),
Text(
label,
style: TextStyle(
fontSize: 15,
fontWeight: FontWeight.w700,
color: color,
),
),
],
);
}
}
class _ItemTile extends StatelessWidget {
final RecyclingItem item;
final bool acepta;
const _ItemTile({required this.item, required this.acepta});
@override
Widget build(BuildContext context) {
return Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
acepta ? Icons.check : Icons.close,
size: 16,
color: acepta ? Colors.green : Colors.red,
),
const SizedBox(width: 10),
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
item.nombre,
style: const TextStyle(
fontSize: 14,
fontWeight: FontWeight.w500,
),
),
Text(
item.ejemplos,
style: TextStyle(fontSize: 12, color: Colors.grey[600]),
),
],
),
),
],
),
);
}
}

View File

@@ -0,0 +1,164 @@
// lib/features/recycling_guide/presentation/screens/recycling_guide_screen.dart
// Pantalla principal — Persona C la agrega al router así:
// GoRoute(path: '/guia', builder: (_, __) => const RecyclingGuideScreen())
import 'package:flutter/material.dart';
import 'package:flutter_riverpod/flutter_riverpod.dart';
import '../providers/recycling_provider.dart';
import '../widgets/category_card.dart';
import '../widgets/search_result_tile.dart';
import 'category_detail_screen.dart';
class RecyclingGuideScreen extends ConsumerStatefulWidget {
const RecyclingGuideScreen({super.key});
@override
ConsumerState<RecyclingGuideScreen> createState() =>
_RecyclingGuideScreenState();
}
class _RecyclingGuideScreenState extends ConsumerState<RecyclingGuideScreen> {
final _searchCtrl = TextEditingController();
bool _buscando = false;
@override
void dispose() {
_searchCtrl.dispose();
super.dispose();
}
void _onSearchChanged(String query) {
setState(() => _buscando = query.trim().isNotEmpty);
ref.read(recyclingSearchProvider.notifier).buscar(query);
}
void _limpiarBusqueda() {
_searchCtrl.clear();
setState(() => _buscando = false);
ref.read(recyclingSearchProvider.notifier).limpiar();
FocusScope.of(context).unfocus();
}
@override
Widget build(BuildContext context) {
return Scaffold(
appBar: AppBar(
title: const Text('Guía de separación'),
actions: [
// Badge offline — refuerza que funciona sin internet
Container(
margin: const EdgeInsets.only(right: 12),
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: Colors.green.withOpacity(0.2),
borderRadius: BorderRadius.circular(12),
),
child: const Row(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.offline_bolt, size: 14, color: Colors.white),
SizedBox(width: 4),
Text(
'sin internet',
style: TextStyle(fontSize: 11, color: Colors.white),
),
],
),
),
],
),
body: Column(
children: [
// ── Buscador ────────────────────────────────────────────
Padding(
padding: const EdgeInsets.fromLTRB(16, 16, 16, 8),
child: TextField(
controller: _searchCtrl,
onChanged: _onSearchChanged,
decoration: InputDecoration(
hintText: '¿Dónde va el aceite? ¿y la pila?',
prefixIcon: const Icon(Icons.search),
suffixIcon: _buscando
? IconButton(
icon: const Icon(Icons.close),
onPressed: _limpiarBusqueda,
)
: null,
),
),
),
// ── Contenido dinámico ──────────────────────────────────
Expanded(
child: _buscando
? _SearchResults()
: _CategoryList(),
),
],
),
);
}
}
// ── Lista de categorías ──────────────────────────────────────────────
class _CategoryList extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final async = ref.watch(recyclingCategoriesProvider);
return async.when(
loading: () => const Center(child: CircularProgressIndicator()),
error: (e, _) => Center(child: Text('Error: $e')),
data: (categorias) => ListView.separated(
padding: const EdgeInsets.fromLTRB(16, 8, 16, 24),
itemCount: categorias.length,
separatorBuilder: (_, __) => const SizedBox(height: 12),
itemBuilder: (context, i) => CategoryCard(
categoria: categorias[i],
onTap: () => Navigator.push(
context,
MaterialPageRoute(
builder: (_) =>
CategoryDetailScreen(categoria: categorias[i]),
),
),
),
),
);
}
}
// ── Resultados de búsqueda ───────────────────────────────────────────
class _SearchResults extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final estado = ref.watch(recyclingSearchProvider);
return switch (estado) {
_Idle() => const SizedBox.shrink(),
_Loading() => const Center(child: CircularProgressIndicator()),
_Done(results: final r) when r.isEmpty => Center(
child: Column(
mainAxisSize: MainAxisSize.min,
children: [
Icon(Icons.search_off, size: 48, color: Colors.grey[400]),
const SizedBox(height: 12),
Text(
'No encontramos ese residuo.',
style: TextStyle(color: Colors.grey[600]),
),
],
),
),
_Done(results: final r) => ListView.builder(
padding: const EdgeInsets.symmetric(vertical: 8),
itemCount: r.length,
itemBuilder: (_, i) => SearchResultTile(resultado: r[i]),
),
_ => const SizedBox.shrink(),
};
}
}

View File

@@ -0,0 +1,137 @@
// lib/features/recycling_guide/presentation/widgets/category_card.dart
import 'package:flutter/material.dart';
import '../../domain/entities/recycling_category.dart';
class CategoryCard extends StatelessWidget {
final RecyclingCategory categoria;
final VoidCallback onTap;
const CategoryCard({
super.key,
required this.categoria,
required this.onTap,
});
@override
Widget build(BuildContext context) {
final color = _parseColor(categoria.colorHex);
return Card(
clipBehavior: Clip.antiAlias,
child: InkWell(
onTap: onTap,
child: Padding(
padding: const EdgeInsets.all(16),
child: Row(
children: [
// Ícono con fondo coloreado
Container(
width: 56,
height: 56,
decoration: BoxDecoration(
color: color.withOpacity(0.15),
borderRadius: BorderRadius.circular(12),
),
child: Icon(
_iconoDesdeNombre(categoria.icono),
color: color,
size: 28,
),
),
const SizedBox(width: 16),
// Texto
Expanded(
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(
categoria.nombre,
style: TextStyle(
fontSize: 16,
fontWeight: FontWeight.w600,
color: color,
),
),
const SizedBox(height: 4),
Text(
categoria.descripcion,
style: TextStyle(
fontSize: 13,
color: Colors.grey[600],
),
),
const SizedBox(height: 8),
// Chip contador de items
Row(
children: [
_CountChip(
count: categoria.itemsAceptados.length,
label: 'van aquí',
color: Colors.green,
),
const SizedBox(width: 8),
_CountChip(
count: categoria.itemsRechazados.length,
label: 'no van',
color: Colors.red,
),
],
),
],
),
),
Icon(Icons.chevron_right, color: Colors.grey[400]),
],
),
),
),
);
}
Color _parseColor(String hex) {
final h = hex.replaceFirst('#', '');
return Color(int.parse('FF$h', radix: 16));
}
IconData _iconoDesdeNombre(String nombre) {
return switch (nombre) {
'eco' => Icons.eco,
'recycling' => Icons.recycling,
'masks' => Icons.masks,
'warning_amber'=> Icons.warning_amber,
_ => Icons.category,
};
}
}
class _CountChip extends StatelessWidget {
final int count;
final String label;
final Color color;
const _CountChip({
required this.count,
required this.label,
required this.color,
});
@override
Widget build(BuildContext context) {
return Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 2),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(20),
),
child: Text(
'$count $label',
style: TextStyle(
fontSize: 11,
color: color,
fontWeight: FontWeight.w500,
),
),
);
}
}

View File

@@ -0,0 +1,60 @@
// lib/features/recycling_guide/presentation/widgets/search_result_tile.dart
import 'package:flutter/material.dart';
import '../../data/repositories/recycling_repository.dart';
class SearchResultTile extends StatelessWidget {
final SearchResult resultado;
const SearchResultTile({super.key, required this.resultado});
@override
Widget build(BuildContext context) {
final color = _parseColor(resultado.categoria.colorHex);
final acepta = resultado.item.acepta;
return ListTile(
leading: Container(
width: 40,
height: 40,
decoration: BoxDecoration(
color: color.withOpacity(0.15),
borderRadius: BorderRadius.circular(8),
),
child: Icon(
acepta ? Icons.check_circle : Icons.cancel,
color: acepta ? Colors.green : Colors.red,
size: 22,
),
),
title: Text(
resultado.item.nombre,
style: const TextStyle(fontWeight: FontWeight.w500, fontSize: 14),
),
subtitle: Text(
resultado.item.ejemplos,
style: TextStyle(fontSize: 12, color: Colors.grey[600]),
),
trailing: Container(
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
decoration: BoxDecoration(
color: color.withOpacity(0.1),
borderRadius: BorderRadius.circular(12),
),
child: Text(
resultado.categoria.nombre,
style: TextStyle(
fontSize: 11,
color: color,
fontWeight: FontWeight.w600,
),
),
),
);
}
Color _parseColor(String hex) {
final h = hex.replaceFirst('#', '');
return Color(int.parse('FF$h', radix: 16));
}
}