这是indexloc提供的服务,不要输入任何密码
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ jobs:

- name: Release APK
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: |
${{ env.APK_BUILD_DIR }}/build/app/outputs/apk/release/aria-${{ github.ref_name }}-armeabi-v7a.apk
Expand Down Expand Up @@ -295,7 +295,7 @@ jobs:

- name: Release IPA (Unsigned)
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: aria-${{ github.ref_name }}.ipa
draft: true
Expand Down Expand Up @@ -353,7 +353,7 @@ jobs:
-authenticationKeyPath $(pwd)/AuthKey.p8

build-windows-x64:
runs-on: windows-latest
runs-on: windows-2022

needs: get-flutter-version

Expand Down Expand Up @@ -392,7 +392,7 @@ jobs:

- name: Release ZIP
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: aria-${{ github.ref_name }}-windows-x64.zip
draft: true
Expand All @@ -417,7 +417,7 @@ jobs:

- name: Release installer
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: windows/Output/aria-v${{ steps.trim-version.outputs.version }}-windows-x64.exe
draft: true
Expand Down Expand Up @@ -509,7 +509,7 @@ jobs:

- name: Release DMG
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: aria-${{ github.ref_name }}.dmg
draft: true
Expand Down Expand Up @@ -595,7 +595,7 @@ jobs:

