fiqryx · fiqryx · Jun 24, 2025 · Jun 24, 2025
diff --git a/.metadata b/.metadata
@@ -4,7 +4,7 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: "4cf269e36de2573851eaef3c763994f8f9be494d"
+  revision: "6fba2447e95c451518584c35e25f5433f14d888c"
   channel: "stable"
 
 project_type: app
@@ -13,26 +13,11 @@ project_type: app
 migration:
   platforms:
     - platform: root
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+      create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
+      base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
     - platform: android
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: ios
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: linux
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: macos
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: web
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-    - platform: windows
-      create_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
-      base_revision: 4cf269e36de2573851eaef3c763994f8f9be494d
+      create_revision: 6fba2447e95c451518584c35e25f5433f14d888c
+      base_revision: 6fba2447e95c451518584c35e25f5433f14d888c
 
   # User provided section
 

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "cmake.sourceDirectory": "C:/Users/quart/Desktop/project/3.mobile/to-day/linux"
+}
diff --git a/android/app/build.gradle b/android/app/build.gradle
diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
@@ -0,0 +1,46 @@
+plugins {
+    id("com.android.application")
+    id("kotlin-android")
+    id("dev.flutter.flutter-gradle-plugin")
+}
+
+android {
+    namespace = "com.example.today"
+    compileSdk = flutter.compileSdkVersion
+    ndkVersion = "27.0.12077973"
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
+
+    kotlinOptions {
+        jvmTarget = JavaVersion.VERSION_11.toString()
+    }
+
+    defaultConfig {
+        applicationId = "com.example.today"
+        minSdk = 23
+        targetSdk = flutter.targetSdkVersion
+        versionCode = flutter.versionCode
+        versionName = flutter.versionName
+    }
+
+    buildTypes {
+        release {
+            signingConfig = signingConfigs.getByName("debug")
+            getByName("release") {
+                isMinifyEnabled = true
+                isShrinkResources = true
+                proguardFiles(
+                    getDefaultProguardFile("proguard-android-optimize.txt"),
+                    "proguard-rules.pro"
+                )
+            }
+        }
+    }
+}
+
+flutter {
+    source = "../.."
+}
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -6,6 +6,7 @@
     <application
         android:label="ToDay"
         android:name="${applicationName}"
+        android:enableOnBackInvokedCallback="false"
         android:icon="@mipmap/launcher_icon">
         <activity
             android:name=".MainActivity"

diff --git a/android/build.gradle.kts b/android/build.gradle.kts
@@ -0,0 +1,21 @@
+allprojects {
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+val newBuildDir: Directory = rootProject.layout.buildDirectory.dir("../../build").get()
+rootProject.layout.buildDirectory.value(newBuildDir)
+
+subprojects {
+    val newSubprojectBuildDir: Directory = newBuildDir.dir(project.name)
+    project.layout.buildDirectory.value(newSubprojectBuildDir)
+}
+subprojects {
+    project.evaluationDependsOn(":app")
+}
+
+tasks.register<Delete>("clean") {
+    delete(rootProject.layout.buildDirectory)
+}
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-all.zip
diff --git a/android/settings.gradle b/android/settings.gradle
diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts
@@ -0,0 +1,25 @@
+pluginManagement {
+    val flutterSdkPath = run {
+        val properties = java.util.Properties()
+        file("local.properties").inputStream().use { properties.load(it) }
+        val flutterSdkPath = properties.getProperty("flutter.sdk")
+        require(flutterSdkPath != null) { "flutter.sdk not set in local.properties" }
+        flutterSdkPath
+    }
+
+    includeBuild("$flutterSdkPath/packages/flutter_tools/gradle")
+
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    id("dev.flutter.flutter-plugin-loader") version "1.0.0"
+    id("com.android.application") version "8.10.1" apply false
+    id("org.jetbrains.kotlin.android") version "2.1.0" apply false
+}
+
+include(":app")
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,7 +1,4 @@
-import 'package:back_button_interceptor/back_button_interceptor.dart';
 import 'package:flutter/material.dart';
-import 'package:flutter/services.dart';
-import 'package:fluttertoast/fluttertoast.dart';
 import 'package:provider/provider.dart';
 import 'package:today/helpers/database.dart';
 import 'package:today/helpers/notification.dart';
@@ -47,33 +44,14 @@ final routes = <String, WidgetBuilder>{
   '/help': (ctx) => const HelpScreen(),
 };
 
-class App extends StatefulWidget {
+class App extends StatelessWidget {
   const App({super.key});
 
-  @override
-  State<App> createState() => _App();
-}
-
-class _App extends State<App> {
-  DateTime? lastBackPressTime;
-
-  @override
-  void initState() {
-    super.initState();
-    BackButtonInterceptor.add(_interceptor);
-  }
-
-  @override
-  void dispose() {
-    BackButtonInterceptor.remove(_interceptor);
-    super.dispose();
-  }
-
   @override
   Widget build(BuildContext context) {
     return Consumer<AppStore>(
       builder: (context, appStore, child) {
-        return ShadApp.material(
+        return ShadApp(
           theme: ShadThemeData(
             brightness: Brightness.light,
             colorScheme: ShadColorScheme.fromName('zinc'),
@@ -102,26 +80,4 @@ class _App extends State<App> {
       },
     );
   }
-
-  bool _interceptor(bool stopDefaultButtonEvent, RouteInfo info) {
-    final now = DateTime.now();
-    debugPrint('route: ${info.routeWhenAdded?.settings.name}');
-
-    if (lastBackPressTime == null ||
-        now.difference(lastBackPressTime!) > const Duration(seconds: 2)) {
-      lastBackPressTime = now;
-
-      if (mounted) {
-        Fluttertoast.showToast(
-          msg: "Press back again to exit",
-          toastLength: Toast.LENGTH_SHORT,
-        );
-      }
-
-      return true; // intercept/stop the back button
-    } else {
-      SystemNavigator.pop(); // exit
-      return false;
-    }
-  }
 }