fix: replace download flow with manual transfer instructions; rename app package
The Gemma model requires Kaggle login/licence so direct HTTP download is not possible. Replaces the download screen with adb transfer instructions, a Scan button that checks the file on disk, and a Continue without AI bypass. Also renames the Android package from com.example.dailyou to net.stefwill.dailyou (build.gradle.kts, MainActivity.kt path + declaration) and adds *.bin to .gitignore to keep model files out of the repo.
This commit is contained in:
@@ -7,27 +7,68 @@ class ModelDownloadScreen extends ConsumerWidget {
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context, WidgetRef ref) {
|
||||
final downloadState = ref.watch(modelDownloadNotifierProvider);
|
||||
final scanState = ref.watch(modelScanProvider);
|
||||
|
||||
return Scaffold(
|
||||
body: SafeArea(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(32),
|
||||
child: downloadState.when(
|
||||
data: (progress) => progress == 0.0
|
||||
? _IdleView(
|
||||
onDownload: () => ref
|
||||
.read(modelDownloadNotifierProvider.notifier)
|
||||
.startDownload(),
|
||||
)
|
||||
: _DownloadingView(progress: progress),
|
||||
loading: () => const Center(child: CircularProgressIndicator()),
|
||||
error: (e, _) => _ErrorView(
|
||||
error: e.toString(),
|
||||
onRetry: () {
|
||||
ref.read(modelDownloadNotifierProvider.notifier).reset();
|
||||
},
|
||||
),
|
||||
child: Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.auto_awesome,
|
||||
size: 64,
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
'On-device AI',
|
||||
style: Theme.of(context).textTheme.headlineSmall,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
'DailyYou uses an on-device AI model to spot patterns in your '
|
||||
'moods and behaviour. Your data never leaves your phone.',
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 32),
|
||||
_InstructionCard(),
|
||||
const SizedBox(height: 24),
|
||||
if (scanState is AsyncLoading)
|
||||
const Center(child: CircularProgressIndicator())
|
||||
else ...[
|
||||
if (scanState is AsyncError)
|
||||
Padding(
|
||||
padding: const EdgeInsets.only(bottom: 12),
|
||||
child: Text(
|
||||
'Model not found at expected path.',
|
||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
color: Theme.of(context).colorScheme.error,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
),
|
||||
FilledButton.icon(
|
||||
onPressed: () =>
|
||||
ref.read(modelScanProvider.notifier).scan(),
|
||||
icon: const Icon(Icons.search),
|
||||
label: const Text('Scan for model'),
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
OutlinedButton(
|
||||
onPressed: () => ref
|
||||
.read(modelScanProvider.notifier)
|
||||
.skipToApp(),
|
||||
child: const Text('Continue without AI'),
|
||||
),
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
@@ -35,133 +76,77 @@ class ModelDownloadScreen extends ConsumerWidget {
|
||||
}
|
||||
}
|
||||
|
||||
class _IdleView extends StatelessWidget {
|
||||
const _IdleView({required this.onDownload});
|
||||
|
||||
final VoidCallback onDownload;
|
||||
|
||||
class _InstructionCard extends StatelessWidget {
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Icon(
|
||||
Icons.auto_awesome,
|
||||
size: 64,
|
||||
color: Theme.of(context).colorScheme.primary,
|
||||
final cs = Theme.of(context).colorScheme;
|
||||
return Card(
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.all(16),
|
||||
child: Column(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
Text('How to get the model',
|
||||
style: Theme.of(context).textTheme.titleSmall),
|
||||
const SizedBox(height: 10),
|
||||
_Step(
|
||||
n: '1',
|
||||
text: 'Download gemma-2b-it-cpu-int4.bin from Kaggle '
|
||||
'(requires a free Google account and licence acceptance).',
|
||||
),
|
||||
_Step(
|
||||
n: '2',
|
||||
text: 'Transfer the file to the device using adb:\n'
|
||||
'adb push gemma-2b-it-cpu-int4.bin '
|
||||
r'$(adb shell run-as net.stefwill.dailyou '
|
||||
r'printenv DATA_DIR)/files/',
|
||||
),
|
||||
_Step(
|
||||
n: '3',
|
||||
text: 'Tap "Scan for model" once the transfer is complete.',
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'The model is ~1.3 GB and only needs to be transferred once.',
|
||||
style: Theme.of(context).textTheme.labelSmall?.copyWith(
|
||||
color: cs.outline,
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
'On-device AI',
|
||||
style: Theme.of(context).textTheme.headlineSmall,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 12),
|
||||
Text(
|
||||
'DailyYou uses an on-device AI model to spot patterns in your moods '
|
||||
'and behaviour. Your data never leaves your phone.',
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'The model is ~1.1 GB and only needs to be downloaded once.',
|
||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
color: Theme.of(context).colorScheme.outline,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 40),
|
||||
FilledButton.icon(
|
||||
onPressed: onDownload,
|
||||
icon: const Icon(Icons.download),
|
||||
label: const Text('Download model'),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _DownloadingView extends StatelessWidget {
|
||||
const _DownloadingView({required this.progress});
|
||||
|
||||
final double progress;
|
||||
class _Step extends StatelessWidget {
|
||||
const _Step({required this.n, required this.text});
|
||||
final String n;
|
||||
final String text;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
final pct = (progress * 100).toStringAsFixed(0);
|
||||
final done = progress >= 1.0;
|
||||
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Icon(
|
||||
done ? Icons.check_circle : Icons.downloading,
|
||||
size: 64,
|
||||
color: done
|
||||
? Theme.of(context).colorScheme.primary
|
||||
: Theme.of(context).colorScheme.secondary,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
done ? 'Ready!' : 'Downloading…',
|
||||
style: Theme.of(context).textTheme.headlineSmall,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 24),
|
||||
LinearProgressIndicator(value: progress),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
done ? 'Model downloaded successfully.' : '$pct% — keep the app open',
|
||||
style: Theme.of(context).textTheme.bodySmall?.copyWith(
|
||||
color: Theme.of(context).colorScheme.outline,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
],
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
class _ErrorView extends StatelessWidget {
|
||||
const _ErrorView({required this.error, required this.onRetry});
|
||||
|
||||
final String error;
|
||||
final VoidCallback onRetry;
|
||||
|
||||
@override
|
||||
Widget build(BuildContext context) {
|
||||
return Column(
|
||||
mainAxisAlignment: MainAxisAlignment.center,
|
||||
crossAxisAlignment: CrossAxisAlignment.stretch,
|
||||
children: [
|
||||
Icon(Icons.error_outline,
|
||||
size: 64, color: Theme.of(context).colorScheme.error),
|
||||
const SizedBox(height: 24),
|
||||
Text(
|
||||
'Download failed',
|
||||
style: Theme.of(context).textTheme.headlineSmall,
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 8),
|
||||
Text(
|
||||
'Check your connection and try again.',
|
||||
style: Theme.of(context).textTheme.bodyMedium?.copyWith(
|
||||
color: Theme.of(context).colorScheme.onSurfaceVariant,
|
||||
),
|
||||
textAlign: TextAlign.center,
|
||||
),
|
||||
const SizedBox(height: 40),
|
||||
FilledButton.icon(
|
||||
onPressed: onRetry,
|
||||
icon: const Icon(Icons.refresh),
|
||||
label: const Text('Try again'),
|
||||
),
|
||||
],
|
||||
return Padding(
|
||||
padding: const EdgeInsets.only(bottom: 8),
|
||||
child: Row(
|
||||
crossAxisAlignment: CrossAxisAlignment.start,
|
||||
children: [
|
||||
CircleAvatar(
|
||||
radius: 10,
|
||||
backgroundColor: Theme.of(context).colorScheme.primaryContainer,
|
||||
child: Text(n,
|
||||
style: Theme.of(context).textTheme.labelSmall?.copyWith(
|
||||
color:
|
||||
Theme.of(context).colorScheme.onPrimaryContainer,
|
||||
)),
|
||||
),
|
||||
const SizedBox(width: 10),
|
||||
Expanded(
|
||||
child: Text(text,
|
||||
style: Theme.of(context).textTheme.bodySmall),
|
||||
),
|
||||
],
|
||||
),
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user