diff --git a/matrixConsole/matrixConsole.xcodeproj/project.pbxproj b/matrixConsole/matrixConsole.xcodeproj/project.pbxproj index 0add2a161..104d8d54d 100644 --- a/matrixConsole/matrixConsole.xcodeproj/project.pbxproj +++ b/matrixConsole/matrixConsole.xcodeproj/project.pbxproj @@ -50,6 +50,8 @@ F03EF5FF19F1762000A0EE52 /* RoomMessageTableCell.m in Sources */ = {isa = PBXBuildFile; fileRef = F03EF5FE19F1762000A0EE52 /* RoomMessageTableCell.m */; }; F0465AFA1A251F85003639F9 /* RoomMessage.m in Sources */ = {isa = PBXBuildFile; fileRef = F0465AF91A251F85003639F9 /* RoomMessage.m */; }; F04A8AD81A3B3DF4008AC915 /* RoomTitleView.m in Sources */ = {isa = PBXBuildFile; fileRef = F04A8AD71A3B3DF4008AC915 /* RoomTitleView.m */; }; + F04B2DA51A977A9B00EEA4C8 /* tab_settings.png in Resources */ = {isa = PBXBuildFile; fileRef = F04B2DA11A977A9B00EEA4C8 /* tab_settings.png */; }; + F04B2DA61A977A9B00EEA4C8 /* tab_settings@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F04B2DA21A977A9B00EEA4C8 /* tab_settings@2x.png */; }; F052377C1A7289F00079F3E0 /* APNSHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = F05237791A7289F00079F3E0 /* APNSHandler.m */; }; F05237801A728A010079F3E0 /* MXCAlert.m in Sources */ = {isa = PBXBuildFile; fileRef = F052377F1A728A010079F3E0 /* MXCAlert.m */; }; F05237831A728A0A0079F3E0 /* MXCGrowingTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = F05237821A728A0A0079F3E0 /* MXCGrowingTextView.m */; }; @@ -165,6 +167,8 @@ F0465AF91A251F85003639F9 /* RoomMessage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomMessage.m; sourceTree = ""; }; F04A8AD61A3B3DF4008AC915 /* RoomTitleView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RoomTitleView.h; sourceTree = ""; }; F04A8AD71A3B3DF4008AC915 /* RoomTitleView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RoomTitleView.m; sourceTree = ""; }; + F04B2DA11A977A9B00EEA4C8 /* tab_settings.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = tab_settings.png; sourceTree = ""; }; + F04B2DA21A977A9B00EEA4C8 /* tab_settings@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "tab_settings@2x.png"; sourceTree = ""; }; F05237781A7289F00079F3E0 /* APNSHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APNSHandler.h; sourceTree = ""; }; F05237791A7289F00079F3E0 /* APNSHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = APNSHandler.m; sourceTree = ""; }; F052377E1A728A010079F3E0 /* MXCAlert.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MXCAlert.h; sourceTree = ""; }; @@ -272,6 +276,8 @@ F024098119E7D177006E741B /* tab_recents@2x.png */, F0CEA5B019E6898800E47915 /* tab_home.ico */, F0CEA5AD19E6895E00E47915 /* tab_recents.png */, + F04B2DA11A977A9B00EEA4C8 /* tab_settings.png */, + F04B2DA21A977A9B00EEA4C8 /* tab_settings@2x.png */, F01628BC19E29C660071C473 /* default-profile.png */, F01628BE19E29C660071C473 /* logo.png */, F0CEA5AC19E6895E00E47915 /* logoHighRes.png */, @@ -545,6 +551,7 @@ F07A80E419DD9DE700B621A1 /* Main.storyboard in Resources */, F013EEEC1A40D437002BB093 /* matrixConsole-Defaults.plist in Resources */, F07A80E919DD9DE700B621A1 /* LaunchScreen.xib in Resources */, + F04B2DA51A977A9B00EEA4C8 /* tab_settings.png in Resources */, F0CEA5AF19E6895E00E47915 /* tab_recents.png in Resources */, F030974D1A6580D70090BC00 /* icon_keyboard@2x.png in Resources */, 717629521A7A682A00927125 /* countryCodes.plist in Resources */, @@ -561,6 +568,7 @@ 3198D9E11A68338B00556695 /* Localizable.strings in Resources */, F07A80E619DD9DE700B621A1 /* Images.xcassets in Resources */, F08B6FCC1A1DE7F80094A35B /* matrixConsole.jpg in Resources */, + F04B2DA61A977A9B00EEA4C8 /* tab_settings@2x.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/matrixConsole/matrixConsole/Assets/tab_recents.png b/matrixConsole/matrixConsole/Assets/tab_recents.png old mode 100644 new mode 100755 index 005b2265e..1d1da3a3d Binary files a/matrixConsole/matrixConsole/Assets/tab_recents.png and b/matrixConsole/matrixConsole/Assets/tab_recents.png differ diff --git a/matrixConsole/matrixConsole/Assets/tab_settings.png b/matrixConsole/matrixConsole/Assets/tab_settings.png new file mode 100644 index 000000000..bf96bdb02 Binary files /dev/null and b/matrixConsole/matrixConsole/Assets/tab_settings.png differ diff --git a/matrixConsole/matrixConsole/Assets/tab_settings@2x.png b/matrixConsole/matrixConsole/Assets/tab_settings@2x.png new file mode 100644 index 000000000..72bbabfd4 Binary files /dev/null and b/matrixConsole/matrixConsole/Assets/tab_settings@2x.png differ diff --git a/matrixConsole/matrixConsole/Base.lproj/Main.storyboard b/matrixConsole/matrixConsole/Base.lproj/Main.storyboard index 640ddc290..9ac208e9c 100644 --- a/matrixConsole/matrixConsole/Base.lproj/Main.storyboard +++ b/matrixConsole/matrixConsole/Base.lproj/Main.storyboard @@ -1853,7 +1853,7 @@ - + @@ -2137,6 +2137,7 @@ +