Skip to content

Commit f197664

Browse files
committed
fix charts height
1 parent 58b51cb commit f197664

3 files changed

Lines changed: 52 additions & 39 deletions

File tree

.github/workflows/ci.yml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build mobile apps & check tests
1+
name: Build Android & check tests
22

33
on:
44
push:
@@ -12,54 +12,52 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v3
16-
- uses: actions/setup-java@v2
15+
- uses: actions/checkout@v4
16+
- uses: actions/setup-java@v4
1717
with:
18-
distribution: 'oracle'
19-
java-version: '25'
18+
distribution: 'temurin'
19+
java-version: '24'
2020
- uses: subosito/flutter-action@v2
2121
with:
22-
flutter-version: '3.24.0'
23-
- name: Clean Gradle cache
24-
run: rm -rf ~/.gradle/caches/
22+
flutter-version: '3.35.7'
23+
channel: 'stable'
24+
- name: Cache Flutter dependencies
25+
uses: actions/cache@v3
26+
with:
27+
path: |
28+
~/.pub-cache
29+
key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
30+
restore-keys: |
31+
${{ runner.os }}-flutter-
2532
- name: Flutter clean
2633
run: flutter clean
2734
- name: Install dependencies
2835
run: flutter pub get
2936
- name: Generate l10n
3037
run: flutter gen-l10n
3138
- name: Build apk
32-
run: flutter build apk
39+
run: flutter build apk --debug
3340
- name: Build appbundle
34-
run: flutter build appbundle
35-
36-
build-ios:
37-
name: Build ios
38-
runs-on: macos-latest
39-
40-
steps:
41-
- uses: actions/checkout@v3
42-
- uses: subosito/flutter-action@v2
43-
with:
44-
channel: 'stable'
45-
architecture: x64
46-
- name: Install dependencies
47-
run: flutter pub get
48-
- name: Generate l10n
49-
run: flutter gen-l10n
50-
- name: Build ios
51-
run: flutter build ios --release --no-codesign
41+
run: flutter build appbundle --debug
5242

5343
check-tests:
5444
name: Check Tests
5545
runs-on: ubuntu-latest
5646

5747
steps:
58-
- uses: actions/checkout@v3
48+
- uses: actions/checkout@v4
5949
- uses: subosito/flutter-action@v2
6050
with:
61-
flutter-version: '3.24.0'
51+
flutter-version: '3.35.7'
6252
channel: 'stable'
53+
- name: Cache Flutter dependencies
54+
uses: actions/cache@v3
55+
with:
56+
path: |
57+
~/.pub-cache
58+
key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
59+
restore-keys: |
60+
${{ runner.os }}-flutter-
6361
- name: Flutter doctor
6462
run: flutter doctor
6563
- name: Get dependencies

.github/workflows/release.yml

Lines changed: 20 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,28 @@ jobs:
1010

1111
steps:
1212
- name: Checkout code
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
14+
15+
- name: Setup Java
16+
uses: actions/setup-java@v4
17+
with:
18+
distribution: 'temurin'
19+
java-version: '24'
1420

1521
- name: Setup Flutter
1622
uses: subosito/flutter-action@v2
1723
with:
18-
flutter-version: '3.24.0'
24+
flutter-version: '3.35.7'
25+
channel: 'stable'
26+
27+
- name: Cache Flutter dependencies
28+
uses: actions/cache@v3
29+
with:
30+
path: |
31+
~/.pub-cache
32+
key: ${{ runner.os }}-flutter-${{ hashFiles('**/pubspec.lock') }}
33+
restore-keys: |
34+
${{ runner.os }}-flutter-
1935
2036
- name: Install dependencies
2137
run: flutter pub get
@@ -25,7 +41,7 @@ jobs:
2541
run: flutter build apk --release
2642

2743
- name: Upload APK
28-
uses: actions/upload-artifact@v2
44+
uses: actions/upload-artifact@v4
2945
with:
30-
name: run-flutter-run.apk
46+
name: release.apk
3147
path: build/app/outputs/flutter-apk/app-release.apk

lib/presentation/statistics/screens/statistics_screen.dart

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,8 @@ class StatisticsScreen extends HookConsumerWidget {
147147
final maxY = _calculateNiceMax(maxValue);
148148

149149
return Container(
150-
height: 200,
151-
padding: const EdgeInsets.all(16),
150+
height: 280,
151+
padding: const EdgeInsets.symmetric(vertical: 16),
152152
decoration: BoxDecoration(
153153
color: ColorUtils.white,
154154
borderRadius: BorderRadius.circular(12),
@@ -162,15 +162,14 @@ class StatisticsScreen extends HookConsumerWidget {
162162
],
163163
),
164164
child: Column(
165-
crossAxisAlignment: CrossAxisAlignment.start,
165+
crossAxisAlignment: CrossAxisAlignment.center,
166166
children: [
167167
Text(
168168
title,
169169
style: const TextStyle(
170170
fontSize: 16,
171171
fontWeight: FontWeight.bold,
172172
),
173-
textAlign: TextAlign.center,
174173
),
175174
const SizedBox(height: 16),
176175
Expanded(
@@ -181,7 +180,7 @@ class StatisticsScreen extends HookConsumerWidget {
181180
leftTitles: AxisTitles(
182181
sideTitles: SideTitles(
183182
showTitles: true,
184-
reservedSize: 60, // Increased from 50 to 60 for more space
183+
reservedSize: 45, // Reduced from 60 to 45 for less empty space
185184
getTitlesWidget: (value, meta) {
186185
return Padding(
187186
padding: const EdgeInsets.only(right: 8), // Add padding between Y-axis labels and chart
@@ -203,7 +202,7 @@ class StatisticsScreen extends HookConsumerWidget {
203202
bottomTitles: AxisTitles(
204203
sideTitles: SideTitles(
205204
showTitles: true,
206-
reservedSize: 60, // Increased for vertical text
205+
reservedSize: 40, // Reduced from 60 to 40 for less empty space
207206
getTitlesWidget: (value, meta) {
208207
final dateTime = DateTime.fromMillisecondsSinceEpoch(value.toInt());
209208
final format = DateFormat('HH:mm');

0 commit comments

Comments
 (0)