AriasCreations/TimeTracker
3
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Fix up more of the update functions

Browse source
This commit is contained in:
zontreck 2025-05-14 19:32:03 -07:00
parent d0ad9c9364
commit fcf5348f96
5 changed files with 75 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

15
android/app/build.gradle.kts
View file

@ -8,11 +8,13 @@ plugins {
android { android {
namespace = "dev.zontreck.timetrack" namespace = "dev.zontreck.timetrack"
compileSdk = flutter.compileSdkVersion compileSdk = flutter.compileSdkVersion
ndkVersion = flutter.ndkVersion ndkVersion = "27.0.12077973"
compileOptions { compileOptions {
sourceCompatibility = JavaVersion.VERSION_11 sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11 targetCompatibility = JavaVersion.VERSION_11
isCoreLibraryDesugaringEnabled = true
} }
kotlinOptions { kotlinOptions {
@ -28,6 +30,8 @@ android {
targetSdk = flutter.targetSdkVersion targetSdk = flutter.targetSdkVersion
versionCode = flutter.versionCode versionCode = flutter.versionCode
versionName = flutter.versionName versionName = flutter.versionName
multiDexEnabled = true
} }
buildTypes { buildTypes {
@ -39,6 +43,15 @@ android {
} }
} }
dependencies {
// For AGP 7.4+
coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.1.4")
// For AGP 7.3
// coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.2.3'
// For AGP 4.0 to 7.2
// coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.9'
}
flutter { flutter {
source = "../.." source = "../.."
} }

5
lib/consts.dart
View file

@ -5,7 +5,7 @@ import 'package:dio/dio.dart';
class TTConsts { class TTConsts {
static const UPDATE_URL = static const UPDATE_URL =
"https://git.zontreck.com/AriasCreations/TimeTracker/raw/branch/main/latest-releases.json"; "https://git.zontreck.com/AriasCreations/TimeTracker/raw/branch/main/latest-releases.json";
static const VERSION = "1.0.0-dev.2"; static const VERSION = "1.0.0-dev.3";
static bool UPDATE_AVAILABLE = false; static bool UPDATE_AVAILABLE = false;
static UpdateChannel UPDATE_CHANNEL = UpdateChannel.alpha; static UpdateChannel UPDATE_CHANNEL = UpdateChannel.alpha;
@ -18,8 +18,9 @@ class TTConsts {
if (VERSION == serverVersion) { if (VERSION == serverVersion) {
// Up to date // Up to date
UPDATE_AVAILABLE = false; UPDATE_AVAILABLE = false;
} else } else {
UPDATE_AVAILABLE = true; UPDATE_AVAILABLE = true;
}
} }
} }

94
lib/pages/HomePage.dart
View file

@ -1,11 +1,10 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:libacflutter/Constants.dart'; import 'package:libacflutter/Constants.dart';
import 'package:ota_update/ota_update.dart'; import 'package:ota_update/ota_update.dart';
import 'package:timetrack/consts.dart'; import 'package:timetrack/consts.dart';
class HomePage extends StatefulWidget { class HomePage extends StatefulWidget {
HomePage({super.key}); const HomePage({super.key});
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {
@ -29,50 +28,59 @@ class _HomePageState extends State<HomePage> {
), ),
drawer: Drawer( drawer: Drawer(
elevation: 8, elevation: 8,
child: Column( child: SingleChildScrollView(
children: [ child: Column(
DrawerHeader( children: [
child: Column( DrawerHeader(
children: [ child: Column(
Text("Time Tracker"), children: [
Text("Created by Tara Piccari"), Text("Time Tracker"),
Text("Copyright 2025 - Present"), Text("Created by Tara Piccari"),
], Text("Copyright 2025 - Present"),
],
),
), ),
), DrawerHeader(
DrawerHeader( child: Column(
child: Column( children: [
children: [ Text("Version: ${TTConsts.VERSION}"),
Text("Version: ${TTConsts.VERSION}"), Text("Update Channel: ${TTConsts.UPDATE_CHANNEL}"),
Text("Update Channel: ${TTConsts.UPDATE_CHANNEL}"), Text(
Text( "* ${TTConsts.UPDATE_AVAILABLE ? "Update Is Available" : "You are up to date!"} *",
"* ${TTConsts.UPDATE_AVAILABLE ? "Update Is Available" : "You are up to date!"} *", ),
), ],
ElevatedButton( ),
onPressed: () async { ),
await TTConsts.checkUpdate(); DrawerHeader(
child: Column(
children: [
ElevatedButton(
onPressed: () async {
await TTConsts.checkUpdate();
setState(() {}); setState(() {});
}, },
child: Text("Check for Update"), child: Text("Check for Update"),
), ),
ElevatedButton( if (TTConsts.UPDATE_AVAILABLE)
onPressed: () async { ElevatedButton(
OtaUpdate() onPressed: () async {
.execute( OtaUpdate()
"https://ci.zontreck.com/job/Projects/job/Dart/job/Time%20Tracker/job/main/lastSuccessfulBuild/artifact/build/app/outputs/flutter-apk/timetrack.apk", .execute(
destinationFilename: "timetrack.apk", "https://ci.zontreck.com/job/Projects/job/Dart/job/Time%20Tracker/job/main/lastSuccessfulBuild/artifact/build/app/outputs/flutter-apk/timetrack.apk",
) destinationFilename: "timetrack.apk",
.listen((OtaEvent event) { )
//setState(() => currentEvent = event); .listen((OtaEvent event) {
}); //setState(() => currentEvent = event);
}, });
child: Text("Install Update"), },
), child: Text("Install Update"),
], ),
],
),
), ),
), ],
], ),
), ),
), ),
); );

3
lib/pages/MainApp.dart
View file

@ -1,9 +1,8 @@
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter/widgets.dart';
import 'package:timetrack/pages/HomePage.dart'; import 'package:timetrack/pages/HomePage.dart';
class MainApp extends StatefulWidget { class MainApp extends StatefulWidget {
MainApp({super.key}); const MainApp({super.key});
@override @override
State<StatefulWidget> createState() { State<StatefulWidget> createState() {

13
test/widget_test.dart
View file

@ -5,7 +5,6 @@
// gestures. You can also use WidgetTester to find child widgets in the widget // gestures. You can also use WidgetTester to find child widgets in the widget
// tree, read text, and verify that the values of widget properties are correct. // tree, read text, and verify that the values of widget properties are correct.
import 'package:flutter/material.dart';
import 'package:flutter_test/flutter_test.dart'; import 'package:flutter_test/flutter_test.dart';
import 'package:timetrack/pages/MainApp.dart'; import 'package:timetrack/pages/MainApp.dart';
@ -16,15 +15,15 @@ void main() {
await tester.pumpWidget(MainApp()); await tester.pumpWidget(MainApp());
// Verify that our counter starts at 0. // Verify that our counter starts at 0.
expect(find.text('0'), findsOneWidget); //expect(find.text('0'), findsOneWidget);
expect(find.text('1'), findsNothing); //expect(find.text('1'), findsNothing);
// Tap the '+' icon and trigger a frame. // Tap the '+' icon and trigger a frame.
await tester.tap(find.byIcon(Icons.add)); //await tester.tap(find.byIcon(Icons.add));
await tester.pump(); //await tester.pump();
// Verify that our counter has incremented. // Verify that our counter has incremented.
expect(find.text('0'), findsNothing); //expect(find.text('0'), findsNothing);
expect(find.text('1'), findsOneWidget); //expect(find.text('1'), findsOneWidget);
}); });
} }