Skip to content

Commit

Permalink
Merge pull request #47 from FEUP-ESOF-2020-21/dev
Browse files Browse the repository at this point in the history
End of Iteration 3
  • Loading branch information
joaorenatopinto authored Dec 11, 2020
2 parents 52affef + d3a7ba1 commit ca20f46
Show file tree
Hide file tree
Showing 40 changed files with 2,107 additions and 372 deletions.
48 changes: 47 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,50 @@ use_cases.drawio
src/netfair/build
src/netfair/android
src/netfair/ios
src/netfair/.idea
src/netfair/.idea



# Miscellaneous
*.class
*.log
*.pyc
*.swp
.DS_Store
.atom/
.buildlog/
.history
.svn/

# IntelliJ related
*.iml
*.ipr
*.iws
.idea/

# The .vscode folder contains launch configuration and tasks you configure in
# VS Code which you may wish to be included in version control, so this line
# is commented out by default.
#.vscode/

# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
src/netfair/.dart_tool/
src/netfair/.flutter-plugins
src/netfair/.flutter-plugins-dependencies
src/netfair/.packages
src/netfair/.pub-cache/
src/netfair/.pub/
src/netfair/build/

.gradle/
local.properties
# Web related
lib/generated_plugin_registrant.dart

# Symbolication related
app.*.symbols

# Obfuscation related
app.*.map.json
146 changes: 0 additions & 146 deletions src/netfair/.dart_tool/package_config.json

This file was deleted.

4 changes: 3 additions & 1 deletion src/netfair/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,16 @@
# Flutter/Dart/Pub related
**/doc/api/
**/ios/Flutter/.last_build_id
.dart_tool/
.dart_tool
.flutter-plugins
.flutter-plugins-dependencies
.packages
.pub-cache/
.pub/
/build/

.gradle/
local.properties
# Web related
lib/generated_plugin_registrant.dart

Expand Down
24 changes: 0 additions & 24 deletions src/netfair/.packages

This file was deleted.

7 changes: 6 additions & 1 deletion src/netfair/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ if (flutterVersionName == null) {
}

apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'
apply plugin: 'kotlin-android'
apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle"

Expand All @@ -38,7 +39,7 @@ android {

defaultConfig {
// TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
applicationId "com.example.netfair"
applicationId "pt.up.fe.netfair"
minSdkVersion 16
targetSdkVersion 29
versionCode flutterVersionCode.toInteger()
Expand All @@ -60,4 +61,8 @@ flutter {

dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation platform('com.google.firebase:firebase-bom:26.1.1')
implementation platform('com.google.firebase:firebase-bom:26.1.0')
implementation 'com.google.firebase:firebase-analytics'
implementation 'com.google.firebase:firebase-database-ktx'
}
39 changes: 39 additions & 0 deletions src/netfair/android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"project_info": {
"project_number": "946216919066",
"project_id": "netfair-8487c",
"storage_bucket": "netfair-8487c.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:946216919066:android:20371ba5d10684c51a71a3",
"android_client_info": {
"package_name": "pt.up.fe.netfair"
}
},
"oauth_client": [
{
"client_id": "946216919066-9bkh46tdv642poihktpaqt5h3vh3fpuj.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCCcur2AIl0HRj2efn_I5BuKUQ2AV-0IwI"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "946216919066-9bkh46tdv642poihktpaqt5h3vh3fpuj.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
3 changes: 3 additions & 0 deletions src/netfair/android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@ buildscript {
repositories {
google()
jcenter()
google() // Google's Maven repository
}

dependencies {
classpath 'com.android.tools.build:gradle:3.5.0'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath 'com.google.gms:google-services:4.3.4'
}
}

allprojects {
repositories {
google()
jcenter()
google() // Google's Maven repository
}
}

Expand Down
Binary file added src/netfair/assets/fonts/Comfortaa-Bold.ttf
Binary file not shown.
Binary file added src/netfair/assets/fonts/Comfortaa-Light.ttf
Binary file not shown.
Binary file added src/netfair/assets/fonts/Comfortaa-Medium.ttf
Binary file not shown.
Binary file added src/netfair/assets/fonts/Comfortaa-Regular.ttf
Binary file not shown.
Binary file added src/netfair/assets/fonts/Comfortaa-SemiBold.ttf
Binary file not shown.
Binary file not shown.
File renamed without changes
Binary file added src/netfair/assets/img/app_logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
Binary file added src/netfair/assets/img/events/feupcarrerfair.jpg
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 src/netfair/assets/img/users/terryCrews.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit ca20f46

Please sign in to comment.