stefwill/dailyou
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: replace download flow with manual transfer instructions; rename app package

Browse Source 
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:
stefwill
2026-04-26 15:14:17 +10:00
parent e464c5621e
commit 68780ff436
6 changed files with 174 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+3
View File
@@ -39,6 +39,9 @@ app.*.symbols
# Obfuscation related
app.*.map.json
# LLM model files
*.bin
# Android Studio will place build artifacts here
/android/app/debug
/android/app/profile
android/app/build.gradle.kts
+2 -2
View File
@@ -6,7 +6,7 @@ plugins {
}
android {
namespace = "com.example.dailyou"
namespace = "net.stefwill.dailyou"
compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion
@@ -22,7 +22,7 @@ android {
defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId = "com.example.dailyou"
applicationId = "net.stefwill.dailyou"
// You can update the following values to match your application needs.
// For more information, see: https://flutter.dev/to/review-gradle-config.
minSdk = flutter.minSdkVersion
android/app/src/main/kotlin/com/example/dailyou/MainActivity.kt → android/app/src/main/kotlin/net/stefwill/dailyou/MainActivity.kt
+1 -1
View File
@@ -1,4 +1,4 @@
package com.example.dailyou
package net.stefwill.dailyou
import io.flutter.embedding.android.FlutterActivity
lib/app.dart
+4 -1
View File
@@ -9,6 +9,7 @@ class App extends ConsumerWidget {
@override
Widget build(BuildContext context, WidgetRef ref) {
final skipped = ref.watch(modelSkippedProvider);
final modelPresentAsync = ref.watch(modelPresentProvider);
return MaterialApp(
@@ -17,7 +18,9 @@ class App extends ConsumerWidget {
theme: _lightTheme(),
darkTheme: _darkTheme(),
themeMode: ThemeMode.system,
home: modelPresentAsync.when(
home: skipped
? const AppShell()
: modelPresentAsync.when(
data: (present) =>
present ? const AppShell() : const ModelDownloadScreen(),
loading: () => const Scaffold(
lib/core/providers/model_download_provider.dart
+39 -24
View File
@@ -8,31 +8,46 @@ final modelPresentProvider = FutureProvider<bool>((ref) {
return ModelDownloadService().isModelPresent();
});
// ── Download notifier — streams progress and marks completion ─────────────────
// ── Has the user chosen to skip the model requirement? ───────────────────────
class ModelDownloadNotifier extends Notifier<AsyncValue<double>> {
class _SkipNotifier extends Notifier<bool> {
@override
AsyncValue<double> build() => const AsyncData(0.0);
Future<void> startDownload() async {
state = const AsyncData(0.0);
try {
await for (final progress in ModelDownloadService().download()) {
if (!ref.mounted) return;
state = AsyncData(progress);
}
if (!ref.mounted) return;
await ref.read(settingsNotifierProvider.notifier).markModelDownloaded();
ref.invalidate(modelPresentProvider);
} catch (e, st) {
if (!ref.mounted) return;
state = AsyncError(e, st);
}
}
void reset() => state = const AsyncData(0.0);
bool build() => false;
void skip() => state = true;
}
final modelDownloadNotifierProvider =
NotifierProvider<ModelDownloadNotifier, AsyncValue<double>>(
ModelDownloadNotifier.new);
final modelSkippedProvider =
NotifierProvider<_SkipNotifier, bool>(_SkipNotifier.new);
// ── Scan notifier — checks for the model on demand ────────────────��──────────
class ModelScanNotifier extends Notifier<AsyncValue<bool>> {
@override
AsyncValue<bool> build() => const AsyncData(false);
Future<void> scan() async {
state = const AsyncLoading();
final next = await AsyncValue.guard(
() => ModelDownloadService().isModelPresent(),
);
if (!ref.mounted) return;
next.whenData((present) async {
if (present) {
await ref.read(settingsNotifierProvider.notifier).markModelDownloaded();
ref.invalidate(modelPresentProvider);
} else {
state = AsyncError(
Exception('Model file not found at expected path'),
StackTrace.current,
);
}
});
if (next is AsyncError) state = next;
}
void skipToApp() => ref.read(modelSkippedProvider.notifier).skip();
}
final modelScanProvider =
NotifierProvider.autoDispose<ModelScanNotifier, AsyncValue<bool>>(
ModelScanNotifier.new);
lib/features/model_download/model_download_screen.dart
+95 -110
View File
@@ -7,42 +7,13 @@ 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();
},
),
),
),
),
);
}
}
class _IdleView extends StatelessWidget {
const _IdleView({required this.onDownload});
final VoidCallback onDownload;
@override
Widget build(BuildContext context) {
return Column(
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
@@ -59,109 +30,123 @@ class _IdleView extends StatelessWidget {
),
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.',
'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.',
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.outline,
color: Theme.of(context).colorScheme.error,
),
textAlign: TextAlign.center,
),
const SizedBox(height: 40),
),
FilledButton.icon(
onPressed: onDownload,
icon: const Icon(Icons.download),
label: const Text('Download model'),
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'),
),
],
],
),
),
),
);
}
}
class _DownloadingView extends StatelessWidget {
const _DownloadingView({required this.progress});
class _InstructionCard extends StatelessWidget {
@override
Widget build(BuildContext context) {
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,
),
),
],
),
),
);
}
}
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,
return Padding(
padding: const EdgeInsets.only(bottom: 8),
child: Row(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Icon(
done ? Icons.check_circle : Icons.downloading,
size: 64,
color: done
? Theme.of(context).colorScheme.primary
: Theme.of(context).colorScheme.secondary,
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(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'),
const SizedBox(width: 10),
Expanded(
child: Text(text,
style: Theme.of(context).textTheme.bodySmall),
),
],
),
);
}
}