Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-28 15:22:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into fixes/modern-key-syntax

Browse source
This commit is contained in:
manuroe 2019-01-10 10:58:24 +01:00 committed by GitHub
commit 989e749cc8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 46 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
CHANGES.rst
View file

@ -1,9 +1,17 @@
Changes in 0.7.x (2019-xx-xx)
===============================================
Improvements:
* Use modern literals and array/dictionary syntax where possible (PR #2160).
Bug fix:
* Use white scroll bar on dark themes (#2158)
Changes in 0.7.11 (2019-01-08)
===============================================
Improvements:
* Upgrade MatrixKit version (v0.9.3).
* Use modern literals and array/dictionary syntax where possible (PR #2160).
* Fix almost all the warnings caused by -Wstrict-prototypes, thanks to @fridtjof (PR #2155).
Changes in 0.7.10 (2019-01-04)
@ -16,10 +24,10 @@ Changes in 0.7.9 (2019-01-04)
===============================================
Improvements:
* Upgrade MatrixKit version (v0.9.2).
* Upgrade MatrixKit version (v0.9.2).
Bug fix:
* Registration: email or phone number is no more skippable (#2140).
* Registration: email or phone number is no more skippable (#2140).
Changes in 0.7.8 (2018-12-12)
===============================================

2
Riot.xcodeproj/project.pbxproj
View file

@ -2413,6 +2413,7 @@
);
path = Riot;
sourceTree = "<group>";
usesTabs = 0;
};
F083BB0E1E7009EC00A9B29C /* Assets */ = {
isa = PBXGroup;
@ -2513,6 +2514,7 @@
A237FB70534FB8ADA0D7CFEE /* Pods */,
);
sourceTree = "<group>";
usesTabs = 0;
};
F094A9A31B78D8F000B1FBBF /* Products */ = {
isa = PBXGroup;

2
Riot/Assets/pt_BR.lproj/InfoPlist.strings
View file

@ -2,4 +2,4 @@
"NSCameraUsageDescription" = "A câmera será usada para tomar fotos e vídeos, e também para a realização de chamadas de vídeo.";
"NSPhotoLibraryUsageDescription" = "A galeria de fotos é usada para o envio de fotos e vídeos.";
"NSMicrophoneUsageDescription" = "O microfone é usado para gravar vídeos e fazer chamadas, tanto de áudio como de vídeo.";
"NSContactsUsageDescription" = "O cadernos de contatos é usado para fazer busca de usuárias/os no Riot a partir do e-mail ou do número de telefone.";
"NSContactsUsageDescription" = "Para mostrar a você quais de seus contatos já estão usando o Riot ou o Matrix, podemos enviar os endereços de e-mail e números de telefone em seu catálogo de endereços para o Matrix Identity Server. A New Vector não armazena esses dados ou usa-os para qualquer outra finalidade. Para mais informações, consulte a página da política de privacidade nas configurações do aplicativo.";

25
Riot/Assets/pt_BR.lproj/Vector.strings
View file

@ -158,4 +158,27 @@
"room_creation_title" = "Nova Sala";
"room_creation_account" = "Conta";
// Room recents
"room_recents_directory_section" = "LISTA PÚBLICA DE SALAS";
"room_recents_directory_section" = "DIRETÓRIO DE SALAS";
"directory_search_results_title" = "Procurar nos resultados do diretório";
"directory_search_fail" = "Falha ao buscar dados";
"auth_accept_policies" = "Por favor, revise e aceite as políticas deste homeserver:";
"room_recents_server_notice_section" = "ALERTAS DO SISTEMA";
"room_participants_remove_third_party_invite_msg" = "Remover convite de terceiros ainda não é suportado até que a API exista";
"room_participants_invite_prompt_title" = "Confirmação";
"room_participants_invite_prompt_msg" = "Tem certeza de que deseja convidar %@ para este chat?";
"room_participants_filter_room_members" = "Filtrar membros da sala";
"room_participants_invite_another_user" = "Pesquisar / convidar por ID do usuário, nome ou e-mail";
"room_participants_invite_malformed_id_title" = "Erro no Convite";
"room_participants_invited_section" = "CONVIDADO";
"room_participants_online" = "Online";
"room_participants_offline" = "Offline";
"room_participants_unknown" = "Desconhecido";
"room_participants_idle" = "Ocioso";
"room_participants_now" = "agora";
"room_participants_ago" = "atrás";
"room_participants_action_section_admin_tools" = "Ferramentas Administrativas";
"room_participants_action_section_direct_chats" = "bate-papos diretos";
"room_participants_action_section_devices" = "Dispositivos";
"room_participants_action_section_other" = "Outros";
"room_participants_action_invite" = "Convidar";
"room_participants_action_leave" = "Deixar esta sala";

12
Riot/Constants/RiotDesignValues.m
View file

@ -73,6 +73,7 @@ UIBarStyle kRiotDesignSearchBarStyle = UIBarStyleDefault;
UIColor *kRiotDesignSearchBarTintColor = nil;
UIKeyboardAppearance kRiotKeyboard;
UIScrollViewIndicatorStyle kRiotScrollBarStyle;
@implementation RiotDesignValues
@ -179,8 +180,8 @@ UIKeyboardAppearance kRiotKeyboard;
kRiotOverlayColor = [UIColor colorWithWhite:0.3 alpha:0.5];
kRiotKeyboardColor = kRiotColorDarkKeyboard;
[UITextField appearance].keyboardAppearance = UIKeyboardAppearanceDark;
kRiotKeyboard = UIKeyboardAppearanceDark;
kRiotScrollBarStyle = UIScrollViewIndicatorStyleWhite;
}
else if ([theme isEqualToString:@"black"])
{
@ -201,8 +202,8 @@ UIKeyboardAppearance kRiotKeyboard;
kRiotOverlayColor = [UIColor colorWithWhite:0.3 alpha:0.5];
kRiotKeyboardColor = kRiotColorDarkKeyboard;
[UITextField appearance].keyboardAppearance = UIKeyboardAppearanceDark;
kRiotKeyboard = UIKeyboardAppearanceDark;
kRiotScrollBarStyle = UIScrollViewIndicatorStyleWhite;
}
else
{
@ -222,11 +223,14 @@ UIKeyboardAppearance kRiotKeyboard;
kRiotAuxiliaryColor = kRiotColorSilver;
kRiotOverlayColor = [UIColor colorWithWhite:0.7 alpha:0.5];
kRiotKeyboardColor = kRiotColorLightKeyboard;
[UITextField appearance].keyboardAppearance = UIKeyboardAppearanceLight;
kRiotKeyboard = UIKeyboardAppearanceLight;
kRiotScrollBarStyle = UIScrollViewIndicatorStyleDefault;
}
[UITextField appearance].keyboardAppearance = kRiotKeyboard;
[UIScrollView appearance].indicatorStyle = kRiotScrollBarStyle;
[[NSNotificationCenter defaultCenter] postNotificationName:kRiotDesignValuesDidChangeThemeNotification object:nil];
}