From 3aebe6d4bd78ec19165bcb0a332d83d3148adb54 Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Thu, 7 Sep 2023 00:22:06 +0200 Subject: [PATCH 1/2] Moves the Rubik font into a separate package --- app/pubspec.lock | 7 +++++++ app/pubspec.yaml | 14 ++++++++------ lib/sharezone_font/.gitignore | 6 ++++++ lib/sharezone_font/lib/fonts/README.md | 5 +++++ .../lib}/fonts/Rubik/Rubik-Black.ttf | Bin .../lib}/fonts/Rubik/Rubik-Bold.ttf | Bin .../lib}/fonts/Rubik/Rubik-Italic.ttf | Bin .../lib}/fonts/Rubik/Rubik-Light.ttf | Bin .../lib}/fonts/Rubik/Rubik-Medium.ttf | Bin .../lib}/fonts/Rubik/Rubik-Regular.ttf | Bin lib/sharezone_font/pubspec.lock | 5 +++++ lib/sharezone_font/pubspec.yaml | 7 +++++++ 12 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 lib/sharezone_font/.gitignore create mode 100644 lib/sharezone_font/lib/fonts/README.md rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Black.ttf (100%) rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Bold.ttf (100%) rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Italic.ttf (100%) rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Light.ttf (100%) rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Medium.ttf (100%) rename {app => lib/sharezone_font/lib}/fonts/Rubik/Rubik-Regular.ttf (100%) create mode 100644 lib/sharezone_font/pubspec.lock create mode 100644 lib/sharezone_font/pubspec.yaml diff --git a/app/pubspec.lock b/app/pubspec.lock index f46936bdf..6d13a2b75 100644 --- a/app/pubspec.lock +++ b/app/pubspec.lock @@ -1784,6 +1784,13 @@ packages: relative: true source: path version: "0.0.1" + sharezone_font: + dependency: "direct main" + description: + path: "../lib/sharezone_font" + relative: true + source: path + version: "1.0.0" sharezone_lints: dependency: transitive description: diff --git a/app/pubspec.yaml b/app/pubspec.yaml index 2a476424f..9a8e2ac78 100644 --- a/app/pubspec.yaml +++ b/app/pubspec.yaml @@ -139,6 +139,8 @@ dependencies: shared_preferences: ^2.0.5 sharezone_common: path: ../lib/sharezone_common + sharezone_font: + path: ../lib/sharezone_font sharezone_utils: path: ../lib/sharezone_utils sharezone_widgets: @@ -181,17 +183,17 @@ flutter: fonts: - family: Rubik fonts: - - asset: fonts/Rubik/Rubik-Light.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Light.ttf weight: 200 - - asset: fonts/Rubik/Rubik-Regular.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Regular.ttf weight: 400 - - asset: fonts/Rubik/Rubik-Medium.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Medium.ttf weight: 500 - - asset: fonts/Rubik/Rubik-Bold.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Bold.ttf weight: 700 - - asset: fonts/Rubik/Rubik-Black.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Black.ttf weight: 900 - - asset: fonts/Rubik/Rubik-Italic.ttf + - asset: packages/sharezone_font/fonts/Rubik/Rubik-Italic.ttf style: italic - family: PT MONO diff --git a/lib/sharezone_font/.gitignore b/lib/sharezone_font/.gitignore new file mode 100644 index 000000000..3c8a15727 --- /dev/null +++ b/lib/sharezone_font/.gitignore @@ -0,0 +1,6 @@ +# Files and directories created by pub. +.dart_tool/ +.packages + +# Conventional directory for build output. +build/ diff --git a/lib/sharezone_font/lib/fonts/README.md b/lib/sharezone_font/lib/fonts/README.md new file mode 100644 index 000000000..0e59093c2 --- /dev/null +++ b/lib/sharezone_font/lib/fonts/README.md @@ -0,0 +1,5 @@ +# Readme + +## Licence / Copyright + +The files in this folder and all subfolders are exempt from the EUPL v1.2 unless specified otherwise. diff --git a/app/fonts/Rubik/Rubik-Black.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Black.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Black.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Black.ttf diff --git a/app/fonts/Rubik/Rubik-Bold.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Bold.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Bold.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Bold.ttf diff --git a/app/fonts/Rubik/Rubik-Italic.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Italic.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Italic.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Italic.ttf diff --git a/app/fonts/Rubik/Rubik-Light.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Light.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Light.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Light.ttf diff --git a/app/fonts/Rubik/Rubik-Medium.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Medium.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Medium.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Medium.ttf diff --git a/app/fonts/Rubik/Rubik-Regular.ttf b/lib/sharezone_font/lib/fonts/Rubik/Rubik-Regular.ttf similarity index 100% rename from app/fonts/Rubik/Rubik-Regular.ttf rename to lib/sharezone_font/lib/fonts/Rubik/Rubik-Regular.ttf diff --git a/lib/sharezone_font/pubspec.lock b/lib/sharezone_font/pubspec.lock new file mode 100644 index 000000000..573410f76 --- /dev/null +++ b/lib/sharezone_font/pubspec.lock @@ -0,0 +1,5 @@ +# Generated by pub +# See https://dart.dev/tools/pub/glossary#lockfile +packages: {} +sdks: + dart: ">=3.0.0 <4.0.0" diff --git a/lib/sharezone_font/pubspec.yaml b/lib/sharezone_font/pubspec.yaml new file mode 100644 index 000000000..064136a75 --- /dev/null +++ b/lib/sharezone_font/pubspec.yaml @@ -0,0 +1,7 @@ +name: sharezone_font +description: The font that are used in the Sharezone products. +version: 1.0.0 +publish_to: "none" + +environment: + sdk: ">=3.0.0 <4.0.0" From b8672fcbc6a7bd902047a313d5d62d1b2d053547 Mon Sep 17 00:00:00 2001 From: nilsreichardt Date: Thu, 7 Sep 2023 01:06:07 +0200 Subject: [PATCH 2/2] Add license header --- lib/sharezone_font/pubspec.yaml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/sharezone_font/pubspec.yaml b/lib/sharezone_font/pubspec.yaml index 064136a75..513e2d376 100644 --- a/lib/sharezone_font/pubspec.yaml +++ b/lib/sharezone_font/pubspec.yaml @@ -1,3 +1,11 @@ +# Copyright (c) 2023 Sharezone UG (haftungsbeschränkt) +# Licensed under the EUPL-1.2-or-later. +# +# You may obtain a copy of the Licence at: +# https://joinup.ec.europa.eu/software/page/eupl +# +# SPDX-License-Identifier: EUPL-1.2 + name: sharezone_font description: The font that are used in the Sharezone products. version: 1.0.0