Skip to content

Commit

Permalink
Merge branch 'develop' into refactor/exams-page
Browse files Browse the repository at this point in the history
  • Loading branch information
rubuy-74 authored Jul 27, 2023
2 parents e26bd39 + 2c0c1b9 commit 9949e17
Show file tree
Hide file tree
Showing 154 changed files with 3,305 additions and 2,317 deletions.
9 changes: 5 additions & 4 deletions .github/workflows/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,11 @@ jobs:
working-directory: ./uni
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v1
- uses: actions/setup-java@v3
with:
java-version: ${{env.JAVA_VERSION}}
- uses: subosito/flutter-action@v1
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}

Expand Down Expand Up @@ -77,7 +78,7 @@ jobs:
flutter build appbundle
- name: Upload App Bundle
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: appbundle
if-no-files-found: error
Expand All @@ -90,7 +91,7 @@ jobs:
steps:
- uses: actions/checkout@v3
- name: Get App Bundle
uses: actions/download-artifact@v2
uses: actions/download-artifact@v3
with:
name: appbundle

Expand Down
65 changes: 65 additions & 0 deletions .github/workflows/format_lint_test.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
on: pull_request

env:
FLUTTER_VERSION: 3.7.2
JAVA_VERSION: 11.x

jobs:
format:
name: 'Format'
runs-on: ubuntu-latest
defaults:
run:
working-directory: ./uni
steps:
- uses: actions/checkout@v3
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}

- run: dart format . --set-exit-if-changed

lint:
name: 'Lint'
runs-on: ubuntu-latest
needs: format
defaults:
run:
working-directory: ./uni
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}

- name: Cache pub dependencies
uses: actions/cache@v3
with:
path: ${{ env.FLUTTER_HOME }}/.pub-cache
key: ${{ runner.os }}-pub-${{ github.ref }}-${{ hashFiles('**/pubspec.lock') }}
restore-keys: ${{ runner.os }}-pub-${{ github.ref }}-

- run: flutter analyze .

test:
name: 'Test'
runs-on: ubuntu-latest
needs: lint
defaults:
run:
working-directory: ./uni
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
with:
java-version: ${{ env.JAVA_VERSION }}
distribution: 'zulu'
- uses: subosito/flutter-action@v2
with:
flutter-version: ${{ env.FLUTTER_VERSION }}

- run: flutter test --no-sound-null-safety
45 changes: 0 additions & 45 deletions .github/workflows/test_lint.yaml

This file was deleted.

8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<br>
<br>

[![Build badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/project-schrodinger/test_lint.yaml?style=for-the-badge)](https://github.com/NIAEFEUP/project-schrodinger/actions)
[![Deploy badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/project-schrodinger/deploy.yaml?label=Deploy&style=for-the-badge)](https://github.com/NIAEFEUP/project-schrodinger/actions)
[![License badge](https://img.shields.io/github/license/NIAEFEUP/project-schrodinger?style=for-the-badge)](https://github.com/NIAEFEUP/project-schrodinger/blob/master/LICENSE)
[![Build badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/format_lint_test.yaml?style=for-the-badge)](https://github.com/NIAEFEUP/uni/actions)
[![Deploy badge](https://img.shields.io/github/actions/workflow/status/NIAEFEUP/uni/deploy.yaml?label=Deploy&style=for-the-badge)](https://github.com/NIAEFEUP/uni/actions)
[![License badge](https://img.shields.io/github/license/NIAEFEUP/uni?style=for-the-badge)](https://github.com/NIAEFEUP/uni/blob/develop/LICENSE)

<a href='https://play.google.com/store/apps/details?id=pt.up.fe.ni.uni&hl=pt_PT&gl=US&pli=1&pcampaignid=pcampaignidMKT-Other-global-all-co-prtnr-py-PartBadge-Mar2515-1'><img style="width: 135px;" alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/static/images/badges/en_badge_web_generic.png'/></a>

Expand All @@ -31,4 +31,4 @@ This application is licensed under the [GNU General Public License v3.0](./LICEN

Contributions are welcome, and can be made by opening a pull request. Please note, however, that a university's account is required to access most of the app's features.

For further information about the project structure, please refer to [the app's README file](./uni/README.md).
For further information about the project structure, please refer to [the app's README file](./uni/README.md).
1 change: 1 addition & 0 deletions uni/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
.history
.svn/
assets/env/env.json
*.env

# IntelliJ related
*.iml
Expand Down
4 changes: 2 additions & 2 deletions uni/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ if (keystorePropertiesFile.exists()) {
}

android {
compileSdkVersion 33
compileSdkVersion 33
ndkVersion flutter.ndkVersion

compileOptions {
Expand All @@ -52,7 +52,7 @@ android {
applicationId "pt.up.fe.ni.uni"
// You can update the following values to match your application needs.
// For more information, see: https://docs.flutter.dev/deployment/android#reviewing-the-build-configuration.
minSdkVersion flutter.minSdkVersion
minSdkVersion 21 // default is flutter.minSdkVersion
targetSdkVersion flutter.targetSdkVersion
versionCode flutterVersionCode.toInteger()
versionName flutterVersionName
Expand Down
8 changes: 5 additions & 3 deletions uni/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
buildscript {
ext.kotlin_version = '1.7.21'
ext.android_plugin_version = '7.2.0'

repositories {
google()
mavenCentral()
}

dependencies {
classpath 'com.android.tools.build:gradle:7.4.2'
classpath "com.android.tools.build:gradle:$android_plugin_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -26,6 +28,6 @@ subprojects {
project.evaluationDependsOn(':app')
}

task clean(type: Delete) {
tasks.register("clean", Delete) {
delete rootProject.buildDir
}
}
2 changes: 1 addition & 1 deletion uni/app_version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.5.20+138
1.5.43+161
Empty file removed uni/assets/env/.empty
Empty file.
3 changes: 3 additions & 0 deletions uni/assets/env/.env.template
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
## GITHUB TOKEN
## For sending bugs and suggestions to github
GH_TOKEN=
Binary file added uni/assets/images/bus.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
15 changes: 15 additions & 0 deletions uni/assets/images/logo_ni.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
53 changes: 0 additions & 53 deletions uni/assets/images/logo_ni_original.svg

This file was deleted.

58 changes: 0 additions & 58 deletions uni/assets/images/ni_logo.svg

This file was deleted.

Loading

0 comments on commit 9949e17

Please sign in to comment.