Skip to content

Commit

Permalink
Merge branch 'develop' into l10n_develop
Browse files Browse the repository at this point in the history
  • Loading branch information
CodeDoctorDE committed Nov 3, 2024
2 parents cec3a8b + 7452c04 commit e21b2f4
Show file tree
Hide file tree
Showing 86 changed files with 2,394 additions and 78 deletions.
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,16 +4,16 @@

> **The app is in development and not ready for production use. Click [here](https://linwood.dev/flow) to read the devlogs.**
# Linwood Flow
# Flow

> Free, opensource time and event management software
[![Latest release)](https://img.shields.io/github/v/release/LinwoodDev/Flow?color=7C4DFF&style=for-the-badge&logo=github&logoColor=7C4DFF)](https://github.com/LinwoodDev/Flow/releases)
[![GitHub License badge](https://img.shields.io/github/license/LinwoodDev/Flow?color=7C4DFF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiBmaWxsPSIjN2M0ZGZmIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiI%2BPHJlY3Qgd2lkdGg9IjI1NiIgaGVpZ2h0PSIyNTYiIGZpbGw9Im5vbmUiPjwvcmVjdD48cmVjdCB4PSIzMiIgeT0iNDgiIHdpZHRoPSIxOTIiIGhlaWdodD0iMTYwIiByeD0iOCIgc3Ryb2tlLXdpZHRoPSIxNiIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIGZpbGw9Im5vbmUiPjwvcmVjdD48bGluZSB4MT0iNzYiIHkxPSI5NiIgeDI9IjE4MCIgeTI9Ijk2IiBmaWxsPSJub25lIiBzdHJva2U9IiM3YzRkZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIxNiI%2BPC9saW5lPjxsaW5lIHgxPSI3NiIgeTE9IjEyOCIgeDI9IjE4MCIgeTI9IjEyOCIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMTYiPjwvbGluZT48bGluZSB4MT0iNzYiIHkxPSIxNjAiIHgyPSIxODAiIHkyPSIxNjAiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzdjNGRmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjE2Ij48L2xpbmU%2BPC9zdmc%2B)](https://github.com/LinwoodDev/Flow/blob/main/LICENSE)
[![GitHub Repo stars](https://img.shields.io/github/stars/LinwoodDev/Flow?color=7C4DFF&logo=github&logoColor=7C4DFF&style=for-the-badge)](https://github.com/LinwoodDev/Flow)
[![Matrix badge](https://img.shields.io/matrix/linwood:matrix.org?style=for-the-badge&color=7C4DFF&logo=matrix&logoColor=7C4DFF&label=Matrix)](https://linwood.dev/matrix)
[![Discord badge](https://img.shields.io/discord/735424757142519848?style=for-the-badge&color=7C4DFF&logo=discord&logoColor=7C4DFF&label=Discord)](https://discord.linwood.dev)
[![Download](https://img.shields.io/github/downloads/LinwoodDev/Flow/total?color=7C4DFF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxOTIiIGhlaWdodD0iMTkyIiBmaWxsPSIjN2M0ZGZmIiB2aWV3Qm94PSIwIDAgMjU2IDI1NiI%2BPHJlY3Qgd2lkdGg9IjI1NiIgaGVpZ2h0PSIyNTYiIGZpbGw9Im5vbmUiPjwvcmVjdD48cG9seWxpbmUgcG9pbnRzPSI4NiAxMTAuMDExIDEyOCAxNTIgMTcwIDExMC4wMTEiIGZpbGw9Im5vbmUiIHN0cm9rZT0iIzdjNGRmZiIgc3Ryb2tlLWxpbmVjYXA9InJvdW5kIiBzdHJva2UtbGluZWpvaW49InJvdW5kIiBzdHJva2Utd2lkdGg9IjE2Ij48L3BvbHlsaW5lPjxsaW5lIHgxPSIxMjgiIHkxPSI0MCIgeDI9IjEyOCIgeTI9IjE1MS45NzA1NyIgZmlsbD0ibm9uZSIgc3Ryb2tlPSIjN2M0ZGZmIiBzdHJva2UtbGluZWNhcD0icm91bmQiIHN0cm9rZS1saW5lam9pbj0icm91bmQiIHN0cm9rZS13aWR0aD0iMTYiPjwvbGluZT48cGF0aCBkPSJNMjE2LDE1MnY1NmE4LDgsMCwwLDEtOCw4SDQ4YTgsOCwwLDAsMS04LThWMTUyIiBmaWxsPSJub25lIiBzdHJva2U9IiM3YzRkZmYiIHN0cm9rZS1saW5lY2FwPSJyb3VuZCIgc3Ryb2tlLWxpbmVqb2luPSJyb3VuZCIgc3Ryb2tlLXdpZHRoPSIxNiI%2BPC9wYXRoPjwvc3ZnPg%3D%3D)](https://docs.flow.linwood.dev/downloads)
[![Latest release)](https://img.shields.io/github/v/release/LinwoodDev/Flow?color=35CDEF&style=for-the-badge&logo=github&logoColor=35CDEF)](https://github.com/LinwoodDev/Flow/releases)
[![GitHub License badge](https://img.shields.io/github/license/LinwoodDev/Flow?color=35CDEF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzM1Y2RlZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMTYsNDBINDBBMTYsMTYsMCwwLDAsMjQsNTZWMjAwYTE2LDE2LDAsMCwwLDE2LDE2SDIxNmExNiwxNiwwLDAsMCwxNi0xNlY1NkExNiwxNiwwLDAsMCwyMTYsNDBabTAsMTYwSDQwVjU2SDIxNlYyMDBaTTE4NCw5NmE4LDgsMCwwLDEtOCw4SDgwYTgsOCwwLDAsMSwwLTE2aDk2QTgsOCwwLDAsMSwxODQsOTZabTAsMzJhOCw4LDAsMCwxLTgsOEg4MGE4LDgsMCwwLDEsMC0xNmg5NkE4LDgsMCwwLDEsMTg0LDEyOFptMCwzMmE4LDgsMCwwLDEtOCw4SDgwYTgsOCwwLDAsMSwwLTE2aDk2QTgsOCwwLDAsMSwxODQsMTYwWiI%2BPC9wYXRoPjwvc3ZnPg%3D%3D)](https://github.com/LinwoodDev/Flow/blob/main/LICENSE)
[![GitHub Repo stars](https://img.shields.io/github/stars/LinwoodDev/Flow?color=35CDEF&logo=github&logoColor=35CDEF&style=for-the-badge)](https://github.com/LinwoodDev/Flow)
[![Matrix badge](https://img.shields.io/matrix/linwood:matrix.org?style=for-the-badge&color=35CDEF&logo=matrix&logoColor=35CDEF&label=Matrix)](https://linwood.dev/matrix)
[![Discord badge](https://img.shields.io/discord/735424757142519848?style=for-the-badge&color=35CDEF&logo=discord&logoColor=35CDEF&label=Discord)](https://discord.linwood.dev)
[![Download](https://img.shields.io/github/downloads/LinwoodDev/Flow/total?color=35CDEF&style=for-the-badge&logo=data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIzMiIgaGVpZ2h0PSIzMiIgZmlsbD0iIzM1Y2RlZiIgdmlld0JveD0iMCAwIDI1NiAyNTYiPjxwYXRoIGQ9Ik0yMjQsMTQ0djY0YTgsOCwwLDAsMS04LDhINDBhOCw4LDAsMCwxLTgtOFYxNDRhOCw4LDAsMCwxLDE2LDB2NTZIMjA4VjE0NGE4LDgsMCwwLDEsMTYsMFptLTEwMS42Niw1LjY2YTgsOCwwLDAsMCwxMS4zMiwwbDQwLTQwYTgsOCwwLDAsMC0xMS4zMi0xMS4zMkwxMzYsMTI0LjY5VjMyYTgsOCwwLDAsMC0xNiwwdjkyLjY5TDkzLjY2LDk4LjM0YTgsOCwwLDAsMC0xMS4zMiwxMS4zMloiPjwvcGF0aD48L3N2Zz4%3D)](https://docs.flow.linwood.dev/downloads)

</div>

Expand All @@ -33,7 +33,7 @@ Linwood Flow is a free, opensource time and event management software. You can c

## Features

* **⚡ Simple and intuitive:** Every tool is in the right place. Open the app and start managing your time. Invite people to your events and share your calendar with them.
* **⚡ Simple and intuitive:** Every tool is in the right place. Open the app and start managing your time.
* **📝 Support your favorite formats:** Import and export your old notes and events. Set the app as your default calendar app and use it with your favorite apps.
* **📱 Works on every device:** The app is available for android, windows, linux, and in the web. You can use it on your phone, tablet, or computer.
* **💻 Choose where your data is stored:** You can choose to store your data locally, in your favorite cloud (caldav) or decentralized using S5. You can also export your data to a file and import it again.
Expand Down
2 changes: 1 addition & 1 deletion app/android/Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ GEM
artifactory (3.0.17)
atomos (0.1.3)
aws-eventstream (1.3.0)
aws-partitions (1.1000.0)
aws-partitions (1.1001.0)
aws-sdk-core (3.211.0)
aws-eventstream (~> 1, >= 1.3.0)
aws-partitions (~> 1, >= 1.992.0)
Expand Down
8 changes: 4 additions & 4 deletions app/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ flutter {

dependencies {
testImplementation 'junit:junit:5.8.2'
testImplementation "com.google.truth:truth:1.1.3"
androidTestImplementation 'androidx.test:runner:1.5.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
api 'androidx.test:core:1.5.0'
testImplementation "com.google.truth:truth:1.4.4"
androidTestImplementation 'androidx.test:runner:1.6.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
api 'androidx.test:core:1.6.1'
androidTestImplementation 'tools.fastlane:screengrab:2.1.1'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
android:pathData="M0,0h64v64h-64z"/>
<path
android:pathData="M3,1L61,1A2,2 0,0 1,63 3L63,61A2,2 0,0 1,61 63L3,63A2,2 0,0 1,1 61L1,3A2,2 0,0 1,3 1z"
android:fillColor="#7C4DFF"/>
android:fillColor="#35CDEF"/>
<path
android:pathData="M7,6L17,6A1,1 0,0 1,18 7L18,17A1,1 0,0 1,17 18L7,18A1,1 0,0 1,6 17L6,7A1,1 0,0 1,7 6z"
android:fillColor="#ffffff"/>
Expand Down
2 changes: 1 addition & 1 deletion app/android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
buildscript {
ext.kotlin_version = '1.9.23'
ext.kotlin_version = '2.0.21'
repositories {
google()
mavenCentral()
Expand Down
2 changes: 1 addition & 1 deletion app/android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionSha256Sum=d725d707bfabd4dfdc958c624003b3c80accc03f7037b5122c4b1d0ef15cecab
2 changes: 1 addition & 1 deletion app/lib/pages/calendar/month.dart
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ class _CalendarMonthViewState extends State<CalendarMonthView> {
});
}
final current = index - 7;
final day = _date.addDays(current - 7);
final day = _date.addDays(current);
return InkWell(
onTap: () async {
await showDialog(
Expand Down
2 changes: 1 addition & 1 deletion app/lib/theme.dart
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import 'package:flutter/material.dart';

import 'main.dart';

const kClassicThemePrimary = isNightly ? Color(0xFF6877FD) : Color(0xFFA28DDB);
const kClassicThemePrimary = isNightly ? Color(0xFF35CDEF) : Color(0xFF35CDEF);
const kClassicThemeSecondary = Color(0xFF35EF53);
const kClassicTheme = FlexSchemeColor(
primary: kClassicThemePrimary, secondary: kClassicThemeSecondary);
Expand Down
4 changes: 3 additions & 1 deletion app/lib/widgets/navigation.dart
Original file line number Diff line number Diff line change
Expand Up @@ -264,10 +264,12 @@ class _FlowDrawer extends StatelessWidget {
padding: const EdgeInsets.only(left: 8.0),
child: Image.asset(
isNightly ? "images/logo.png" : "images/logo.png",
height: 64,
width: 64,
),
),
toolbarHeight: kAppBarHeight,
leadingWidth: 32,
leadingWidth: 42,
title: const Text(
shortApplicationName,
textAlign: TextAlign.center,
Expand Down
4 changes: 2 additions & 2 deletions app/pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1333,10 +1333,10 @@ packages:
dependency: transitive
description:
name: win32
sha256: "10169d3934549017f0ae278ccb07f828f9d6ea21573bab0fb77b0e1ef0fce454"
sha256: "84ba388638ed7a8cb3445a320c8273136ab2631cd5f2c57888335504ddab1bc2"
url: "https://pub.dev"
source: hosted
version: "5.7.2"
version: "5.8.0"
window_manager:
dependency: "direct main"
description:
Expand Down
183 changes: 178 additions & 5 deletions docs/astro.config.mjs
Original file line number Diff line number Diff line change
@@ -1,24 +1,197 @@
// @ts-check
import { defineConfig } from "astro/config";
import { getSidebarTranslatedLabel } from "./src/translations";
import starlight from "@astrojs/starlight";

// https://astro.build/config
export default defineConfig({
integrations: [
starlight({
title: "My Docs",
title: "Linwood Flow",
customCss: [
// Relative path to your custom CSS file
"./src/styles/custom.css",
],
logo: {
src: "./public/img/docs.svg",
},
favicon: "./favicon.ico",
social: {
github: "https://github.com/withastro/starlight",
mastodon: "https://floss.social/@linwood",
matrix: "https://linwood.dev/matrix",
discord: "https://linwood.dev/discord",
github: "https://github.com/LinwoodDev/Flow",
},
components: {
SocialIcons: "./src/components/CustomSocialIcons.astro",
Head: "./src/components/Head.astro",
Footer: "./src/components/Footer.astro",
ContentPanel: "./src/components/ContentPanel.astro",
},
sidebar: [
{
label: "Guides",
...getSidebarTranslatedLabel("Guides"),
items: [
// Each item here is one entry in the navigation menu.
{ label: "Intro", slug: "docs/v1/intro" },
{
...getSidebarTranslatedLabel("Introduction"),
link: "/docs/v1/intro",
},
],
},
{
...getSidebarTranslatedLabel("Downloads"),
link: "/downloads/",
},
{
...getSidebarTranslatedLabel("Community"),
items: [
{
...getSidebarTranslatedLabel("Home"),
link: "/community/",
},
{
...getSidebarTranslatedLabel("Branding"),
link: "/community/branding/",
},
{
...getSidebarTranslatedLabel("Changelog"),
link: "/changelog/",
},
{
...getSidebarTranslatedLabel("Contributing"),
link: "/community/contributing/",
},
{
...getSidebarTranslatedLabel("Code of conduct"),
link: "/community/code-of-conduct/",
},
{
...getSidebarTranslatedLabel("Embedding"),
link: "/community/embed/",
},
{
...getSidebarTranslatedLabel("FAQ"),
link: "/community/faq/",
},
{
...getSidebarTranslatedLabel("Versions"),
link: "/community/versions/",
},
{
...getSidebarTranslatedLabel("Nightly builds"),
link: "/community/nightly/",
},
{
...getSidebarTranslatedLabel("Privacy policy"),
link: "/privacypolicy/",
},
],
},
],
locales: {
root: {
label: "English",
lang: "en",
},
af: {
label: "Afrikaans",
},
ar: {
label: "Arabic",
},
ca: {
label: "Catalan",
},
cs: {
label: "Czech",
},
da: {
label: "Danish",
},
de: {
label: "German",
},
el: {
label: "Greek",
},
es: {
label: "Spanish",
},
fi: {
label: "Finnish",
},
fr: {
label: "French",
},
he: {
label: "Hebrew",
},
hi: {
label: "Hindi",
},
hu: {
label: "Hungarian",
},
it: {
label: "Italian",
},
ja: {
label: "Japanese",
},
ko: {
label: "Korean",
},
nl: {
label: "Dutch",
},
no: {
label: "Norwegian",
},
or: {
label: "Oriya",
},
pl: {
label: "Polish",
},
pt: {
label: "Portuguese",
},
"pt-br": {
label: "Portuguese (Brazil)",
lang: "pt-BR",
},
ro: {
label: "Romanian",
},
ru: {
label: "Russian",
},
sr: {
label: "Serbian",
},
sv: {
label: "Swedish",
},
th: {
label: "Thai",
},
tr: {
label: "Turkish",
},
uk: {
label: "Ukrainian",
},
vi: {
label: "Vietnamese",
},
zh: {
label: "Chinese",
},
"zh-hant": {
label: "Chinese (Traditional)",
lang: "zh-Hant",
},
},
}),
],
});
5 changes: 4 additions & 1 deletion docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,8 @@
"sharp": "^0.33.5",
"typescript": "^5.6.3"
},
"packageManager": "[email protected]"
"packageManager": "[email protected]",
"devDependencies": {
"sass": "^1.80.6"
}
}
Loading

0 comments on commit e21b2f4

Please sign in to comment.