feat: HomeScreen

gdg-yonsei · Mar 25, 2023 · 97b8a49 · 97b8a49
1 parent bdf84e1
commit 97b8a49
Show file tree

Hide file tree

Showing 26 changed files with 631 additions and 577 deletions.
diff --git a/lib/audio_record.dart b/lib/audio_record.dart
diff --git a/lib/main.dart b/lib/main.dart
@@ -1,8 +1,6 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_riverpod/flutter_riverpod.dart';
-import 'package:see_our_sounds/audio_record.dart';
-import 'package:see_our_sounds/src/screens/history_screen.dart';
-
+import 'package:see_our_sounds/src/screens/home/home_screen.dart';
 
 void main() {
   runApp(ProviderScope(child: const MyApp()));
@@ -16,11 +14,8 @@ class MyApp extends StatelessWidget {
     return MaterialApp(
       title: 'HearSitter',
       debugShowCheckedModeBanner: false,
-      theme: ThemeData(
-        primarySwatch: Colors.blue,
-        fontFamily: 'NotoSansKR'
-      ),
-      home: const HistoryScreen(),
+      theme: ThemeData(primarySwatch: Colors.blue, fontFamily: 'NotoSansKR'),
+      home: HomseScreen(),
     );
   }
 }
diff --git a/lib/src/core/app_assets.dart b/lib/src/core/app_assets.dart
@@ -1,22 +1,29 @@
 class AppAssets {
   AppAssets._();
+
   static const String logo = "";
-  static const String announcementIconDark = 'assets/icon_dark/announcement_dark.png';
-  static const String announcementIconLight = 'assets/icon_light/announcement_light.png';
+  static const String announcementIconDark =
+      'assets/icon_dark/announcement_dark.png';
+  static const String announcementIconLight =
+      'assets/icon_light/announcement_light.png';
   static const String bicycleIconDark = 'assets/icon_dark/bicycle_dark.png';
   static const String bicycleIconLight = 'assets/icon_light/bicycle_light.png';
   static const String carHornIconDark = 'assets/icon_dark/carhorn_dark.png';
   static const String carHornIconLight = 'assets/icon_light/carhorn_light.png';
   static const String crackIconDark = 'assets/icon_dark/crack_dark.png';
   static const String crackIconLight = 'assets/icon_light/crack_light.png';
   static const String fireAlarmIconDark = 'assets/icon_dark/firealarm_dark.png';
-  static const String fireAlarmIconLight = 'assets/icon_light/firealarm_light.png';
+  static const String fireAlarmIconLight =
+      'assets/icon_light/firealarm_light.png';
   static const String gunIconDark = 'assets/icon_dark/gun_dark.png';
   static const String gunIconLight = 'assets/icon_light/gun_light.png';
-  static const String infantCryingIconDark = 'assets/icon_dark/infantcrying_dark.png';
-  static const String infantCryingIconLight = 'assets/icon_light/infantcrying_light.png';
+  static const String infantCryingIconDark =
+      'assets/icon_dark/infantcrying_dark.png';
+  static const String infantCryingIconLight =
+      'assets/icon_light/infantcrying_light.png';
   static const String mamaPapaIconDark = 'assets/icon_dark/mamapapa_dark.png';
-  static const String mamaPapaIconLight = 'assets/icon_light/mamapapa_light.png';
+  static const String mamaPapaIconLight =
+      'assets/icon_light/mamapapa_light.png';
   static const String nameIconDark = 'assets/icon_dark/name_dark.png';
   static const String nameIconLight = 'assets/icon_light/name_light.png';
 }
diff --git a/lib/src/core/app_constants.dart b/lib/src/core/app_constants.dart
@@ -2,23 +2,27 @@ import 'dart:ui';
 
 class AppUri {
   AppUri._();
+
   static const String uriBase = 'http://watch.jimmy0006.site:3000';
   static const String uriPing = '/ping';
   static const String uriUint = '/uint';
 }
 
 class AppColor {
   AppColor._();
+
   static const primaryColor = Color(0xff4285f4);
-  static const errorColor = Color(0xffea4335);
+  static const secondaryColor = Color(0xffa7bbff);
+  static const errorColor = Color(0xffE54C19);
   static const grayColor = Color(0xffa1a1a1);
   static const lightGrayColor = Color(0xffd9d9d9);
   static const accentColor = Color(0xff00164e);
+  static const darkColor = Color(0xff181818);
 }
 
-class AppDatabase{
+class AppDatabase {
   static const String tableName = 'history';
-  static const  int version = 1; // database version
+  static const int version = 1; // database version
 }
 
 enum SoundCategory {

diff --git a/lib/src/core/utils/audio_util.dart b/lib/src/core/utils/audio_util.dart
@@ -2,8 +2,7 @@ import 'dart:convert';
 import 'dart:math';
 import 'dart:typed_data';
 
-class AudioUtil{
-
+class AudioUtil {
   static Uint8List toWAV(List<Uint8List> audioChunks) {
     var data = audioChunks.expand((i) => i).toList();
     var channels = 1;
@@ -43,15 +42,4 @@ class AudioUtil{
 
     return header;
   }
-
-  static double calculateDecibel(Uint8List audioChunks){
-    final sum = audioChunks.fold(0, (acc, audioChunk) => acc + audioChunk * audioChunk);
-
-    // Root Mean Square (RMS)
-    final rms = sqrt(sum / audioChunks.length);
-    final db = 20 * _log10(rms);
-    return db;
-  }
-
-  static double _log10(double x) => log(x) / log(10);
-}
+}
diff --git a/lib/src/core/utils/database_util.dart b/lib/src/core/utils/database_util.dart
@@ -71,8 +71,8 @@ class DatabaseUtil {
     await db.rawDelete("DELETE FROM $tableName WHERE id = ?", [id]);
   }
 
-// 앱이 종료되면, DB 자동으로 닫히지만,
-// 원할 때 종료하고 싶은 경우  사용됨.
+  // 앱이 종료되면, DB 자동으로 닫히지만,
+  // 원할 때 종료하고 싶은 경우  사용됨.
   Future close() async {
     final db = await database;