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

Merge branch 'rebranding' into 15-code-refactoring-constants

Browse source
This commit is contained in:
Ismail Gulek 2020-07-03 15:15:23 +03:00
commit 5bc785dd19
51 changed files with 84 additions and 190 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Riot.xcodeproj/project.pbxproj
View file

@ -6325,7 +6325,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = NO;
CURRENT_PROJECT_VERSION = 0.11.6;
CURRENT_PROJECT_VERSION = 1.0.0;
DEFINES_MODULE = YES;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
@ -6345,7 +6345,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 0.11.6;
MARKETING_VERSION = 1.0.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@ -6383,7 +6383,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
COPY_PHASE_STRIP = YES;
CURRENT_PROJECT_VERSION = 0.11.6;
CURRENT_PROJECT_VERSION = 1.0.0;
DEFINES_MODULE = YES;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
@ -6396,7 +6396,7 @@
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
MARKETING_VERSION = 0.11.6;
MARKETING_VERSION = 1.0.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_COMPILATION_MODE = wholemodule;

44
Riot/Assets/Base.lproj/Main.storyboard
View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="16097" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES" initialViewController="H1p-Uh-vWS">
<device id="retina4_7" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<scenes>
@ -174,7 +174,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" tag="2" image="tab_people" selectedImage="tab_people_selected" id="edr-fK-bgM">
<tabBarItem key="tabBarItem" tag="2" image="tab_people" id="edr-fK-bgM">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="TabBarItemPeople"/>
</userDefinedRuntimeAttributes>
@ -200,7 +200,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" tag="1" image="tab_favourites" selectedImage="tab_favourites_selected" id="UVh-Xd-zDZ">
<tabBarItem key="tabBarItem" tag="1" image="tab_favourites" id="UVh-Xd-zDZ">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="TabBarItemFavourites"/>
</userDefinedRuntimeAttributes>
@ -244,7 +244,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" title="" image="tab_home" selectedImage="tab_home_selected" id="hNI-yH-EXj">
<tabBarItem key="tabBarItem" title="" image="tab_home" id="hNI-yH-EXj">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="TabBarItemHome"/>
</userDefinedRuntimeAttributes>
@ -312,7 +312,7 @@
<viewControllerLayoutGuide type="bottom" id="gbK-Nm-HUT"/>
</layoutGuides>
<view key="view" contentMode="scaleToFill" id="wIi-Yi-2pi">
<rect key="frame" x="0.0" y="0.0" width="375" height="647"/>
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</view>
@ -435,7 +435,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="logo" translatesAutoresizingMaskIntoConstraints="NO" id="6LG-qc-7jf">
<rect key="frame" x="67.5" y="232.5" width="240" height="202"/>
<rect key="frame" x="127.5" y="283" width="120" height="101"/>
</imageView>
</subviews>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
@ -463,7 +463,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
</view>
<tabBarItem key="tabBarItem" title="" image="tab_groups" selectedImage="tab_groups_selected" id="5x2-xc-uIB"/>
<tabBarItem key="tabBarItem" title="" image="tab_groups" id="5x2-xc-uIB"/>
</viewController>
<placeholder placeholderIdentifier="IBFirstResponder" id="xpc-LV-krz" userLabel="First Responder" sceneMemberID="firstResponder"/>
</objects>
@ -482,7 +482,7 @@
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
</view>
<tabBarItem key="tabBarItem" tag="3" image="tab_rooms" selectedImage="tab_rooms" id="7eS-Ei-00V">
<tabBarItem key="tabBarItem" tag="3" image="tab_rooms" id="7eS-Ei-00V">
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="string" keyPath="accessibilityIdentifier" value="TabBarItemRooms"/>
</userDefinedRuntimeAttributes>
@ -589,21 +589,6 @@
<point key="canvasLocation" x="4174" y="-2050"/>
</scene>
</scenes>
<resources>
<image name="apps-icon" width="24" height="24"/>
<image name="logo" width="120" height="101"/>
<image name="search_icon" width="22" height="22"/>
<image name="settings_icon" width="24" height="24"/>
<image name="tab_favourites" width="25" height="25"/>
<image name="tab_favourites_selected" width="25" height="25"/>
<image name="tab_groups" width="25" height="25"/>
<image name="tab_groups_selected" width="25" height="25"/>
<image name="tab_home" width="25" height="25"/>
<image name="tab_home_selected" width="25" height="25"/>
<image name="tab_people" width="25" height="25"/>
<image name="tab_people_selected" width="25" height="25"/>
<image name="tab_rooms" width="25" height="25"/>
</resources>
<inferredMetricsTieBreakers>
<segue reference="Tfl-tq-LQp"/>
<segue reference="fIR-e3-ssz"/>
@ -611,4 +596,15 @@
<segue reference="vCz-dl-6xQ"/>
<segue reference="cUw-vU-gJq"/>
</inferredMetricsTieBreakers>
<resources>
<image name="apps-icon" width="24" height="24"/>
<image name="logo" width="120" height="101"/>
<image name="search_icon" width="22" height="22"/>
<image name="settings_icon" width="24" height="24"/>
<image name="tab_favourites" width="24" height="24"/>
<image name="tab_groups" width="24" height="24"/>
<image name="tab_home" width="20" height="23.5"/>
<image name="tab_people" width="24" height="24"/>
<image name="tab_rooms" width="24" height="24"/>
</resources>
</document>

