Skip to content

Offline gym log for Android. No account, no ads, no internet.

Fix the stuck keyboard gap, a stale profile photo and apps that freeze on launch

InlitXdc6cef031c58
diff --git a/android/app/src/main/kotlin/com/gymmane/app/GraphicsMode.kt b/android/app/src/main/kotlin/com/gymmane/app/GraphicsMode.kt
index 3a7698c..27446c4 100644
--- a/android/app/src/main/kotlin/com/gymmane/app/GraphicsMode.kt
+++ b/android/app/src/main/kotlin/com/gymmane/app/GraphicsMode.kt
@@ -1,11 +1,14 @@
package com.gymmane.app
import android.app.Activity
+import android.app.ActivityManager
+import android.app.ApplicationExitInfo
import android.content.Context
import android.content.Intent
import android.opengl.EGL14
import android.opengl.EGLConfig
import android.opengl.GLES20
+import android.os.Build
import kotlin.system.exitProcess
object GraphicsMode {
@@ -13,7 +16,45 @@ object GraphicsMode {
private const val PREFS = "gymmane_graphics"
private const val KEY_MODE = "mode"
private const val KEY_GPU = "gpu"
- private val badGpus = Regex("Mali-G(31|51|52|71|72|76)\\b")
+ private const val KEY_LAUNCH = "launchAt"
+ private const val KEY_REACHED = "reached"
+ private const val KEY_STRIKES = "strikes"
+ private const val KEY_STUCK = "stuck"
+ private const val EARLY_MS = 20_000L
+ private val badGpus = Regex("Mali-G(31|51|52|71|72|76)\\b|PowerVR Rogue GE8\\d{3}")
+
+ fun judgeLastLaunch(context: Context) {
+ val p = prefs(context)
+ val launchAt = p.getLong(KEY_LAUNCH, 0L)
+ if (launchAt == 0L) return
+ val failed = !p.getBoolean(KEY_REACHED, false) || diedEarly(context, launchAt)
+ val strikes = if (failed) p.getInt(KEY_STRIKES, 0) + 1 else 0
+ val edit = p.edit().putLong(KEY_LAUNCH, 0L).putInt(KEY_STRIKES, strikes)
+ if (strikes >= 2) edit.putBoolean(KEY_STUCK, true)
+ edit.commit()
+ }
+
+ fun starting(context: Context) {
+ judgeLastLaunch(context)
+ prefs(context).edit().putLong(KEY_LAUNCH, System.currentTimeMillis()).putBoolean(KEY_REACHED, false).commit()
+ }
+
+ fun ready(context: Context) {
+ prefs(context).edit().putBoolean(KEY_REACHED, true).apply()
+ }
+
+ private fun diedEarly(context: Context, launchAt: Long): Boolean {
+ if (Build.VERSION.SDK_INT < Build.VERSION_CODES.R) return false
+ return try {
+ val manager = context.getSystemService(Context.ACTIVITY_SERVICE) as ActivityManager
+ manager.getHistoricalProcessExitReasons(context.packageName, 0, 3).any {
+ (it.reason == ApplicationExitInfo.REASON_CRASH_NATIVE || it.reason == ApplicationExitInfo.REASON_ANR) &&
+ it.timestamp in launchAt..(launchAt + EARLY_MS)
+ }
+ } catch (e: Throwable) {
+ false
+ }
+ }
fun mode(context: Context): String =
prefs(context).getString(KEY_MODE, "auto") ?: "auto"
@@ -26,7 +67,8 @@ object GraphicsMode {
return name
}
- fun detected(context: Context): Boolean = badGpus.containsMatchIn(gpu(context))
+ fun detected(context: Context): Boolean =
+ badGpus.containsMatchIn(gpu(context)) || prefs(context).getBoolean(KEY_STUCK, false)
fun compat(context: Context): Boolean = when (mode(context)) {
"compat" -> true
diff --git a/android/app/src/main/kotlin/com/gymmane/app/GymManeApplication.kt b/android/app/src/main/kotlin/com/gymmane/app/GymManeApplication.kt
index 848c90f..d889e42 100644
--- a/android/app/src/main/kotlin/com/gymmane/app/GymManeApplication.kt
+++ b/android/app/src/main/kotlin/com/gymmane/app/GymManeApplication.kt
@@ -6,6 +6,7 @@ import io.flutter.FlutterInjector
class GymManeApplication : Application() {
override fun onCreate() {
super.onCreate()
+ GraphicsMode.judgeLastLaunch(this)
if (!GraphicsMode.compat(this)) return
try {
val loader = FlutterInjector.instance().flutterLoader()
diff --git a/lib/app/gymmane_app.dart b/lib/app/gymmane_app.dart
index 7ca0ed6..6a0f33d 100644
--- a/lib/app/gymmane_app.dart
+++ b/lib/app/gymmane_app.dart
@@ -7,6 +7,7 @@ import '../l10n/l10n.dart';
import '../state/fit_state.dart';
import '../theme/app_colors.dart';
import '../theme/app_theme.dart';
+import '../widgets/keyboard_guard.dart';
import 'app_shell.dart';
import 'desktop.dart';
@@ -64,7 +65,7 @@ class _GymManeAppState extends State<GymManeApp> {
textScaler: TextScaler.linear(system * fit.textFactor),
disableAnimations: media.disableAnimations || fit.calmMotion,
),
- child: kIsWeb ? _WebFrame(child: child!) : _ButtonNavScrim(child: child!),
+ child: kIsWeb ? _WebFrame(child: child!) : KeyboardGuard(child: _ButtonNavScrim(child: child!)),
);
},
home: const AppShell(),
diff --git a/lib/screens/onboarding_screen.dart b/lib/screens/onboarding_screen.dart
index f6a5e6e..0a0e549 100644
--- a/lib/screens/onboarding_screen.dart
+++ b/lib/screens/onboarding_screen.dart
@@ -19,6 +19,7 @@ import '../widgets/app_background.dart';
import '../widgets/body_rulers.dart';
import '../widgets/body_map.dart';
import '../widgets/entrance.dart';
+import '../widgets/keyboard_guard.dart';
import '../widgets/photo_source_sheet.dart';
import '../widgets/rolling_text.dart';
import '../widgets/speed_panel.dart';
@@ -87,12 +88,27 @@ class _OnboardingScreenState extends State<OnboardingScreen> {
}
void _go(int i) {
+ FocusManager.instance.primaryFocus?.unfocus();
_page.animateToPage(i, duration: const Duration(milliseconds: 340), curve: Curves.easeOutCubic);
}
- void _onPage(int i) => _at.value = i;
+ void _onPage(int i) {
+ FocusManager.instance.primaryFocus?.unfocus();
+ _at.value = i;
+ }
+
+ bool _finishing = false;
- void _finish() {
+ Future<void> _finish() async {
+ if (_finishing) return;
+ _finishing = true;
+ if (keyboardInUse) {
+ FocusManager.instance.primaryFocus?.unfocus();
+ await SystemChannels.textInput.invokeMethod<void>('TextInput.hide');
+ for (var i = 0; i < 10 && mounted && MediaQuery.viewInsetsOf(context).bottom > 0; i++) {
+ await Future<void>.delayed(const Duration(milliseconds: 50));
+ }
+ }
final typed = _name.text.trim();
if (typed.isNotEmpty) fit.updateProfile(name: typed);
String? first;
diff --git a/lib/screens/profile_screen.dart b/lib/screens/profile_screen.dart
index 3bb3a14..1a47007 100644
--- a/lib/screens/profile_screen.dart
+++ b/lib/screens/profile_screen.dart
@@ -43,7 +43,10 @@ class ProfileScreen extends StatefulWidget {
class _ProfileScreenState extends State<ProfileScreen> with SingleTickerProviderStateMixin {
bool _busy = false;
- static const _reach = 210.0;
+ double get _reach {
+ final h = MediaQuery.sizeOf(context).height / 873;
+ return (210 * h * h).clamp(110.0, 210.0);
+ }
final _scroll = ScrollController();
final _pull = ValueNotifier<double>(0);
late final AnimationController _back;
diff --git a/lib/services/graphics_mode.dart b/lib/services/graphics_mode.dart
index 70f1a0d..c4412c9 100644
--- a/lib/services/graphics_mode.dart
+++ b/lib/services/graphics_mode.dart
@@ -1,6 +1,7 @@
import 'dart:io' show Platform;
import 'package:flutter/foundation.dart';
+import 'package:flutter/scheduler.dart';
import 'package:flutter/services.dart';
class GraphicsMode {
@@ -25,6 +26,16 @@ class GraphicsMode {
}
}
+ static void watchFirstFrame() {
+ if (kIsWeb || !Platform.isAndroid) return;
+ late final TimingsCallback done;
+ done = (_) {
+ SchedulerBinding.instance.removeTimingsCallback(done);
+ _channel.invokeMethod<void>('ready').catchError((_) {});
+ };
+ SchedulerBinding.instance.addTimingsCallback(done);
+ }
+
static Future<void> restartWith(bool on) async {
try {
await _channel.invokeMethod<void>('set', {'compat': on});
diff --git a/lib/widgets/glass.dart b/lib/widgets/glass.dart
index 6ba4c95..fd1c6ac 100644
--- a/lib/widgets/glass.dart
+++ b/lib/widgets/glass.dart
@@ -110,7 +110,8 @@ class _GlassSheetRoute<T> extends ModalBottomSheetRoute<T> with _GlassCount<T> {
@override
Widget buildPage(BuildContext context, Animation<double> animation, Animation<double> secondaryAnimation) {
final page = super.buildPage(context, animation, secondaryAnimation);
- return floating ? Padding(padding: const EdgeInsets.only(top: 28, bottom: 28), child: page) : page;
+ return _KeyboardLift(
+ child: floating ? Padding(padding: const EdgeInsets.only(top: 28, bottom: 28), child: page) : page);
}
@override
@@ -137,6 +138,24 @@ class _GlassSheetRoute<T> extends ModalBottomSheetRoute<T> with _GlassCount<T> {
}
}
+class _KeyboardLift extends StatelessWidget {
+ const _KeyboardLift({required this.child});
+
+ final Widget child;
+
+ @override
+ Widget build(BuildContext context) {
+ final media = MediaQuery.of(context);
+ return Padding(
+ padding: EdgeInsets.only(bottom: media.viewInsets.bottom),
+ child: MediaQuery(
+ data: media.copyWith(viewInsets: media.viewInsets.copyWith(bottom: 0)),
+ child: child,
+ ),
+ );
+ }
+}
+
class _PullToClose extends StatefulWidget {
const _PullToClose({required this.child});
diff --git a/lib/widgets/keyboard_guard.dart b/lib/widgets/keyboard_guard.dart
new file mode 100644
index 0000000..752aaca
--- /dev/null
+++ b/lib/widgets/keyboard_guard.dart
@@ -0,0 +1,77 @@
+import 'dart:async';
+
+import 'package:flutter/widgets.dart';
+
+bool get keyboardInUse {
+ final at = FocusManager.instance.primaryFocus?.context;
+ if (at == null) return false;
+ return at.widget is EditableText || at.findAncestorWidgetOfExactType<EditableText>() != null;
+}
+
+class KeyboardGuard extends StatefulWidget {
+ const KeyboardGuard({super.key, required this.child});
+
+ final Widget child;
+
+ static const patience = Duration(milliseconds: 700);
+
+ @override
+ State<KeyboardGuard> createState() => _KeyboardGuardState();
+}
+
+class _KeyboardGuardState extends State<KeyboardGuard> {
+ Timer? _wait;
+ bool _stale = false;
+ double _inset = 0;
+
+ @override
+ void initState() {
+ super.initState();
+ FocusManager.instance.addListener(_check);
+ }
+
+ @override
+ void dispose() {
+ FocusManager.instance.removeListener(_check);
+ _wait?.cancel();
+ super.dispose();
+ }
+
+ void _check() {
+ if (_judge() && mounted) setState(() {});
+ }
+
+ bool _judge() {
+ final orphan = _inset > 0 && !keyboardInUse;
+ if (!orphan) {
+ _wait?.cancel();
+ _wait = null;
+ final was = _stale;
+ _stale = false;
+ return was;
+ }
+ if (_stale || _wait != null) return false;
+ _wait = Timer(KeyboardGuard.patience, () {
+ _wait = null;
+ if (mounted && _inset > 0 && !keyboardInUse) setState(() => _stale = true);
+ });
+ return false;
+ }
+
+ @override
+ Widget build(BuildContext context) {
+ final media = MediaQuery.of(context);
+ _inset = media.viewInsets.bottom;
+ _judge();
+ final drop = _stale && _inset > 0;
+ return MediaQuery(
+ data: drop
+ ? media.copyWith(
+ viewInsets: media.viewInsets.copyWith(bottom: 0),
+ padding: media.padding.copyWith(bottom: media.viewPadding.bottom),
+ )
+ : media,
+ child: widget.child,
+ );
+ }
+}
diff --git a/lib/widgets/profile_avatar.dart b/lib/widgets/profile_avatar.dart
index 7f03d69..240cffb 100644
--- a/lib/widgets/profile_avatar.dart
+++ b/lib/widgets/profile_avatar.dart
@@ -13,7 +13,9 @@ class ProfileAvatar extends StatelessWidget {
final double size;
@override
- Widget build(BuildContext context) {
+ Widget build(BuildContext context) => ListenableBuilder(listenable: fit, builder: (context, _) => _avatar(context));
+
+ Widget _avatar(BuildContext context) {
final gc = context.gc;
final bytes = fit.profilePhoto;
return Container(
diff --git a/test/onboarding_test.dart b/test/onboarding_test.dart
index e670d22..60a9233 100644
--- a/test/onboarding_test.dart
+++ b/test/onboarding_test.dart
@@ -4,6 +4,8 @@ import 'package:gymmane/app/gymmane_app.dart';
import 'package:gymmane/l10n/l10n.dart';
import 'package:gymmane/services/local_store.dart';
import 'package:gymmane/state/fit_state.dart';
+import 'package:gymmane/widgets/glass.dart';
+import 'package:gymmane/widgets/keyboard_guard.dart';
import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';
import 'package:shared_preferences/shared_preferences.dart';
@@ -36,4 +38,102 @@ void main() {
fit.onboarded = true;
fit.persistNow();
});
+
+ group('hueco del teclado que se queda puesto', () {
+ Widget host(ValueNotifier<double> seen) => MaterialApp(
+ builder: (context, child) => KeyboardGuard(child: child!),
+ home: Builder(builder: (context) {
+ seen.value = MediaQuery.viewInsetsOf(context).bottom;
+ return const Material(child: Align(alignment: Alignment.topCenter, child: SizedBox(width: 200, child: TextField())));
+ }),
+ );
+
+ testWidgets('sin nada que escribir se ignora pasado un momento', (tester) async {
+ final seen = ValueNotifier<double>(-1);
+ tester.view.physicalSize = const Size(1080, 1800);
+ tester.view.devicePixelRatio = 3;
+ tester.view.viewInsets = const FakeViewPadding(bottom: 900);
+ addTearDown(tester.view.reset);
+ await tester.pumpWidget(host(seen));
+ expect(seen.value, 300);
+ await tester.pump(const Duration(milliseconds: 300));
+ expect(seen.value, 300, reason: 'el teclado puede estar cerrándose');
+ await tester.pump(const Duration(milliseconds: 500));
+ expect(seen.value, 0);
+ });
+
+ testWidgets('con un campo enfocado el hueco se respeta', (tester) async {
+ final seen = ValueNotifier<double>(-1);
+ tester.view.physicalSize = const Size(1080, 1800);
+ tester.view.devicePixelRatio = 3;
+ addTearDown(tester.view.reset);
+ await tester.pumpWidget(host(seen));
+ await tester.tap(find.byType(TextField));
+ await tester.pump();
+ tester.view.viewInsets = const FakeViewPadding(bottom: 900);
+ await tester.pump();
+ await tester.pump(const Duration(seconds: 2));
+ expect(seen.value, 300);
+
+ FocusManager.instance.primaryFocus?.unfocus();
+ await tester.pump();
+ await tester.pump(const Duration(seconds: 1));
+ expect(seen.value, 0, reason: 'sin foco y con el hueco aún puesto, está atascado');
+
+ await tester.tap(find.byType(TextField));
+ await tester.pump();
+ await tester.pump();
+ expect(seen.value, 300, reason: 'al volver a escribir manda el teclado de verdad');
+ });
+
+ testWidgets('lo escrito no se pierde cuando el hueco se ignora', (tester) async {
+ final seen = ValueNotifier<double>(-1);
+ tester.view.physicalSize = const Size(1080, 1800);
+ tester.view.devicePixelRatio = 3;
+ addTearDown(tester.view.reset);
+ await tester.pumpWidget(host(seen));
+ await tester.enterText(find.byType(TextField), 'Press banca');
+ tester.view.viewInsets = const FakeViewPadding(bottom: 900);
+ await tester.pump();
+ FocusManager.instance.primaryFocus?.unfocus();
+ await tester.pump();
+ await tester.pump(const Duration(seconds: 1));
+ expect(seen.value, 0);
+ expect(find.text('Press banca'), findsOneWidget, reason: 'cambiar el hueco no puede rehacer la pantalla');
+ });
+ });
+
+ group('#372 las hojas se apartan del teclado', () {
+ testWidgets('un campo al fondo de una hoja queda por encima del teclado y no pierde lo escrito', (tester) async {
+ tester.view.physicalSize = const Size(1080, 2400);
+ tester.view.devicePixelRatio = 3;
+ addTearDown(tester.view.reset);
+ await tester.pumpWidget(MaterialApp(
+ home: Builder(
+ builder: (context) => Scaffold(
+ body: Center(
+ child: TextButton(
+ onPressed: () => showAppSheet<void>(
+ context: context,
+ builder: (_) => const Padding(
+ padding: EdgeInsets.fromLTRB(20, 200, 20, 20),
+ child: Material(child: TextField(key: Key('campo'))),
+ ),
+ ),
+ child: const Text('abrir'),
+ ),
+ ),
+ ),
+ ),
+ ));
+ await tester.tap(find.text('abrir'));
+ await tester.pumpAndSettle();
+ await tester.enterText(find.byKey(const Key('campo')), 'Lesiones');
+ tester.view.viewInsets = const FakeViewPadding(bottom: 1200);
+ await tester.pumpAndSettle();
+ final field = tester.getRect(find.byKey(const Key('campo')));
+ expect(field.bottom, lessThanOrEqualTo(800 - 400));
+ expect(find.text('Lesiones'), findsOneWidget);
+ });
+ });
}
diff --git a/test/profile_photo_test.dart b/test/profile_photo_test.dart
index 8c95405..05bb05c 100644
--- a/test/profile_photo_test.dart
+++ b/test/profile_photo_test.dart
@@ -98,4 +98,17 @@ void main() {
await tester.pump();
expect(photo, findsNothing);
});
+
+ testWidgets('la foto cambia al momento aunque quien la pinta no se reconstruya', (tester) async {
+ await tester.pumpWidget(MaterialApp(
+ theme: AppTheme.dark,
+ home: const Scaffold(body: Center(child: ProfileAvatar())),
+ ));
+ expect(defaultPhoto, findsOneWidget);
+ fit.setProfilePhoto(_png);
+ fit.persistNow();
+ await tester.pump();
+ expect(photo, findsOneWidget);
+ expect(defaultPhoto, findsNothing);
+ });
}