Skip to content

Commit

Permalink
Merge branch 'development' of https://github.com/Crazy-Marvin/FucksGiven
Browse files Browse the repository at this point in the history
 into development
  • Loading branch information
CrazyMarvin committed Jun 17, 2024
2 parents 7a8f847 + 0a046ff commit 652f1af
Show file tree
Hide file tree
Showing 11 changed files with 144 additions and 20 deletions.
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ jobs:
- name: "📥 Check-out"
uses: actions/checkout@v4
- name: "🧰 Install Java"
uses: actions/setup-java@v3
uses: actions/setup-java@v4
with:
java-version: "8"
- name: "🧰 Install Flutter"
Expand Down Expand Up @@ -44,7 +44,7 @@ jobs:
- name: "✅ Test"
run: flutter test --coverage
- name: "📤 Upload test coverage report"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Test coverage report"
path: coverage/lcov.info
Expand All @@ -55,12 +55,12 @@ jobs:
token: ${{secrets.CODECOV_TOKEN}}
file: coverage/lcov.info
- name: "📤 Upload Android App Bundle"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Android App Bundle"
path: build/app/outputs/bundle/release/app-release.aab
- name: "📤 Upload Android APK"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: "Android APK"
path: build/app/outputs/apk/release/app-release.apk
4 changes: 2 additions & 2 deletions .github/workflows/codacy-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:

# Execute Codacy Analysis CLI and generate a SARIF output with the security issues identified during the analysis
- name: Run Codacy Analysis CLI
uses: codacy/codacy-analysis-cli-action@v4.3.0
uses: codacy/codacy-analysis-cli-action@v4.4.1
with:
# Check https://github.com/codacy/codacy-analysis-cli#project-token to get your project token from your Codacy repository
# You can also omit the token and run the tools that support default configurations
Expand All @@ -44,6 +44,6 @@ jobs:

# Upload the SARIF file generated in the previous step
- name: Upload SARIF results file
uses: github/codeql-action/upload-sarif@v2
uses: github/codeql-action/upload-sarif@v3
with:
sarif_file: results.sarif
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
# Override language selection by uncommenting this and choosing your languages
# with:
# languages: go, javascript, csharp, python, cpp, java

# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl
Expand All @@ -46,4 +46,4 @@ jobs:
# make release

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
Binary file added .idea/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 0 additions & 5 deletions fastlane/metadata/android/en-US/changelogs/2.txt

This file was deleted.

2 changes: 0 additions & 2 deletions fastlane/metadata/android/en-US/changelogs/3.txt

This file was deleted.

4 changes: 2 additions & 2 deletions fastlane/metadata/android/en-US/full_description.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ Fucks Given lets you keep track of the things that made you care. Whenever somet

Fucks Given allows you to back up your data and has a beautiful dark mode that can turn on automatically, following the system theme.

Webpage: <a href="https://www.crazymarvin.com/fucks">https://www.crazymarvin.com/fucksgiven</a>
Translate To Don’t: <a href="https://hosted.weblate.org/engage/fucksgiven/">https://hosted.weblate.org/engage/fucksigven/</a>
Webpage: <a href="https://www.crazymarvin.com/fucks-given">https://www.crazymarvin.com/fucks-given</a>
Translate Fucks Given: <a href="https://hosted.weblate.org/engage/fucksgiven/">https://hosted.weblate.org/engage/fucksigven/</a>
Source on GitHub: <a href="https://github.com/Crazy-Marvin/FucksGiven">https://github.com/Crazy-Marvin/FucksGiven</a>
2 changes: 1 addition & 1 deletion fastlane/metadata/android/en-US/video.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://youtu.be/_UStlpEMVro

44 changes: 44 additions & 0 deletions lib/l10n/arb/app_fr.arb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"backUp": "Sauvegarder",
"@backUp": {},
"fucksGivenAppBarTitle": "Fucks Given",
"@fucksGivenAppBarTitle": {
"description": "Text shown in the AppBar of Fucks Given"
},
"appearance": "Apparence",
"@appearance": {
"description": "Text shown in the General Section of the Settings Page"
},
"light": "Clair",
"@light": {
"description": "Text shown in the AppBar of the Counter Page"
},
"data": "Données",
"@data": {
"description": "Subheading in the Settings Page"
},
"stats": "Statistiques",
"@stats": {
"description": "Text shown in the AppBar of the Stats Page"
},
"dark": "Sombre",
"@dark": {
"description": "Text shown in the appearance chooser"
},
"general": "Général",
"@general": {
"description": "Subheading in the Settings Page"
},
"settings": "Paramètres",
"@settings": {
"description": "Text shown in the AppBar of the Settings Page"
},
"followSystem": "Paramètre système",
"@followSystem": {
"description": "Text shown in the appearance chooser"
},
"restore": "Restaurer",
"@restore": {
"description": "Text shown in the Data Section of the Settings Page"
}
}
45 changes: 44 additions & 1 deletion lib/l10n/arb/app_nn.arb
Original file line number Diff line number Diff line change
@@ -1 +1,44 @@
{}
{
"fucksGivenAppBarTitle": "Fucks Given",
"@fucksGivenAppBarTitle": {
"description": "Text shown in the AppBar of Fucks Given"
},
"settings": "Innstillingar",
"@settings": {
"description": "Text shown in the AppBar of the Settings Page"
},
"general": "Generelt",
"@general": {
"description": "Subheading in the Settings Page"
},
"light": "Ljus",
"@light": {
"description": "Text shown in the AppBar of the Counter Page"
},
"dark": "Mørk",
"@dark": {
"description": "Text shown in the appearance chooser"
},
"stats": "Statistikk",
"@stats": {
"description": "Text shown in the AppBar of the Stats Page"
},
"appearance": "Utsjånad",
"@appearance": {
"description": "Text shown in the General Section of the Settings Page"
},
"followSystem": "System",
"@followSystem": {
"description": "Text shown in the appearance chooser"
},
"data": "Data",
"@data": {
"description": "Subheading in the Settings Page"
},
"backUp": "Tryggleikskopi",
"@backUp": {},
"restore": "Oppattrett",
"@restore": {
"description": "Text shown in the Data Section of the Settings Page"
}
}
44 changes: 44 additions & 0 deletions lib/l10n/arb/app_zh_Hans.arb
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
{
"settings": "设置",
"@settings": {
"description": "Text shown in the AppBar of the Settings Page"
},
"stats": "统计数据",
"@stats": {
"description": "Text shown in the AppBar of the Stats Page"
},
"general": "通用",
"@general": {
"description": "Subheading in the Settings Page"
},
"appearance": "外观",
"@appearance": {
"description": "Text shown in the General Section of the Settings Page"
},
"restore": "恢复",
"@restore": {
"description": "Text shown in the Data Section of the Settings Page"
},
"followSystem": "跟随系统",
"@followSystem": {
"description": "Text shown in the appearance chooser"
},
"dark": "深色",
"@dark": {
"description": "Text shown in the appearance chooser"
},
"light": "浅色",
"@light": {
"description": "Text shown in the AppBar of the Counter Page"
},
"data": "数据",
"@data": {
"description": "Subheading in the Settings Page"
},
"backUp": "备份",
"@backUp": {},
"fucksGivenAppBarTitle": "Fucks Given",
"@fucksGivenAppBarTitle": {
"description": "Text shown in the AppBar of Fucks Given"
}
}

0 comments on commit 652f1af

Please sign in to comment.