Skip to content
This repository has been archived by the owner on Apr 21, 2022. It is now read-only.

Commit

Permalink
1.0.305
Browse files Browse the repository at this point in the history
  • Loading branch information
leomotors committed Mar 3, 2022
1 parent ec5679c commit 33ba1b1
Show file tree
Hide file tree
Showing 39 changed files with 199 additions and 195 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
docs/* linguist-documentation=false
android/**/* linguist-generated=true
ios/**/* linguist-generated=true
web/**/* linguist-generated=true
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed assets/images/grab/delicious.jpeg
Binary file not shown.
Binary file removed assets/images/grab/grab_1.png
Binary file not shown.
Binary file removed assets/images/grab/grab_2.jpeg
Binary file not shown.
Binary file modified assets/images/motorcycle.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/images/somwua_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
38 changes: 35 additions & 3 deletions docs/manual.tex
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
\author{Nutthapat Pongtanyavichai, Developer of Food Busters}

\maketitle
\centerline{\LARGE{Manual for App Version: 1.0.304}}
\centerline{\LARGE{Manual for App Version: 1.0.305}}

\tableofcontents

Expand All @@ -22,7 +22,7 @@ \section{Disclaimer}
and test that concept with real users for feedbacks. Some features are not properly implemented yet, thus this prototype is only capable of showing UIs with some logic flows.
We will go along each features in this manual.

