Skip to content

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

Redraw the journal and the note editor

InlitX8c6dc046ebc6
diff --git a/lib/screens/note_edit_screen.dart b/lib/screens/note_edit_screen.dart
index 547eb53..91bb779 100644
--- a/lib/screens/note_edit_screen.dart
+++ b/lib/screens/note_edit_screen.dart
@@ -1,6 +1,6 @@
import 'package:file_picker/file_picker.dart';
import 'package:flutter/material.dart';
-import 'package:phosphor_flutter/phosphor_flutter.dart';
+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';
import '../l10n/l10n.dart';
import '../models/exercise.dart';
@@ -135,7 +135,6 @@ class _NoteEditScreenState extends State<NoteEditScreen> {
Container(
decoration: BoxDecoration(
color: gc.bgRaised,
- border: Border.all(color: gc.border),
borderRadius: BorderRadius.circular(16),
),
padding: const EdgeInsets.fromLTRB(16, 6, 16, 6),
@@ -148,12 +147,12 @@ class _NoteEditScreenState extends State<NoteEditScreen> {
textCapitalization: TextCapitalization.sentences,
onChanged: (_) => setState(() {}),
cursorColor: gc.accent,
- style: AppTheme.s(14.5, color: gc.text, height: 1.45),
+ style: AppTheme.f(14.5, weight: FontWeight.w500, color: gc.text, height: 1.45),
decoration: InputDecoration(
border: InputBorder.none,
hintText: t.notePlaceholder,
- hintStyle: AppTheme.s(14.5, color: gc.textTertiary),
- counterStyle: AppTheme.s(11, color: gc.textTertiary),
+ hintStyle: AppTheme.f(14.5, weight: FontWeight.w500, color: gc.textTertiary),
+ counterStyle: AppTheme.f(11, weight: FontWeight.w500, color: gc.textTertiary),
),
),
),
@@ -209,7 +208,8 @@ class _NoteEditScreenState extends State<NoteEditScreen> {
Widget _label(GymColors gc, String text) => Padding(
padding: const EdgeInsets.only(bottom: 10),
child: Text(text,
- style: AppTheme.d(12, weight: FontWeight.w600, color: gc.textSecondary, letterSpacing: 2)),
+ style: AppTheme.f(11,
+ weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.4)),
);
Widget _row(
@@ -234,7 +234,7 @@ class _NoteEditScreenState extends State<NoteEditScreen> {
child: Text(value,
maxLines: 1,
overflow: TextOverflow.ellipsis,
- style: AppTheme.s(14,
+ style: AppTheme.f(14,
weight: FontWeight.w500, color: muted ? gc.textTertiary : gc.text)),
),
trailing ??
@@ -268,15 +268,14 @@ class _NoteEditScreenState extends State<NoteEditScreen> {
height: 74,
decoration: BoxDecoration(
color: gc.bgRaised,
- borderRadius: BorderRadius.circular(12),
- border: Border.all(color: gc.border),
+ borderRadius: BorderRadius.circular(16),
),
child: Column(
mainAxisAlignment: MainAxisAlignment.center,
children: [
Icon(PhosphorIconsRegular.images, size: 20, color: gc.textSecondary),
const SizedBox(height: 5),
- Text(t.noteAttach, style: AppTheme.s(10.5, color: gc.textTertiary)),
+ Text(t.noteAttach, style: AppTheme.f(10.5, weight: FontWeight.w500, color: gc.textTertiary)),
],
),
),
@@ -330,7 +329,6 @@ class _ExercisePickerSheetState extends State<_ExercisePickerSheet> {
height: MediaQuery.of(context).size.height * 0.72,
decoration: BoxDecoration(
color: gc.bg,
- border: Border.all(color: gc.border),
borderRadius: const BorderRadius.vertical(top: Radius.circular(26)),
),
clipBehavior: Clip.antiAlias,
@@ -344,10 +342,10 @@ class _ExercisePickerSheetState extends State<_ExercisePickerSheet> {
autofocus: true,
onChanged: (_) => setState(() {}),
cursorColor: gc.accent,
- style: AppTheme.s(14, color: gc.text),
+ style: AppTheme.f(14, weight: FontWeight.w500, color: gc.text),
decoration: InputDecoration(
hintText: t.searchAllExercises,
- hintStyle: AppTheme.s(14, color: gc.textTertiary),
+ hintStyle: AppTheme.f(14, weight: FontWeight.w500, color: gc.textTertiary),
filled: true,
fillColor: gc.bgRaised,
prefixIcon: Icon(PhosphorIconsRegular.magnifyingGlass, size: 17, color: gc.textTertiary),
@@ -386,7 +384,7 @@ class _ExercisePickerSheetState extends State<_ExercisePickerSheet> {
padding: const EdgeInsets.symmetric(vertical: 14),
decoration: BoxDecoration(border: Border(bottom: BorderSide(color: gc.border))),
child: Text(label,
- style: AppTheme.s(14,
+ style: AppTheme.f(14,
weight: FontWeight.w500, color: muted ? gc.textTertiary : gc.text)),
),
);
diff --git a/lib/screens/notes_screen.dart b/lib/screens/notes_screen.dart
index 01833e1..a3f5f39 100644
--- a/lib/screens/notes_screen.dart
+++ b/lib/screens/notes_screen.dart
@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
-import 'package:phosphor_flutter/phosphor_flutter.dart';
+import 'package:phosphoricons_flutter/phosphoricons_flutter.dart';
import '../l10n/l10n.dart';
import '../models/exercise.dart';
@@ -105,10 +105,10 @@ class NotesScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(noteDayLabel(day).toUpperCase(),
- style: AppTheme.d(12,
- weight: FontWeight.w700, color: gc.text, letterSpacing: 2)),
+ style: AppTheme.f(10.5,
+ weight: FontWeight.w700, color: gc.textTertiary, letterSpacing: 1.5)),
const SizedBox(height: 3),
- Text(t.fullDate(day), style: AppTheme.s(12, color: gc.textTertiary)),
+ Text(t.fullDate(day), style: AppTheme.f(12, weight: FontWeight.w500, color: gc.textTertiary)),
],
),
),
@@ -127,7 +127,6 @@ class NotesScreen extends StatelessWidget {
padding: const EdgeInsets.symmetric(vertical: 26, horizontal: 20),
decoration: BoxDecoration(
color: gc.bgRaised.withValues(alpha: 0.5),
- border: Border.all(color: gc.border),
borderRadius: BorderRadius.circular(18),
),
child: Row(
@@ -136,7 +135,7 @@ class NotesScreen extends StatelessWidget {
const SizedBox(width: 14),
Expanded(
child: Text(t.noteNoneOnDay,
- style: AppTheme.s(13, color: gc.textSecondary, height: 1.4)),
+ style: AppTheme.f(13, weight: FontWeight.w500, color: gc.textSecondary, height: 1.4)),
),
],
),
@@ -189,10 +188,10 @@ class NotesScreen extends StatelessWidget {
crossAxisAlignment: CrossAxisAlignment.start,
children: [
Text(noteDayLabel(d).toUpperCase(),
- style: AppTheme.d(12.5,
- weight: FontWeight.w700, color: gc.text, letterSpacing: 2)),
+ style: AppTheme.f(12.5,
+ weight: FontWeight.w700, color: gc.text, letterSpacing: 0.4)),
const SizedBox(height: 3),
- Text(t.fullDate(d), style: AppTheme.s(11.5, color: gc.textTertiary)),
+ Text(t.fullDate(d), style: AppTheme.f(11.5, weight: FontWeight.w500, color: gc.textTertiary)),
],
),
const SizedBox(width: 12),
@@ -219,11 +218,11 @@ class NotesScreen extends StatelessWidget {
const SizedBox(height: 16),
Text(t.noteEmptyTitle,
textAlign: TextAlign.center,
- style: AppTheme.d(17, weight: FontWeight.w600, color: gc.text)),
+ style: AppTheme.f(17, weight: FontWeight.w600, color: gc.text)),
const SizedBox(height: 8),
Text(t.noteEmptyBody,
textAlign: TextAlign.center,
- style: AppTheme.s(13, color: gc.textSecondary, height: 1.5)),
+ style: AppTheme.f(13, weight: FontWeight.w500, color: gc.textSecondary, height: 1.5)),
],
),
),