Matrix/element-ios
Matrix/element-ios
1
0
Fork 0
mirror of https://github.com/vector-im/element-ios.git synced 2024-09-30 08:12:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16 from vector-im/user_settings_page

Browse source 
Add the vector settings page
This commit is contained in:
Yannick LE COLLEN 2015-12-08 17:40:23 +01:00
commit 087305448a
4 changed files with 925 additions and 169 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
Vector/Assets/en.lproj/Vector.strings
View file

@ -28,6 +28,10 @@
"leave" = "Leave"; "leave" = "Leave";
"remove" = "Remove"; "remove" = "Remove";
"retry" = "Retry"; "retry" = "Retry";
"on" = "On";
"off" = "Off";
"cancel" = "Cancel";
"save" = "Save";
// Authentication // Authentication
"auth_sign_in" = "Sign in"; "auth_sign_in" = "Sign in";
@ -87,6 +91,41 @@
"settings_title_config" = "Configuration"; "settings_title_config" = "Configuration";
"settings_clear_cache" = "Clear cache"; "settings_clear_cache" = "Clear cache";
"settings_user_settings" = "USER SETTINGS";
"settings_notifications_settings" = "NOTIFICATION SETTINGS";
"settings_other" = "OTHER";
"settings_sign_out" = "Sign Out";
"settings_profile_picture" = "Profile Picture";
"settings_display_name" = "Display Name";
"settings_first_name" = "First Name";
"settings_surname" = "Surname";
"settings_email_address" = "Email Address";
"settings_change_password" = "Change password";
"settings_phone_number" = "Phone Number";
"settings_night_mode" = "Night Mode";
"settings_enable_all_notif" = "Enable all notifications";
"settings_general_messages" = "General messages";
"settings_messages_my_display_name" = "Msg containing my display name";
"settings_messages_my_user_name" = "Msg containing my user name";
"settings_messages_sent_to_me" = "Messages sent to me";
"settings_invited_to_room" = "When i'm invited to a room";
"settings_join_leave_rooms" = "When people join or leave rooms";
"settings_call_invitations" = "Call invitations";
"settings_version" = "Version %@";
"settings_term_conditions" = "Terms & conditions";
"settings_privacy_policy" = "Privacy Policy";
"settings_clear_cache" = "Clear cache";
"settings_change_password" = "Change password";
"settings_old_password" = "old password";
"settings_new_password" = "new password";
"settings_confirm_password" = "confirm password";
"settings_fail_to_update_password" = "Fail to update password";
"settings_password_updated" = "Your password has been updated";
// Room Details // Room Details
"room_details_title" = "Room Details"; "room_details_title" = "Room Details";
"room_details_room_name" = "Room Name"; "room_details_room_name" = "Room Name";

2
Vector/Utils/AvatarGenerator.m
View file

@ -107,7 +107,7 @@ static UILabel* backgroundLabel = nil;
// the images are cached to avoid create them several times // the images are cached to avoid create them several times
// the key is <first upper character><index in the colors array> // the key is <first upper character><index in the colors array>
// it should be smaller than using the text as a key // it should be smaller than using the text as a key
NSString* key = [NSString stringWithFormat:@"%@%ld", text, colorIndex]; NSString* key = [NSString stringWithFormat:@"%@%tu", text, colorIndex];
if (!imageByKeyDict) if (!imageByKeyDict)
{ {

5
Vector/ViewController/SettingsViewController.h
View file

@ -16,7 +16,10 @@
#import <MatrixKit/MatrixKit.h> #import <MatrixKit/MatrixKit.h>
@interface SettingsViewController : MXKTableViewController #import "MediaPickerViewController.h"
@interface SettingsViewController : MXKTableViewController<MediaPickerViewControllerDelegate>
@end @end

1030
Vector/ViewController/SettingsViewController.m
View file

File diff suppressed because it is too large Load diff