Skip to content

Commit

Permalink
Merge pull request #120 from refilc/dev
Browse files Browse the repository at this point in the history
dev to master (beta v5.0.1)
  • Loading branch information
kimaah committed Jun 13, 2024
2 parents 32abfe7 + a23b2d6 commit 7842aa4
Show file tree
Hide file tree
Showing 72 changed files with 2,848 additions and 603 deletions.
56 changes: 56 additions & 0 deletions Jenkinsfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
pipeline {
agent any

environment {
ANDROID_SDK = '/home/jenkins/flutter_things/android-sdk'
ANDROID_PATH="$ANDROID_SDK/tools:$ANDROID_SDK/platform-tools"
FLUTTER = '/home/jenkins/flutter_things/flutter/bin'
PATH = "$PATH:$ANDROID_PATH:$FLUTTER"
//TODO: need to fix flutter
}


stages {
stage('Copy Key Properties') {
steps {
// Copy the key.properties file
sh 'cp /home/jenkins/key.properties refilc/android/key.properties'
}
}

stage('Flutter Doctor') {
steps {
// Ensure Flutter is set up correctly
sh 'flutter doctor'
}
}

stage('Dependencies') {
steps {
// Get Flutter dependencies
sh 'cd refilc && flutter pub get'
}
}

stage('Build') {
steps {
// Build the Flutter project
sh 'cd refilc && flutter build apk --release'
}
}

stage('Archive') {
steps {
// Archive the APK
archiveArtifacts artifacts: 'build/app/outputs/flutter-apk/app-release.apk', fingerprint: true
}
}
}

post {
always {
// Clean up workspace after build
cleanWs()
}
}
}
4 changes: 2 additions & 2 deletions refilc/android/app/src/main/res/layout/timetable_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
android:gravity="center"
android:text="1."
android:textColor="@color/filc"
android:textColorLink="#ff3D7BF4"
android:textColorLink="#ff052460"
android:textSize="30sp"
android:textStyle="bold"
tools:ignore="HardcodedText" />
Expand Down Expand Up @@ -110,4 +110,4 @@
android:textColor="@color/white"
tools:ignore="HardcodedText" />

</RelativeLayout>
</RelativeLayout>
8 changes: 4 additions & 4 deletions refilc/android/app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<color name="yellow_light">#ffFFCC00</color>
<color name="light_yellow_light">#40FFD60A</color>
<color name="green_light">#ff34C759</color>
<color name="filc_light">#ff3D7BF4</color>
<color name="filc_light">#ff052460</color>
<color name="teal_light">#ff5AC8FA</color>
<color name="blue_light">#ff007AFF</color>
<color name="indigo_light">#ff5856D6</color>
Expand All @@ -49,8 +49,8 @@
<color name="yellow">#ffFFD60A</color>
<color name="light_yellow">#40FFD60A</color>
<color name="green">#ff32D74B</color>
<color name="filc">#ff3D7BF4</color>
<color name="filc_gradient">#ff3D93F5</color>
<color name="filc">#ff052460</color>
<color name="filc_gradient">#ff06348f</color>
<color name="teal">#ff64D2FF</color>
<color name="blue">#ff0A84FF</color>
<color name="indigo">#ff5E5CE6</color>
Expand All @@ -66,4 +66,4 @@
<color name="pink_shade300">#FFF06292</color>
<color name="purple_shade300">#FFBA68C8</color>
<color name="teal_shade300">#FF22AC9B</color>
</resources>
</resources>
43 changes: 43 additions & 0 deletions refilc/assets/svg/cover_arts/grid.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
27 changes: 27 additions & 0 deletions refilc/assets/svg/cover_arts/line.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
47 changes: 47 additions & 0 deletions refilc/assets/svg/cover_arts/plain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
28 changes: 28 additions & 0 deletions refilc/assets/svg/cover_arts/vocal.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
43 changes: 0 additions & 43 deletions refilc/assets/svg/mesh_bg.svg

This file was deleted.

Loading

0 comments on commit 7842aa4

Please sign in to comment.