This manual is for App Version 1.0.304. Just in case that newer version (bug fixes) may
This manual is for App Version 1.0.305. Just in case that newer version (bug fixes) may
have released, please check \href{https://github.com/Food-Busters/food_busters/releases}{HERE}

You can check the version of installed app by clicking \textit{info icon}
Expand All @@ -34,12 +34,15 @@ \section{Installation}
Current version of this prototype app only supports \textbf{Android}. Due to
limitation given by Apple, we are unable to test this app on iOS or distribute.

However, you can still access the prototype app via \textbf{your web browser},
we will talk about this in next sections.

This prototype app is supported by Android 5 or any newer generations.
However, I recommend using Android 11 or later.
I need to inform you that we does not have many devices to do the testing.
We are sorry if the app doesn't work as intended for you.

\section*{Download the App}
\section*{Download the Android App (APK)}

\noindent
\begin{simplechar}
Expand Down Expand Up @@ -68,6 +71,35 @@ \section*{Compatibility Test Result}
\item Samsung Galaxy Tab S6 (Android 11) - WORKING AS INTENDED
\end{itemize}

\section*{Access Prototype App via Web}

If possible we would like you to install our Android App for best experience.

However, if you do not use Android or found issues installing,
you can visit the Web App Version here => \href{https://food-busters-web.vercel.app}{
https://food-busters-web.vercel.app}

\textbf{
Please note that our app is not optimized for web, there may be some unexpected error,
this is temporary for who that doesn't use Android. Will be removed in the future.}

\section*{Known Issues for Web}
\begin{itemize}
\item Some Image Assets are not displayed properly (Blocked by CORS)
\item Camera may be a bit laggy but it works
\end{itemize}

\noindent
Test Browser and Results:
\begin{itemize}
\item Microsoft Edge 98 (Windows 11) - WORKING AS INTENDED
\item Samsung Internet 16 (Android 12) - WORKING AS INTENDED
\item Google Chrome 99 (Android 12) - WORKING AS INTENDED
\end{itemize}

\noindent
\textit{Note:} WORKING AS INTENDED means it worked as expected with above known Issues.

% * SECTION 3
\section{Login \& Register}

Expand Down
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified ios/Runner/Assets.xcassets/AppIcon.appiconset/[email protected]
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
65 changes: 0 additions & 65 deletions lib/views/grab/grab.dart

This file was deleted.

86 changes: 0 additions & 86 deletions lib/views/grab/grab_info.dart

This file was deleted.

17 changes: 14 additions & 3 deletions lib/views/home.dart
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import "package:flutter/material.dart";
import "package:flutter/foundation.dart" show kIsWeb;
import "package:food_busters/components/background.dart";
import "package:food_busters/main.dart";
import "package:food_busters/styles/styles.dart";
Expand All @@ -11,6 +12,11 @@ import "package:food_busters/views/settings.dart";
import "package:package_info_plus/package_info_plus.dart";
import "package:flutter_gen/gen_l10n/app_localizations.dart";

const webAppWarn =
"This app is not optimized for web, there may be some unexpected error, "
"this is temporary for who that doesn't use Android. "
"Will be removed in the future.";

class HomePage extends StatefulWidget {
const HomePage({Key? key, required this.username}) : super(key: key);

Expand Down Expand Up @@ -48,14 +54,13 @@ class _HomePageState extends State<HomePage> {
icon: const Icon(Icons.info),
onPressed: () async {
PackageInfo packageInfo = await PackageInfo.fromPlatform();
String appName = packageInfo.appName;
String version = packageInfo.version;
showAboutDialog(
context: context,
applicationName: appName,
applicationName: "Food Busters",
applicationVersion: version,
applicationIcon: Image.asset(
"assets/images/logo_white.jpg",
"assets/images/somwua_icon.png",
height: 80,
),
children: [
Expand Down Expand Up @@ -107,6 +112,12 @@ class _HomePageState extends State<HomePage> {
text.have_a_nice_meal,
style: const TextStyle(fontSize: 16),
),
kIsWeb
? Text(
webAppWarn,
style: TextStyle(color: Colors.red[400]),
)
: Container(),
],
),
),
Expand Down
8 changes: 7 additions & 1 deletion lib/views/scan/scanafter.dart
Original file line number Diff line number Diff line change
Expand Up @@ -50,10 +50,16 @@ class _ScanAfterPageState extends State<ScanAfterPage> {
final url = Uri.parse(
"https://food-waste-quotes.vercel.app/api/quote?percent=$percent&lang=${MyApp.of(context).localeStrSimp}",
);
final response = await http.get(url);

foodData = await getChickenRiceData();

http.Response response;
try {
response = await http.get(url);
} catch (err) {
return Quote(quote: "$err");
}

if (response.statusCode >= 400) {
return Quote(quote: "${response.statusCode} ${response.body}");
} else {
Expand Down
19 changes: 2 additions & 17 deletions lib/views/settings.dart
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import "package:flutter_toggle_tab/flutter_toggle_tab.dart";
import "package:food_busters/main.dart";
import "package:food_busters/models/app_state.dart";
import "package:food_busters/styles/styles.dart";
import "package:food_busters/views/grab/grab.dart";
import "package:food_busters/views/login.dart";

class SettingsPage extends StatefulWidget {
Expand Down Expand Up @@ -88,7 +87,8 @@ class _SettingsPageState extends State<SettingsPage> {
),
const ListTile(
title: Text(
"This is placeholder settings, controls the output of mocked AI",
"This is placeholder settings, controls the output of mocked AI. "
"(Real AI coming soon!)",
),
),
FlutterToggleTab(
Expand Down Expand Up @@ -135,21 +135,6 @@ class _SettingsPageState extends State<SettingsPage> {
style: ElevatedButton.styleFrom(primary: lightGreen),
),
),
ListTile(
title: const Text(
"Grab Integration Test",
textAlign: TextAlign.center,
style: bold,
),
onTap: () {
Navigator.push(
context,
MaterialPageRoute(
builder: (context) => const GrabPage(),
),
);
},
),
],
),
);
Expand Down
19 changes: 6 additions & 13 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ packages:
name: camera
url: "https://pub.dartlang.org"
source: hosted
version: "0.9.4+11"
version: "0.9.4+14"
camera_platform_interface:
dependency: transitive
description:
Expand All @@ -44,12 +44,12 @@ packages:
source: hosted
version: "2.1.5"
camera_web:
dependency: transitive
dependency: "direct main"
description:
name: camera_web
url: "https://pub.dartlang.org"
source: hosted
version: "0.2.1+2"
version: "0.2.1+3"
characters:
dependency: transitive
description:
Expand Down Expand Up @@ -244,7 +244,7 @@ packages:
name: package_info_plus
url: "https://pub.dartlang.org"
source: hosted
version: "1.3.0"
version: "1.4.0"
package_info_plus_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -287,13 +287,6 @@ packages:
url: "https://pub.dartlang.org"
source: hosted
version: "1.8.0"
pedantic:
dependency: transitive
description:
name: pedantic
url: "https://pub.dartlang.org"
source: hosted
version: "1.11.1"
petitparser:
dependency: transitive
description:
Expand Down Expand Up @@ -328,7 +321,7 @@ packages:
name: share_plus
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.4"
version: "3.1.0"
share_plus_linux:
dependency: transitive
description:
Expand Down Expand Up @@ -417,7 +410,7 @@ packages:
name: table_calendar
url: "https://pub.dartlang.org"
source: hosted
version: "3.0.3"
version: "3.0.4"
term_glyph:
dependency: transitive
description:
Expand Down
Loading

0 comments on commit 33ba1b1

Please sign in to comment.