Skip to content

Commit

Permalink
Merge branch 'dev' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
Gioele Bigini committed Nov 3, 2020
2 parents 08bfe1b + e56aaf8 commit 4730259
Show file tree
Hide file tree
Showing 50 changed files with 948 additions and 485 deletions.
50 changes: 0 additions & 50 deletions .github/workflows/main.yaml

This file was deleted.

9 changes: 0 additions & 9 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,7 @@
.packages
.pub-cache/
.pub/
<<<<<<< HEAD
/build/
=======
/build/*
!/build/app
/build/app/*
!/build/app/outputs
/build/app/outputs/*
!/build/app/outputs/apk
>>>>>>> dev
**/*.g.dart
/test/test_results/*

Expand Down
10 changes: 1 addition & 9 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
<<<<<<< HEAD
package="it.uniurb.balance_app">
=======
package="srl.digit.balance">
>>>>>>> dev
<!-- io.flutter.app.FlutterApplication is an android.app.Application that
calls FlutterMain.startInitialization(this); in its onCreate method.
In most cases you can leave this as-is, but you if you want to provide
Expand All @@ -12,12 +8,8 @@
<uses-permission android:name="android.permission.VIBRATE"/>
<application
android:name="io.flutter.app.FlutterApplication"
<<<<<<< HEAD
android:label="balance_app"
=======
android:label="Balance"
>>>>>>> dev
android:icon="@mipmap/ic_launcher_full_b"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher_full_b_round"
android:allowBackup="false">
<activity
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions assets/translations/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
"open_source_txt": "Open Source",
"about_balance_txt": "About Balance",
"version_txt": "Version",
"build_txt": "alpha.",
"made_with_heart_txt": "Made with ❤ from Italy",
"easter_egg_txt": "This is not an Easter Egg!!!",
"easter_egg_txt": "Keep clicking! The new release will come out faster!",
"empty_txt": "Nothing to show here!",
"error_txt": "Ops! Something went wrong",
"test_txt": "Test",
Expand Down Expand Up @@ -123,6 +124,6 @@
"intro_hearing_defects_title": "Hearing Defects",
"hearing_loss_hint": "hearing loss",
"about_balance_title": "About Balance",
"about_balance_msg": "Balance is an application developed by Lorenzo Calisti together with the University of Urbino \"Carlo Bo\" as a degree thesis for the Applied Computer Science course.\nThe primary purpose of Balance is to allow anyone to measure their posture in seconds using their smartphone.",
"about_balance_msg": "Balance is an effort of Computer Science researchers at the University of Urbino with the aim of providing a tool to measure your posture in a few seconds, with your smartphone.",
"cool_btn": "Cool!"
}
5 changes: 3 additions & 2 deletions assets/translations/it.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,9 @@
"open_source_txt": "Open Source",
"about_balance_txt": "Riguardo a Balance",
"version_txt": "Versione",
"build_txt": "alpha.",
"made_with_heart_txt": "Made with ❤ from Italy",
"easter_egg_txt": "Questo non è un Easter Egg!!!",
"easter_egg_txt": "Continua a cliccare! La nuova release uscirà più velocemente!",
"empty_txt": "Non c'è nulla da vedere qui!",
"error_txt": "Ops! Qualcosa è andato storto",
"test_txt": "Test",
Expand Down Expand Up @@ -123,6 +124,6 @@
"intro_hearing_defects_title": "Difetti Uditivi",
"hearing_loss_hint": "perdita d'udito",
"about_balance_title": "Riguardo a Balance",
"about_balance_msg": "Balance è un'applicazione sviluppata da Lorenzo Calisti assieme all'università di Urbino \"Carlo Bo\" come tesi di laurea del corso di Informatica Applicata.\nLo scopo primario di Balance è consentire a chiunque di misurare la propria postura in pochi secondi utilizzando il proprio smartphone.",
"about_balance_msg": "Balance nasce dallo sforzo dei ricercatori di Computer Science dell'Università di Urbino con l'obbiettivo di fornire uno strumento per misurare la propria postura in pochi secondi, con il proprio smartphone.",
"cool_btn": "Figo!"
}
Binary file modified build/app/outputs/apk/release/app-release.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion build/app/outputs/apk/release/output.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":1,"versionName":"0.0.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
[{"outputType":{"type":"APK"},"apkData":{"type":"MAIN","splits":[],"versionCode":2,"versionName":"1.0.0","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
2 changes: 1 addition & 1 deletion ios/Flutter/.last_build_id
Original file line number Diff line number Diff line change
@@ -1 +1 @@
d8bbc2e3dc8deba4337c1e6d62689282
ebf1c76e8c544bab01d22470b13b4eea
18 changes: 12 additions & 6 deletions ios/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,22 @@ PODS:
- Flutter
- path_provider (0.0.1):
- Flutter
- sensors (0.0.1):
- Flutter
- shared_preferences (0.0.1):
- Flutter
- sqflite (0.0.1):
- sqflite (0.0.2):
- Flutter
- FMDB (~> 2.7.2)
- vibration (1.2.4):
- FMDB (>= 2.7.5)
- vibration (1.7.1):
- Flutter

DEPENDENCIES:
- audioplayers (from `.symlinks/plugins/audioplayers/ios`)
- Flutter (from `Flutter`)
- package_info (from `.symlinks/plugins/package_info/ios`)
- path_provider (from `.symlinks/plugins/path_provider/ios`)
- sensors (from `.symlinks/plugins/sensors/ios`)
- shared_preferences (from `.symlinks/plugins/shared_preferences/ios`)
- sqflite (from `.symlinks/plugins/sqflite/ios`)
- vibration (from `.symlinks/plugins/vibration/ios`)
Expand All @@ -39,6 +42,8 @@ EXTERNAL SOURCES:
:path: ".symlinks/plugins/package_info/ios"
path_provider:
:path: ".symlinks/plugins/path_provider/ios"
sensors:
:path: ".symlinks/plugins/sensors/ios"
shared_preferences:
:path: ".symlinks/plugins/shared_preferences/ios"
sqflite:
Expand All @@ -52,10 +57,11 @@ SPEC CHECKSUMS:
FMDB: 2ce00b547f966261cd18927a3ddb07cb6f3db82a
package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
path_provider: abfe2b5c733d04e238b0d8691db0cfd63a27a93c
sensors: 84eb7a30e47a649e4172b71d6e81be614c280336
shared_preferences: af6bfa751691cdc24be3045c43ec037377ada40d
sqflite: 4001a31ff81d210346b500c55b17f4d6c7589dd0
vibration: f0c5bb486671fb81e973bfb451d89f8efd07c9c9
sqflite: 6d358c025f5b867b29ed92fc697fd34924e11904
vibration: 4f4ded27b9d0e21e4110ca43978f057412d28c44

PODFILE CHECKSUM: aafe91acc616949ddb318b77800a7f51bffa2a4c

COCOAPODS: 1.9.3
COCOAPODS: 1.10.0
Loading

0 comments on commit 4730259

Please sign in to comment.