12
Riot/Assets/Images.xcassets/Search/search_icon.imageset/Contents.json vendored
View file

@ -1,23 +1,23 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "search_icon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "search_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "search_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
}
}
}

BIN
Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 472 B

After

Width:  |  Height:  |  Size: 344 B

BIN
Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 626 B

BIN
Riot/Assets/Images.xcassets/Search/search_icon.imageset/search_icon@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 928 B

15
Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "settings_icon.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "settings_icon@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "settings_icon@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 726 B

After

Width:  |  Height:  |  Size: 390 B

BIN
Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 727 B

BIN
Riot/Assets/Images.xcassets/Settings/settings_icon.imageset/settings_icon@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

15
Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_favourites.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_favourites@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_favourites@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 558 B

After

Width:  |  Height:  |  Size: 354 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 594 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites.imageset/tab_favourites@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 844 B

23
Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_favourites_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_favourites_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_favourites_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 485 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 889 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_favourites_selected.imageset/tab_favourites_selected@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.2 KiB

15
Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_groups.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_groups@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_groups@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 570 B

After

Width:  |  Height:  |  Size: 450 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 942 B

After

Width:  |  Height:  |  Size: 857 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups.imageset/tab_groups@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 1.3 KiB

23
Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_groups_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_groups_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_groups_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 514 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 999 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_groups_selected.imageset/tab_groups_selected@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.6 KiB

15
Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_home.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_home@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_home@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 270 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 674 B

After

Width:  |  Height:  |  Size: 377 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home.imageset/tab_home@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 513 B

23
Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_home_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_home_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_home_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 418 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 716 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_home_selected.imageset/tab_home_selected@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1.1 KiB

15
Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_people.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_people@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_people@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 438 B

After

Width:  |  Height:  |  Size: 413 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 625 B

After

Width:  |  Height:  |  Size: 766 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people.imageset/tab_people@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.1 KiB

23
Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_people_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_people_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_people_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 393 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 657 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_people_selected.imageset/tab_people_selected@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 1 KiB

15
Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/Contents.json vendored
View file

@ -1,23 +1,26 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_rooms.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_rooms@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_rooms@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
"author" : "xcode",
"version" : 1
},
"properties" : {
"template-rendering-intent" : "template"
}
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 396 B

After

Width:  |  Height:  |  Size: 443 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@2x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 606 B

After

Width:  |  Height:  |  Size: 780 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms.imageset/tab_rooms@3x.png vendored
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1,016 B

After

Width:  |  Height:  |  Size: 1.1 KiB

23
Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/Contents.json vendored
View file

@ -1,23 +0,0 @@
{
"images" : [
{
"idiom" : "universal",
"filename" : "tab_rooms_selected.png",
"scale" : "1x"
},
{
"idiom" : "universal",
"filename" : "tab_rooms_selected@2x.png",
"scale" : "2x"
},
{
"idiom" : "universal",
"filename" : "tab_rooms_selected@3x.png",
"scale" : "3x"
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 397 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@2x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 642 B

BIN
Riot/Assets/Images.xcassets/TabBar/tab_rooms_selected.imageset/tab_rooms_selected@3x.png vendored
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 952 B

5
Riot/Generated/Images.swift
View file

@ -111,15 +111,10 @@ internal enum Asset {
internal static let removeIconPink = ImageAsset(name: "remove_icon_pink")
internal static let settingsIcon = ImageAsset(name: "settings_icon")
internal static let tabFavourites = ImageAsset(name: "tab_favourites")
internal static let tabFavouritesSelected = ImageAsset(name: "tab_favourites_selected")
internal static let tabGroups = ImageAsset(name: "tab_groups")
internal static let tabGroupsSelected = ImageAsset(name: "tab_groups_selected")
internal static let tabHome = ImageAsset(name: "tab_home")
internal static let tabHomeSelected = ImageAsset(name: "tab_home_selected")
internal static let tabPeople = ImageAsset(name: "tab_people")
internal static let tabPeopleSelected = ImageAsset(name: "tab_people_selected")
internal static let tabRooms = ImageAsset(name: "tab_rooms")
internal static let tabRoomsSelected = ImageAsset(name: "tab_rooms_selected")
}
internal enum SharedImages {
internal static let animatedLogo0 = ImageAsset(name: "animatedLogo-0")