- name: Release TAR
if: startsWith(github.ref, 'refs/tags/v')
uses: softprops/action-gh-release@72f2c25fcb47643c292f7107632f7a47c1df5cd8 # v2.3.2
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
with:
files: aria-${{ github.ref_name }}-linux-${{ matrix.arch }}.tar.gz
draft: true
4 changes: 2 additions & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ plugins {
android {
namespace = "com.poppingmoon.aria"
compileSdk = flutter.compileSdkVersion
ndkVersion = "28.1.13356709"
ndkVersion = "28.2.13676358"

compileOptions {
coreLibraryDesugaringEnabled = true
Expand Down Expand Up @@ -61,7 +61,7 @@ dependencies {
}

configurations.configureEach {
def tink = "com.google.crypto.tink:tink-android:1.17.0"
def tink = "com.google.crypto.tink:tink-android:1.18.0"
resolutionStrategy {
force(tink)
dependencySubstitution {
Expand Down
2 changes: 1 addition & 1 deletion android/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ pluginManagement {
plugins {
id("dev.flutter.flutter-plugin-loader") version "1.0.0"
id("com.android.application") version "8.11.1" apply false
id("org.jetbrains.kotlin.android") version "2.1.21" apply false
id("org.jetbrains.kotlin.android") version "2.2.10" apply false
}

include(":app")
12 changes: 12 additions & 0 deletions ios/Localizable.xcstrings
Original file line number Diff line number Diff line change
Expand Up @@ -11423,6 +11423,12 @@
"value": "🤯"
}
},
"ru": {
"stringUnit": {
"state": "translated",
"value": "🤯"
}
},
"th": {
"stringUnit": {
"state": "translated",
Expand Down Expand Up @@ -11512,6 +11518,12 @@
"value": "🤯 Duplo"
}
},
"ru": {
"stringUnit": {
"state": "translated",
"value": "Двойной🤯"
}
},
"th": {
"stringUnit": {
"state": "translated",
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/misskey/misskey_ca-ES.i18n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ serverSettings_:
reactionsBufferingDescription: "Quan s'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà l'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d'inestabilitat."
remoteNotesCleaning: "Neteja automàtica de notes remotes"
remoteNotesCleaning_description: "Quan activis aquesta opció, periòdicament es netejaran les notes remotes que no es consultin, això evitarà que la base de dades se"
remoteNotesCleaningMaxProcessingDuration: "D'oració màxima del temps de funcionament del procés de neteja"
remoteNotesCleaningMaxProcessingDuration: "Duració màxima del temps de funcionament del procés de neteja"
remoteNotesCleaningExpiryDaysForEachNotes: "Duració mínima de conservació de les notes"
inquiryUrl: "URL de consulta "
inquiryUrlDescription: "Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d'informació."
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/misskey/misskey_es-ES.i18n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2141,7 +2141,7 @@ aboutMisskey_:
displayOfSensitiveMedia_:
respect: "Esconder medios marcados como sensibles"
ignore: "Mostrar medios marcados como sensibles"
force: "Esconder todala multimedia"
force: "Esconder toda la multimedia"
instanceTicker_:
none: "No mostrar"
remote: "Mostrar a usuarios remotos"
Expand Down
17 changes: 16 additions & 1 deletion lib/i18n/misskey/misskey_ru-RU.i18n.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1219,6 +1219,7 @@ privacyPolicyUrl: "Ссылка на Политику Конфиденциаль
tosAndPrivacyPolicy: "Условия использования и политика конфиденциальности"
avatarDecorations: "Украшения для аватара"
attach: "Прикрепить"
detachAll: "Убрать всё"
angle: "Угол"
flip: "Переворот"
showAvatarDecorations: "Показать украшения для аватара"
Expand Down Expand Up @@ -1257,7 +1258,7 @@ clipNoteLimitExceeded: "К этому клипу больше нельзя до
performance: "Производительность"
modified: "Изменено"
signinWithPasskey: "Войдите в систему, используя свой пароль"
unknownWebAuthnKey: "Не известный ключ "
unknownWebAuthnKey: "Неизвестный ключ"
passkeyVerificationFailed: "Ошибка проверка ключа доступа "
messageToFollower: "Сообщение подписчикам"
testCaptchaWarning: "Эта функция предназначена для тестирования CAPTCHA. <strong>Не использовать это в рабочей среде</strong>"
Expand All @@ -1272,8 +1273,11 @@ availableRoles: "Доступные роли"
federationDisabled: "Федерация отключена для этого сервера. Вы не можете взаимодействовать с пользователями на других серверах."
draft: "Черновик"
markAsSensitiveConfirm: "Отметить контент как чувствительный?"
preferences: "Основное"
resetToDefaultValue: "Сбросить настройки до стандартных"
syncBetweenDevices: "Синхронизировать между устройствами"
postForm: "Форма отправки"
textCount: "Количество символов"
information: "Описание"
inMinutes: "мин"
inDays: "сут"
Expand All @@ -1285,6 +1289,11 @@ chat_:
send: "Отправить"
settings_:
webhook: "Вебхук"
preferencesBanner: "Вы можете настроить общее поведение клиента по вашим предпочтениям"
timelineAndNote: "Лента и заметки"
chat_:
showSenderName: "Показывать имя отправителя"
sendOnEnter: "Использовать Enter для отправки"
delivery_:
stop: "Заморожено"
type_:
Expand Down Expand Up @@ -1561,6 +1570,12 @@ achievements_:
title: "Brain Diver"
description: "Опубликована ссылка на песню «Brain Diver»"
flavor: "Мисски-Мисски Ла-Ту-Ма"
bubbleGameExplodingHead_:
title: "🤯"
description: "Самый большой объект в Bubble game"
bubbleGameDoubleExplodingHead_:
title: "Двойной🤯"
description: "Два самых больших объекта в Bubble game одновременно!"
role_:
new_: "Новая роль"
edit: "Изменить роль"
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/strings.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// To regenerate, run: `dart run slang`
///
/// Locales: 31
/// Strings: 67163 (2166 per locale)
/// Strings: 67175 (2166 per locale)

// coverage:ignore-file
// ignore_for_file: type=lint, unused_import
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/strings_ca_ES.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1886,7 +1886,7 @@ class _TranslationsMisskeyServerSettingsCaEs extends TranslationsMisskeyServerSe
@override String get reactionsBufferingDescription => 'Quan s\'activa aquesta opció millora bastant el rendiment en recuperar les línies de temps reduint la càrrega de la base. Com a contrapunt, augmentarà l\'ús de memòria de Redís. Desactiva aquesta opció en cas de tenir un servidor amb poca memòria o si tens problemes d\'inestabilitat.';
@override String get remoteNotesCleaning => 'Neteja automàtica de notes remotes';
@override String get remoteNotesCleaning_description => 'Quan activis aquesta opció, periòdicament es netejaran les notes remotes que no es consultin, això evitarà que la base de dades se';
@override String get remoteNotesCleaningMaxProcessingDuration => 'D\'oració màxima del temps de funcionament del procés de neteja';
@override String get remoteNotesCleaningMaxProcessingDuration => 'Duració màxima del temps de funcionament del procés de neteja';
@override String get remoteNotesCleaningExpiryDaysForEachNotes => 'Duració mínima de conservació de les notes';
@override String get inquiryUrl => 'URL de consulta ';
@override String get inquiryUrlDescription => 'Escriu adreça URL per al formulari de consulta per al mantenidor del servidor o una pàgina web amb el contacte d\'informació.';
Expand Down
2 changes: 1 addition & 1 deletion lib/i18n/strings_es_ES.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -2390,7 +2390,7 @@ class _TranslationsMisskeyDisplayOfSensitiveMediaEsEs extends TranslationsMisske
// Translations
@override String get respect => 'Esconder medios marcados como sensibles';
@override String get ignore => 'Mostrar medios marcados como sensibles';
@override String get force => 'Esconder todala multimedia';
@override String get force => 'Esconder toda la multimedia';
}

// Path: misskey.instanceTicker_
Expand Down
44 changes: 43 additions & 1 deletion lib/i18n/strings_ru_RU.g.dart
Original file line number Diff line number Diff line change
Expand Up @@ -1295,6 +1295,7 @@ class _TranslationsMisskeyRuRu extends TranslationsMisskeyEnUs {
@override String get tosAndPrivacyPolicy => 'Условия использования и политика конфиденциальности';
@override String get avatarDecorations => 'Украшения для аватара';
@override String get attach => 'Прикрепить';
@override String get detachAll => 'Убрать всё';
@override String get angle => 'Угол';
@override String get flip => 'Переворот';
@override String get showAvatarDecorations => 'Показать украшения для аватара';
Expand Down Expand Up @@ -1333,7 +1334,7 @@ class _TranslationsMisskeyRuRu extends TranslationsMisskeyEnUs {
@override String get performance => 'Производительность';
@override String get modified => 'Изменено';
@override String get signinWithPasskey => 'Войдите в систему, используя свой пароль';
@override String get unknownWebAuthnKey => 'Не известный ключ ';
@override String get unknownWebAuthnKey => 'Неизвестный ключ';
@override String get passkeyVerificationFailed => 'Ошибка проверка ключа доступа ';
@override String get messageToFollower => 'Сообщение подписчикам';
@override String get testCaptchaWarning => 'Эта функция предназначена для тестирования CAPTCHA. <strong>Не использовать это в рабочей среде</strong>';
Expand All @@ -1348,8 +1349,11 @@ class _TranslationsMisskeyRuRu extends TranslationsMisskeyEnUs {
@override String get federationDisabled => 'Федерация отключена для этого сервера. Вы не можете взаимодействовать с пользователями на других серверах.';
@override String get draft => 'Черновик';
@override String get markAsSensitiveConfirm => 'Отметить контент как чувствительный?';
@override String get preferences => 'Основное';
@override String get resetToDefaultValue => 'Сбросить настройки до стандартных';
@override String get syncBetweenDevices => 'Синхронизировать между устройствами';
@override String get postForm => 'Форма отправки';
@override String get textCount => 'Количество символов';
@override String get information => 'Описание';
@override String get inMinutes => 'мин';
@override String get inDays => 'сут';
Expand Down Expand Up @@ -1449,6 +1453,9 @@ class _TranslationsMisskeySettingsRuRu extends TranslationsMisskeySettingsEnUs {

// Translations
@override String get webhook => 'Вебхук';
@override String get preferencesBanner => 'Вы можете настроить общее поведение клиента по вашим предпочтениям';
@override String get timelineAndNote => 'Лента и заметки';
@override late final _TranslationsMisskeySettingsChatRuRu chat_ = _TranslationsMisskeySettingsChatRuRu._(_root);
}

// Path: misskey.delivery_
Expand Down Expand Up @@ -2607,6 +2614,17 @@ class _TranslationsMisskeyImageEffectorRuRu extends TranslationsMisskeyImageEffe
@override late final _TranslationsMisskeyImageEffectorFxPropsRuRu fxProps_ = _TranslationsMisskeyImageEffectorFxPropsRuRu._(_root);
}

// Path: misskey.settings_.chat_
class _TranslationsMisskeySettingsChatRuRu extends TranslationsMisskeySettingsChatEnUs {
_TranslationsMisskeySettingsChatRuRu._(TranslationsRuRu root) : this._root = root, super.internal(root);

final TranslationsRuRu _root; // ignore: unused_field

// Translations
@override String get showSenderName => 'Показывать имя отправителя';
@override String get sendOnEnter => 'Использовать Enter для отправки';
}

// Path: misskey.delivery_.type_
class _TranslationsMisskeyDeliveryTypeRuRu extends TranslationsMisskeyDeliveryTypeEnUs {
_TranslationsMisskeyDeliveryTypeRuRu._(TranslationsRuRu root) : this._root = root, super.internal(root);
Expand Down Expand Up @@ -2728,6 +2746,8 @@ class _TranslationsMisskeyAchievementsTypesRuRu extends TranslationsMisskeyAchie
@override late final _TranslationsMisskeyAchievementsTypesLoggedInOnNewYearsDayRuRu loggedInOnNewYearsDay_ = _TranslationsMisskeyAchievementsTypesLoggedInOnNewYearsDayRuRu._(_root);
@override late final _TranslationsMisskeyAchievementsTypesCookieClickedRuRu cookieClicked_ = _TranslationsMisskeyAchievementsTypesCookieClickedRuRu._(_root);
@override late final _TranslationsMisskeyAchievementsTypesBrainDiverRuRu brainDiver_ = _TranslationsMisskeyAchievementsTypesBrainDiverRuRu._(_root);
@override late final _TranslationsMisskeyAchievementsTypesBubbleGameExplodingHeadRuRu bubbleGameExplodingHead_ = _TranslationsMisskeyAchievementsTypesBubbleGameExplodingHeadRuRu._(_root);
@override late final _TranslationsMisskeyAchievementsTypesBubbleGameDoubleExplodingHeadRuRu bubbleGameDoubleExplodingHead_ = _TranslationsMisskeyAchievementsTypesBubbleGameDoubleExplodingHeadRuRu._(_root);
}

// Path: misskey.role_.priority_
Expand Down Expand Up @@ -3861,6 +3881,28 @@ class _TranslationsMisskeyAchievementsTypesBrainDiverRuRu extends TranslationsMi
@override String get flavor => 'Мисски-Мисски Ла-Ту-Ма';
}

// Path: misskey.achievements_.types_.bubbleGameExplodingHead_
class _TranslationsMisskeyAchievementsTypesBubbleGameExplodingHeadRuRu extends TranslationsMisskeyAchievementsTypesBubbleGameExplodingHeadEnUs {
_TranslationsMisskeyAchievementsTypesBubbleGameExplodingHeadRuRu._(TranslationsRuRu root) : this._root = root, super.internal(root);

final TranslationsRuRu _root; // ignore: unused_field

// Translations
@override String get title => '🤯';
@override String get description => 'Самый большой объект в Bubble game';
}

// Path: misskey.achievements_.types_.bubbleGameDoubleExplodingHead_
class _TranslationsMisskeyAchievementsTypesBubbleGameDoubleExplodingHeadRuRu extends TranslationsMisskeyAchievementsTypesBubbleGameDoubleExplodingHeadEnUs {
_TranslationsMisskeyAchievementsTypesBubbleGameDoubleExplodingHeadRuRu._(TranslationsRuRu root) : this._root = root, super.internal(root);

final TranslationsRuRu _root; // ignore: unused_field

// Translations
@override String get title => 'Двойной🤯';
@override String get description => 'Два самых больших объекта в Bubble game одновременно!';
}

// Path: misskey.pages_.blocks.note_
class _TranslationsMisskeyPagesBlocksNoteRuRu extends TranslationsMisskeyPagesBlocksNoteEnUs {
_TranslationsMisskeyPagesBlocksNoteRuRu._(TranslationsRuRu root) : this._root = root, super.internal(root);
Expand Down
4 changes: 2 additions & 2 deletions pubspec.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1983,8 +1983,8 @@ packages:
dependency: "direct overridden"
description:
path: unifiedpush_android
ref: "90316c05d59da5b31c9861992b07b572e859676f"
resolved-ref: "90316c05d59da5b31c9861992b07b572e859676f"
ref: "05596c24df16c1249acaf3741f5811b90ef9d2a5"
resolved-ref: "05596c24df16c1249acaf3741f5811b90ef9d2a5"
url: "https://github.com/poppingmoon/flutter-connector"
source: git
version: "3.1.1"
Expand Down
4 changes: 2 additions & 2 deletions pubspec.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name: aria
description: "A client app for Misskey, a federated social media platform."
publish_to: "none"
version: 1.3.8+77
version: 1.3.9+78

environment:
sdk: ">=3.9.0 <4.0.0"
Expand Down Expand Up @@ -155,7 +155,7 @@ dependency_overrides:
unifiedpush_android:
git:
url: https://github.com/poppingmoon/flutter-connector
ref: 90316c05d59da5b31c9861992b07b572e859676f
ref: 05596c24df16c1249acaf3741f5811b90ef9d2a5
path: unifiedpush_android
webcrypto:
git:
Expand Down
8 changes: 4 additions & 4 deletions rust/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading