refactor: реорганизация структуры - registry и listener подпапки, удален StopCommand, исправлен баг MetricsCommand
This commit is contained in:
parent
f460c59e2f
commit
fede91de5a
90 changed files with 419 additions and 183 deletions
|
|
@ -10,10 +10,24 @@ import org.slf4j.LoggerFactory;
|
|||
|
||||
public class App {
|
||||
private static final Logger logger = LoggerFactory.getLogger(App.class);
|
||||
private static volatile boolean shutdownRequested = false;
|
||||
|
||||
public static void main(String[] args) {
|
||||
// Регистрируем shutdown hook ДО создания бота
|
||||
Thread shutdownHook = new Thread(() -> {
|
||||
if (!shutdownRequested) {
|
||||
shutdownRequested = true;
|
||||
logger.info("========================================");
|
||||
logger.info("Получен сигнал завершения");
|
||||
logger.info("Выполняется graceful shutdown...");
|
||||
logger.info("========================================");
|
||||
}
|
||||
}, "ShutdownHook");
|
||||
|
||||
Runtime.getRuntime().addShutdownHook(shutdownHook);
|
||||
|
||||
try {
|
||||
logger.info("Запуск Discord бота с Dependency Injection...");
|
||||
logger.info("Запуск Discord бота");
|
||||
|
||||
// Создаём Guice Injector с модулем конфигурации
|
||||
Injector injector = Guice.createInjector(new BotModule());
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ package creator.loki.command.impl.utility;
|
|||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.core.CommandRegistry;
|
||||
import creator.loki.core.registry.CommandRegistry;
|
||||
import creator.loki.embed.EmbedFactory;
|
||||
import net.dv8tion.jda.api.Permission;
|
||||
import net.dv8tion.jda.api.interactions.components.selections.StringSelectMenu;
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
package creator.loki.command.impl.utility;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
import net.dv8tion.jda.api.Permission;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
/**
|
||||
* Команда для безопасной остановки бота
|
||||
*/
|
||||
public class StopCommand implements Command {
|
||||
private static final Logger logger = LoggerFactory.getLogger(StopCommand.class);
|
||||
|
||||
@Override
|
||||
public String getName() {
|
||||
return "stop";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getDescription() {
|
||||
return "Безопасно остановить бота (только для администраторов)";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getUsage() {
|
||||
return "stop";
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getCategory() {
|
||||
return "Система";
|
||||
}
|
||||
|
||||
@Override
|
||||
public void execute(CommandContext context) {
|
||||
// Проверка прав администратора
|
||||
if (!context.getAuthor().hasPermission(Permission.ADMINISTRATOR)) {
|
||||
context.getChannel().sendMessage("❌ У вас нет прав для выполнения этой команды!").queue();
|
||||
return;
|
||||
}
|
||||
|
||||
logger.info("========================================");
|
||||
logger.info("Получена команда остановки от {}", context.getAuthor().getEffectiveName());
|
||||
logger.info("========================================");
|
||||
|
||||
context.getChannel().sendMessage("🛑 **Начинаю безопасное завершение работы...**").queue(msg -> {
|
||||
try {
|
||||
// Даем время на отправку сообщения
|
||||
Thread.sleep(1000);
|
||||
|
||||
logger.info("Инициирую shutdown hook...");
|
||||
|
||||
// Вызываем системный shutdown
|
||||
System.exit(0);
|
||||
|
||||
} catch (InterruptedException e) {
|
||||
logger.error("Ошибка при остановке", e);
|
||||
Thread.currentThread().interrupt();
|
||||
}
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.command.impl.utility;
|
||||
package creator.loki.command.impl.utility.info;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.command.impl.utility;
|
||||
package creator.loki.command.impl.utility.info;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.command.impl.utility;
|
||||
package creator.loki.command.impl.utility.info;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.command.impl.utility;
|
||||
package creator.loki.command.impl.utility.system;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
|
|
@ -53,7 +53,7 @@ public class MetricsCommand implements Command {
|
|||
|
||||
@Override
|
||||
public String getUsage() {
|
||||
return "!metrics";
|
||||
return "metrics";
|
||||
}
|
||||
|
||||
@Override
|
||||
|
|
@ -6,6 +6,11 @@ import creator.loki.command.impl.setup.LogSetupCommand;
|
|||
import creator.loki.command.impl.setup.VoiceSetupCommand;
|
||||
import creator.loki.command.impl.stats.leaderboard.LeaderboardButtonListener;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.core.EventDispatcher;
|
||||
import creator.loki.core.registry.CommandRegistry;
|
||||
import creator.loki.core.registry.PrefixCommandRegistrar;
|
||||
import creator.loki.core.registry.SlashCommandRegistrar;
|
||||
import creator.loki.core.registry.SlashCommandRegistry;
|
||||
import creator.loki.counter.CounterManager;
|
||||
import creator.loki.data.JsonDataStore;
|
||||
import creator.loki.database.ConfigRepository;
|
||||
|
|
@ -15,6 +20,8 @@ import creator.loki.feature.level.service.LevelService;
|
|||
import creator.loki.feature.level.VoiceTracker;
|
||||
import creator.loki.level.LevelSystem;
|
||||
import creator.loki.listener.*;
|
||||
import creator.loki.listener.interaction.SlashCommandListener;
|
||||
import creator.loki.listener.voice.VoiceChannelListener;
|
||||
import creator.loki.metrics.MetricsCollector;
|
||||
import creator.loki.profile.ProfileService;
|
||||
import creator.loki.role.CustomRoleManager;
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@ package creator.loki.core;
|
|||
import creator.loki.command.Command;
|
||||
import creator.loki.command.CommandContext;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.core.registry.CommandRegistry;
|
||||
import creator.loki.embed.EmbedTemplates;
|
||||
import creator.loki.exception.CommandExceptionHandler;
|
||||
import creator.loki.metrics.MetricsCollector;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.core;
|
||||
package creator.loki.core.registry;
|
||||
|
||||
import creator.loki.command.Command;
|
||||
import org.slf4j.Logger;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.core;
|
||||
package creator.loki.core.registry;
|
||||
|
||||
import creator.loki.command.impl.entertainment.games.*;
|
||||
import creator.loki.command.impl.entertainment.interaction.*;
|
||||
|
|
@ -6,6 +6,8 @@ import creator.loki.command.impl.moderation.*;
|
|||
import creator.loki.command.impl.roles.*;
|
||||
import creator.loki.command.impl.stats.*;
|
||||
import creator.loki.command.impl.utility.*;
|
||||
import creator.loki.command.impl.utility.info.*;
|
||||
import creator.loki.command.impl.utility.system.*;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.data.JsonDataStore;
|
||||
import creator.loki.feature.level.service.LevelService;
|
||||
|
|
@ -77,7 +79,6 @@ public class PrefixCommandRegistrar {
|
|||
registry.register(new AvatarCommand());
|
||||
registry.register(new PollCommand());
|
||||
registry.register(new SwapCommand());
|
||||
registry.register(new StopCommand());
|
||||
}
|
||||
|
||||
private void registerRoleCommands() {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.core;
|
||||
package creator.loki.core.registry;
|
||||
|
||||
import creator.loki.data.JsonDataStore;
|
||||
import creator.loki.metrics.MetricsCollector;
|
||||
|
|
@ -11,12 +11,12 @@ import org.slf4j.LoggerFactory;
|
|||
public class SlashCommandRegistrar {
|
||||
private static final Logger logger = LoggerFactory.getLogger(SlashCommandRegistrar.class);
|
||||
|
||||
private final creator.loki.core.SlashCommandRegistry registry;
|
||||
private final SlashCommandRegistry registry;
|
||||
private final JsonDataStore dataStore;
|
||||
private final MetricsCollector metrics;
|
||||
|
||||
public SlashCommandRegistrar(
|
||||
creator.loki.core.SlashCommandRegistry registry,
|
||||
SlashCommandRegistry registry,
|
||||
JsonDataStore dataStore,
|
||||
MetricsCollector metrics
|
||||
) {
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.core;
|
||||
package creator.loki.core.registry;
|
||||
|
||||
import creator.loki.command.SlashCommand;
|
||||
import net.dv8tion.jda.api.JDA;
|
||||
|
|
@ -5,9 +5,9 @@ import com.google.inject.Provides;
|
|||
import com.google.inject.Singleton;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.config.ConfigLoader;
|
||||
import creator.loki.core.CommandRegistry;
|
||||
import creator.loki.core.EventDispatcher;
|
||||
import creator.loki.core.SlashCommandRegistry;
|
||||
import creator.loki.core.registry.CommandRegistry;
|
||||
import creator.loki.core.registry.SlashCommandRegistry;
|
||||
import creator.loki.core.security.CooldownManager;
|
||||
import creator.loki.core.security.RateLimiter;
|
||||
import creator.loki.counter.CounterManager;
|
||||
|
|
|
|||
|
|
@ -1,99 +0,0 @@
|
|||
package creator.loki.listener;
|
||||
|
||||
import creator.loki.database.ConfigRepository;
|
||||
import creator.loki.feature.level.domain.LevelProgress;
|
||||
import creator.loki.level.LevelSystem;
|
||||
import net.dv8tion.jda.api.EmbedBuilder;
|
||||
import net.dv8tion.jda.api.entities.Member;
|
||||
import net.dv8tion.jda.api.entities.channel.concrete.TextChannel;
|
||||
import net.dv8tion.jda.api.entities.channel.middleman.MessageChannel;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
import java.awt.Color;
|
||||
|
||||
/**
|
||||
* Уведомления о повышении уровня
|
||||
*/
|
||||
public class LevelUpNotifier {
|
||||
private static final Logger logger = LoggerFactory.getLogger(LevelUpNotifier.class);
|
||||
private final ConfigRepository configRepo;
|
||||
private final LevelSystem levelSystem;
|
||||
|
||||
public LevelUpNotifier(ConfigRepository configRepo, LevelSystem levelSystem) {
|
||||
this.configRepo = configRepo;
|
||||
this.levelSystem = levelSystem;
|
||||
}
|
||||
|
||||
/**
|
||||
* Отправить уведомление о повышении уровня
|
||||
*/
|
||||
public void sendLevelUpNotification(Member member, int oldLevel, int newLevel, MessageChannel channel) {
|
||||
LevelProgress progress = levelSystem.getProgress(member.getId());
|
||||
|
||||
EmbedBuilder embed = new EmbedBuilder()
|
||||
.setTitle("🎉 Повышение уровня!")
|
||||
.setDescription(member.getAsMention() + " достиг **уровня " + newLevel + "**!")
|
||||
.addField("Предыдущий уровень", String.valueOf(oldLevel), true)
|
||||
.addField("Новый уровень", String.valueOf(newLevel), true)
|
||||
.addField("Всего XP", String.valueOf(progress.getTotalXP()), true)
|
||||
.addField("До следующего уровня",
|
||||
progress.getCurrentLevelXP() + " / " + progress.getXpForNextLevel() + " XP", false)
|
||||
.setColor(getColorForLevel(newLevel))
|
||||
.setThumbnail(member.getEffectiveAvatarUrl())
|
||||
.setFooter("Продолжай в том же духе!");
|
||||
|
||||
// Добавляем награды за уровень
|
||||
String reward = getRewardForLevel(newLevel);
|
||||
if (reward != null) {
|
||||
embed.addField("🎁 Награда", reward, false);
|
||||
}
|
||||
|
||||
channel.sendMessageEmbeds(embed.build()).queue(
|
||||
success -> logger.info("Отправлено уведомление о level up для {}: {} -> {}",
|
||||
member.getEffectiveName(), oldLevel, newLevel),
|
||||
error -> logger.error("Ошибка отправки уведомления о level up", error)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Отправить уведомление о level up в войсе
|
||||
*/
|
||||
public void sendVoiceLevelUpNotification(Member member, int oldLevel, int newLevel) {
|
||||
String channelId = configRepo.get("levelup.notification_channel_id");
|
||||
if (channelId == null) {
|
||||
// Если канал не настроен, пропускаем
|
||||
return;
|
||||
}
|
||||
|
||||
TextChannel channel = member.getGuild().getTextChannelById(channelId);
|
||||
if (channel != null) {
|
||||
sendLevelUpNotification(member, oldLevel, newLevel, channel);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить цвет для уровня
|
||||
*/
|
||||
private Color getColorForLevel(int level) {
|
||||
if (level >= 50) return Color.decode("#FFD700"); // Золотой
|
||||
if (level >= 30) return Color.decode("#E74C3C"); // Красный
|
||||
if (level >= 20) return Color.decode("#9B59B6"); // Фиолетовый
|
||||
if (level >= 10) return Color.decode("#3498DB"); // Синий
|
||||
return Color.decode("#2ECC71"); // Зеленый
|
||||
}
|
||||
|
||||
/**
|
||||
* Получить награду за уровень
|
||||
*/
|
||||
private String getRewardForLevel(int level) {
|
||||
return switch (level) {
|
||||
case 5 -> "🎖️ Роль **Активный**";
|
||||
case 10 -> "⭐ Роль **Постоянный**";
|
||||
case 20 -> "💎 Роль **Ветеран**";
|
||||
case 30 -> "👑 Роль **Легенда**";
|
||||
case 50 -> "🏆 Роль **Мастер** + особый цвет ника";
|
||||
default -> null;
|
||||
};
|
||||
}
|
||||
}
|
||||
|
|
@ -2,7 +2,7 @@ package creator.loki.listener;
|
|||
|
||||
import creator.loki.command.Command;
|
||||
import creator.loki.config.BotConfig;
|
||||
import creator.loki.core.CommandRegistry;
|
||||
import creator.loki.core.registry.CommandRegistry;
|
||||
import creator.loki.embed.EmbedFactory;
|
||||
import net.dv8tion.jda.api.Permission;
|
||||
import net.dv8tion.jda.api.events.interaction.component.StringSelectInteractionEvent;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package creator.loki.listener;
|
||||
package creator.loki.listener.interaction;
|
||||
|
||||
import creator.loki.core.SlashCommandRegistry;
|
||||
import creator.loki.core.registry.SlashCommandRegistry;
|
||||
import creator.loki.exception.CommandExceptionHandler;
|
||||
import creator.loki.metrics.MetricsCollector;
|
||||
import creator.loki.core.security.RateLimiter;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.listener;
|
||||
package creator.loki.listener.voice;
|
||||
|
||||
import creator.loki.voice.VoiceChannelManager;
|
||||
import net.dv8tion.jda.api.entities.Guild;
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package creator.loki.listener;
|
||||
package creator.loki.listener.voice;
|
||||
|
||||
import creator.loki.level.LevelSystem;
|
||||
import net.dv8tion.jda.api.entities.Member;
|
||||
Binary file not shown.
Binary file not shown.
93
src/main/resources/assets/fonts/Inter/OFL.txt
Normal file
93
src/main/resources/assets/fonts/Inter/OFL.txt
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
Copyright 2020 The Inter Project Authors (https://github.com/rsms/inter)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
118
src/main/resources/assets/fonts/Inter/README.txt
Normal file
118
src/main/resources/assets/fonts/Inter/README.txt
Normal file
|
|
@ -0,0 +1,118 @@
|
|||
Inter Variable Font
|
||||
===================
|
||||
|
||||
This download contains Inter as both variable fonts and static fonts.
|
||||
|
||||
Inter is a variable font with these axes:
|
||||
opsz
|
||||
wght
|
||||
|
||||
This means all the styles are contained in these files:
|
||||
Inter/Inter-VariableFont_opsz,wght.ttf
|
||||
Inter/Inter-Italic-VariableFont_opsz,wght.ttf
|
||||
|
||||
If your app fully supports variable fonts, you can now pick intermediate styles
|
||||
that aren’t available as static fonts. Not all apps support variable fonts, and
|
||||
in those cases you can use the static font files for Inter:
|
||||
Inter/static/Inter_18pt-Thin.ttf
|
||||
Inter/static/Inter_18pt-ExtraLight.ttf
|
||||
Inter/static/Inter_18pt-Light.ttf
|
||||
Inter/static/Inter_18pt-Regular.ttf
|
||||
Inter/static/Inter_18pt-Medium.ttf
|
||||
Inter/static/Inter_18pt-SemiBold.ttf
|
||||
Inter/static/Inter_18pt-Bold.ttf
|
||||
Inter/static/Inter_18pt-ExtraBold.ttf
|
||||
Inter/static/Inter_18pt-Black.ttf
|
||||
Inter/static/Inter_24pt-Thin.ttf
|
||||
Inter/static/Inter_24pt-ExtraLight.ttf
|
||||
Inter/static/Inter_24pt-Light.ttf
|
||||
Inter/static/Inter_24pt-Regular.ttf
|
||||
Inter/static/Inter_24pt-Medium.ttf
|
||||
Inter/static/Inter_24pt-SemiBold.ttf
|
||||
Inter/static/Inter_24pt-Bold.ttf
|
||||
Inter/static/Inter_24pt-ExtraBold.ttf
|
||||
Inter/static/Inter_24pt-Black.ttf
|
||||
Inter/static/Inter_28pt-Thin.ttf
|
||||
Inter/static/Inter_28pt-ExtraLight.ttf
|
||||
Inter/static/Inter_28pt-Light.ttf
|
||||
Inter/static/Inter_28pt-Regular.ttf
|
||||
Inter/static/Inter_28pt-Medium.ttf
|
||||
Inter/static/Inter_28pt-SemiBold.ttf
|
||||
Inter/static/Inter_28pt-Bold.ttf
|
||||
Inter/static/Inter_28pt-ExtraBold.ttf
|
||||
Inter/static/Inter_28pt-Black.ttf
|
||||
Inter/static/Inter_18pt-ThinItalic.ttf
|
||||
Inter/static/Inter_18pt-ExtraLightItalic.ttf
|
||||
Inter/static/Inter_18pt-LightItalic.ttf
|
||||
Inter/static/Inter_18pt-Italic.ttf
|
||||
Inter/static/Inter_18pt-MediumItalic.ttf
|
||||
Inter/static/Inter_18pt-SemiBoldItalic.ttf
|
||||
Inter/static/Inter_18pt-BoldItalic.ttf
|
||||
Inter/static/Inter_18pt-ExtraBoldItalic.ttf
|
||||
Inter/static/Inter_18pt-BlackItalic.ttf
|
||||
Inter/static/Inter_24pt-ThinItalic.ttf
|
||||
Inter/static/Inter_24pt-ExtraLightItalic.ttf
|
||||
Inter/static/Inter_24pt-LightItalic.ttf
|
||||
Inter/static/Inter_24pt-Italic.ttf
|
||||
Inter/static/Inter_24pt-MediumItalic.ttf
|
||||
Inter/static/Inter_24pt-SemiBoldItalic.ttf
|
||||
Inter/static/Inter_24pt-BoldItalic.ttf
|
||||
Inter/static/Inter_24pt-ExtraBoldItalic.ttf
|
||||
Inter/static/Inter_24pt-BlackItalic.ttf
|
||||
Inter/static/Inter_28pt-ThinItalic.ttf
|
||||
Inter/static/Inter_28pt-ExtraLightItalic.ttf
|
||||
Inter/static/Inter_28pt-LightItalic.ttf
|
||||
Inter/static/Inter_28pt-Italic.ttf
|
||||
Inter/static/Inter_28pt-MediumItalic.ttf
|
||||
Inter/static/Inter_28pt-SemiBoldItalic.ttf
|
||||
Inter/static/Inter_28pt-BoldItalic.ttf
|
||||
Inter/static/Inter_28pt-ExtraBoldItalic.ttf
|
||||
Inter/static/Inter_28pt-BlackItalic.ttf
|
||||
|
||||
Get started
|
||||
-----------
|
||||
|
||||
1. Install the font files you want to use
|
||||
|
||||
2. Use your app's font picker to view the font family and all the
|
||||
available styles
|
||||
|
||||
Learn more about variable fonts
|
||||
-------------------------------
|
||||
|
||||
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
|
||||
https://variablefonts.typenetwork.com
|
||||
https://medium.com/variable-fonts
|
||||
|
||||
In desktop apps
|
||||
|
||||
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
|
||||
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
|
||||
|
||||
Online
|
||||
|
||||
https://developers.google.com/fonts/docs/getting_started
|
||||
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
|
||||
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
|
||||
|
||||
Installing fonts
|
||||
|
||||
MacOS: https://support.apple.com/en-us/HT201749
|
||||
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
|
||||
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
|
||||
|
||||
Android Apps
|
||||
|
||||
https://developers.google.com/fonts/docs/android
|
||||
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
|
||||
|
||||
License
|
||||
-------
|
||||
Please read the full license text (OFL.txt) to understand the permissions,
|
||||
restrictions and requirements for usage, redistribution, and modification.
|
||||
|
||||
You can use them in your products & projects – print or digital,
|
||||
commercial or otherwise.
|
||||
|
||||
This isn't legal advice, please consider consulting a lawyer and see the full
|
||||
license for all details.
|
||||
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_18pt-Bold.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_18pt-Bold.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_18pt-Thin.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_18pt-Thin.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_24pt-Bold.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_24pt-Bold.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_24pt-Thin.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_24pt-Thin.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_28pt-Bold.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_28pt-Bold.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
src/main/resources/assets/fonts/Inter/static/Inter_28pt-Thin.ttf
Normal file
BIN
src/main/resources/assets/fonts/Inter/static/Inter_28pt-Thin.ttf
Normal file
Binary file not shown.
Binary file not shown.
Binary file not shown.
93
src/main/resources/assets/fonts/Noto_Sans_Symbols/OFL.txt
Normal file
93
src/main/resources/assets/fonts/Noto_Sans_Symbols/OFL.txt
Normal file
|
|
@ -0,0 +1,93 @@
|
|||
Copyright 2022 The Noto Project Authors (https://github.com/notofonts/symbols)
|
||||
|
||||
This Font Software is licensed under the SIL Open Font License, Version 1.1.
|
||||
This license is copied below, and is also available with a FAQ at:
|
||||
https://openfontlicense.org
|
||||
|
||||
|
||||
-----------------------------------------------------------
|
||||
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
|
||||
-----------------------------------------------------------
|
||||
|
||||
PREAMBLE
|
||||
The goals of the Open Font License (OFL) are to stimulate worldwide
|
||||
development of collaborative font projects, to support the font creation
|
||||
efforts of academic and linguistic communities, and to provide a free and
|
||||
open framework in which fonts may be shared and improved in partnership
|
||||
with others.
|
||||
|
||||
The OFL allows the licensed fonts to be used, studied, modified and
|
||||
redistributed freely as long as they are not sold by themselves. The
|
||||
fonts, including any derivative works, can be bundled, embedded,
|
||||
redistributed and/or sold with any software provided that any reserved
|
||||
names are not used by derivative works. The fonts and derivatives,
|
||||
however, cannot be released under any other type of license. The
|
||||
requirement for fonts to remain under this license does not apply
|
||||
to any document created using the fonts or their derivatives.
|
||||
|
||||
DEFINITIONS
|
||||
"Font Software" refers to the set of files released by the Copyright
|
||||
Holder(s) under this license and clearly marked as such. This may
|
||||
include source files, build scripts and documentation.
|
||||
|
||||
"Reserved Font Name" refers to any names specified as such after the
|
||||
copyright statement(s).
|
||||
|
||||
"Original Version" refers to the collection of Font Software components as
|
||||
distributed by the Copyright Holder(s).
|
||||
|
||||
"Modified Version" refers to any derivative made by adding to, deleting,
|
||||
or substituting -- in part or in whole -- any of the components of the
|
||||
Original Version, by changing formats or by porting the Font Software to a
|
||||
new environment.
|
||||
|
||||
"Author" refers to any designer, engineer, programmer, technical
|
||||
writer or other person who contributed to the Font Software.
|
||||
|
||||
PERMISSION & CONDITIONS
|
||||
Permission is hereby granted, free of charge, to any person obtaining
|
||||
a copy of the Font Software, to use, study, copy, merge, embed, modify,
|
||||
redistribute, and sell modified and unmodified copies of the Font
|
||||
Software, subject to the following conditions:
|
||||
|
||||
1) Neither the Font Software nor any of its individual components,
|
||||
in Original or Modified Versions, may be sold by itself.
|
||||
|
||||
2) Original or Modified Versions of the Font Software may be bundled,
|
||||
redistributed and/or sold with any software, provided that each copy
|
||||
contains the above copyright notice and this license. These can be
|
||||
included either as stand-alone text files, human-readable headers or
|
||||
in the appropriate machine-readable metadata fields within text or
|
||||
binary files as long as those fields can be easily viewed by the user.
|
||||
|
||||
3) No Modified Version of the Font Software may use the Reserved Font
|
||||
Name(s) unless explicit written permission is granted by the corresponding
|
||||
Copyright Holder. This restriction only applies to the primary font name as
|
||||
presented to the users.
|
||||
|
||||
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
|
||||
Software shall not be used to promote, endorse or advertise any
|
||||
Modified Version, except to acknowledge the contribution(s) of the
|
||||
Copyright Holder(s) and the Author(s) or with their explicit written
|
||||
permission.
|
||||
|
||||
5) The Font Software, modified or unmodified, in part or in whole,
|
||||
must be distributed entirely under this license, and must not be
|
||||
distributed under any other license. The requirement for fonts to
|
||||
remain under this license does not apply to any document created
|
||||
using the Font Software.
|
||||
|
||||
TERMINATION
|
||||
This license becomes null and void if any of the above conditions are
|
||||
not met.
|
||||
|
||||
DISCLAIMER
|
||||
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
||||
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
|
||||
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
|
||||
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
|
||||
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
|
||||
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
|
||||
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
||||
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
|
||||
OTHER DEALINGS IN THE FONT SOFTWARE.
|
||||
71
src/main/resources/assets/fonts/Noto_Sans_Symbols/README.txt
Normal file
71
src/main/resources/assets/fonts/Noto_Sans_Symbols/README.txt
Normal file
|
|
@ -0,0 +1,71 @@
|
|||
Noto Sans Symbols Variable Font
|
||||
===============================
|
||||
|
||||
This download contains Noto Sans Symbols as both a variable font and static fonts.
|
||||
|
||||
Noto Sans Symbols is a variable font with this axis:
|
||||
wght
|
||||
|
||||
This means all the styles are contained in a single file:
|
||||
Noto_Sans_Symbols/NotoSansSymbols-VariableFont_wght.ttf
|
||||
|
||||
If your app fully supports variable fonts, you can now pick intermediate styles
|
||||
that aren’t available as static fonts. Not all apps support variable fonts, and
|
||||
in those cases you can use the static font files for Noto Sans Symbols:
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Thin.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-ExtraLight.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Light.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Regular.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Medium.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-SemiBold.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Bold.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-ExtraBold.ttf
|
||||
Noto_Sans_Symbols/static/NotoSansSymbols-Black.ttf
|
||||
|
||||
Get started
|
||||
-----------
|
||||
|
||||
1. Install the font files you want to use
|
||||
|
||||
2. Use your app's font picker to view the font family and all the
|
||||
available styles
|
||||
|
||||
Learn more about variable fonts
|
||||
-------------------------------
|
||||
|
||||
https://developers.google.com/web/fundamentals/design-and-ux/typography/variable-fonts
|
||||
https://variablefonts.typenetwork.com
|
||||
https://medium.com/variable-fonts
|
||||
|
||||
In desktop apps
|
||||
|
||||
https://theblog.adobe.com/can-variable-fonts-illustrator-cc
|
||||
https://helpx.adobe.com/nz/photoshop/using/fonts.html#variable_fonts
|
||||
|
||||
Online
|
||||
|
||||
https://developers.google.com/fonts/docs/getting_started
|
||||
https://developer.mozilla.org/en-US/docs/Web/CSS/CSS_Fonts/Variable_Fonts_Guide
|
||||
https://developer.microsoft.com/en-us/microsoft-edge/testdrive/demos/variable-fonts
|
||||
|
||||
Installing fonts
|
||||
|
||||
MacOS: https://support.apple.com/en-us/HT201749
|
||||
Linux: https://www.google.com/search?q=how+to+install+a+font+on+gnu%2Blinux
|
||||
Windows: https://support.microsoft.com/en-us/help/314960/how-to-install-or-remove-a-font-in-windows
|
||||
|
||||
Android Apps
|
||||
|
||||
https://developers.google.com/fonts/docs/android
|
||||
https://developer.android.com/guide/topics/ui/look-and-feel/downloadable-fonts
|
||||
|
||||
License
|
||||
-------
|
||||
Please read the full license text (OFL.txt) to understand the permissions,
|
||||
restrictions and requirements for usage, redistribution, and modification.
|
||||
|
||||
You can use them in your products & projects – print or digital,
|
||||
commercial or otherwise.
|
||||
|
||||
This isn't legal advice, please consider consulting a lawyer and see the full
|
||||
license for all details.
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue