Commit fc6aa44c authored by Felix Paul Kühne's avatar Felix Paul Kühne

add a basic indicator whether the media is unread or not

parent 4245fa55
......@@ -16,6 +16,7 @@
@property (nonatomic, strong) IBOutlet UIImageView *thumbnailView;
@property (nonatomic, strong) IBOutlet VLCLinearProgressIndicator *progressView;
@property (nonatomic, strong) IBOutlet UIButton *removeMediaButton;
@property (nonatomic, strong) IBOutlet UIImageView *mediaIsUnreadView;
@property (nonatomic, retain) MLFile *mediaObject;
......
......@@ -81,6 +81,8 @@
if (self.progressView.progress < 0.1f)
self.progressView.hidden = YES;
self.mediaIsUnreadView.hidden = !self.mediaObject.unread.intValue;
[self setNeedsDisplay];
}
......
......@@ -15,6 +15,7 @@
@property (nonatomic, strong) IBOutlet UILabel *subtitleLabel;
@property (nonatomic, strong) IBOutlet UIImageView *thumbnailView;
@property (nonatomic, strong) IBOutlet VLCLinearProgressIndicator*progressIndicator;
@property (nonatomic, strong) IBOutlet UIImageView *mediaIsUnreadView;
@property (nonatomic, retain) MLFile *mediaObject;
......
......@@ -69,6 +69,8 @@
if (self.progressIndicator.progress < 0.1f)
self.progressIndicator.hidden = YES;
self.mediaIsUnreadView.hidden = !self.mediaObject.unread.intValue;
[self setNeedsDisplay];
}
......
......@@ -181,11 +181,26 @@
</object>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
</object>
<object class="IBUIImageView" id="986363358">
<reference key="NSNextResponder" ref="93090196"/>
<int key="NSvFlags">297</int>
<string key="NSFrame">{{9, 3}, {22, 22}}</string>
<reference key="NSSuperview" ref="93090196"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="470328177"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBIPadFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">mediaUnread.png</string>
</object>
</object>
</array>
<string key="NSFrameSize">{298, 220}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="470328177"/>
<reference key="NSNextKeyView" ref="986363358"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
......@@ -279,6 +294,7 @@
<reference ref="610797449"/>
<reference ref="296556150"/>
<reference ref="863064291"/>
<reference ref="986363358"/>
</array>
<reference key="parent" ref="0"/>
</object>
......@@ -314,6 +330,11 @@
<reference key="object" ref="276503826"/>
<reference key="parent" ref="93090196"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">23</int>
<reference key="object" ref="986363358"/>
<reference key="parent" ref="93090196"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -326,6 +347,7 @@
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="23.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.CustomClassName">VLCPlaylistGridView</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="9.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -334,7 +356,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">22</int>
<int key="maxID">23</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -369,6 +391,7 @@
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="mediaIsUnreadView">UIImageView</string>
<string key="progressView">VLCLinearProgressIndicator</string>
<string key="removeMediaButton">UIButton</string>
<string key="subtitleLabel">UILabel</string>
......@@ -376,6 +399,10 @@
<string key="titleLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mediaIsUnreadView">
<string key="name">mediaIsUnreadView</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="progressView">
<string key="name">progressView</string>
<string key="candidateClassName">VLCLinearProgressIndicator</string>
......@@ -412,10 +439,10 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">DeleteButton.png</string>
<string key="NS.object.0">{29, 29}</string>
</object>
<dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="DeleteButton.png">{29, 29}</string>
<string key="mediaUnread.png">{25, 25}</string>
</dictionary>
<string key="IBCocoaTouchPluginVersion">2083</string>
</data>
</archive>
......@@ -58,7 +58,7 @@
<string key="NSFrame">{{137, 5}, {178, 42}}</string>
<reference key="NSSuperview" ref="162418872"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="442944742"/>
<reference key="NSNextKeyView" ref="775158982"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
......@@ -94,6 +94,7 @@
<string key="NSFrame">{{137, 60}, {178, 15}}</string>
<reference key="NSSuperview" ref="162418872"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIOpaque">NO</bool>
<bool key="IBUIClipsSubviews">YES</bool>
......@@ -133,6 +134,21 @@
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
</object>
<object class="IBUIImageView" id="775158982">
<reference key="NSNextResponder" ref="162418872"/>
<int key="NSvFlags">297</int>
<string key="NSFrame">{{293, 29}, {22, 22}}</string>
<reference key="NSSuperview" ref="162418872"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="442944742"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="IBUIUserInteractionEnabled">NO</bool>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<object class="NSCustomResource" key="IBUIImage">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">mediaUnread.png</string>
</object>
</object>
</array>
<string key="NSFrameSize">{320, 79}</string>
<reference key="NSSuperview" ref="962619467"/>
......@@ -152,6 +168,10 @@
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="162418872"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<object class="NSColor" key="IBUIBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
<reference key="IBUIContentView" ref="162418872"/>
<string key="IBUIReuseIdentifier">PlaylistCell</string>
......@@ -192,6 +212,14 @@
</object>
<int key="connectionID">19</int>
</object>
<object class="IBConnectionRecord">
<object class="IBCocoaTouchOutletConnection" key="connection">
<string key="label">mediaIsUnreadView</string>
<reference key="source" ref="962619467"/>
<reference key="destination" ref="775158982"/>
</object>
<int key="connectionID">21</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
......@@ -220,6 +248,7 @@
<reference ref="207506414"/>
<reference ref="625431089"/>
<reference ref="442944742"/>
<reference ref="775158982"/>
</array>
<reference key="parent" ref="0"/>
</object>
......@@ -243,6 +272,11 @@
<reference key="object" ref="442944742"/>
<reference key="parent" ref="962619467"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">20</int>
<reference key="object" ref="775158982"/>
<reference key="parent" ref="962619467"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
......@@ -251,6 +285,7 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="18.CustomClassName">VLCLinearProgressIndicator</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="20.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="3.CustomClassName">VLCPlaylistTableViewCell</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
<string key="4.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
......@@ -261,7 +296,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">19</int>
<int key="maxID">21</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
......@@ -277,12 +312,17 @@
<string key="className">VLCPlaylistTableViewCell</string>
<string key="superclassName">UITableViewCell</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="mediaIsUnreadView">UIImageView</string>
<string key="progressIndicator">VLCLinearProgressIndicator</string>
<string key="subtitleLabel">UILabel</string>
<string key="thumbnailView">UIImageView</string>
<string key="titleLabel">UILabel</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="mediaIsUnreadView">
<string key="name">mediaIsUnreadView</string>
<string key="candidateClassName">UIImageView</string>
</object>
<object class="IBToOneOutletInfo" key="progressIndicator">
<string key="name">progressIndicator</string>
<string key="candidateClassName">VLCLinearProgressIndicator</string>
......@@ -315,6 +355,10 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
<string key="NS.key.0">mediaUnread.png</string>
<string key="NS.object.0">{25, 25}</string>
</object>
<string key="IBCocoaTouchPluginVersion">2083</string>
</data>
</archive>
......@@ -86,6 +86,8 @@
7D6B08BF174A811E00A05173 /* vlc@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08BE174A811E00A05173 /* vlc@2x.png */; };
7D6B08C2174A831900A05173 /* vlc-xmas.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08C0174A831900A05173 /* vlc-xmas.png */; };
7D6B08C3174A831900A05173 /* vlc-xmas@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08C1174A831900A05173 /* vlc-xmas@2x.png */; };
7D6B08C7174A910500A05173 /* mediaUnread@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08C6174A910500A05173 /* mediaUnread@2x.png */; };
7D6B08C9174A927700A05173 /* mediaUnread.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6B08C8174A927700A05173 /* mediaUnread.png */; };
7D6BA10E1747F26300C0E203 /* VLCPasscodeLockViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 7D6BA10C1747F26300C0E203 /* VLCPasscodeLockViewController.m */; };
7D6BA10F1747F26300C0E203 /* VLCPasscodeLockViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA10D1747F26300C0E203 /* VLCPasscodeLockViewController.xib */; };
7D6BA1121748EA8300C0E203 /* playback_background.png in Resources */ = {isa = PBXBuildFile; fileRef = 7D6BA1101748EA8300C0E203 /* playback_background.png */; };
......@@ -276,6 +278,8 @@
7D6B08BE174A811E00A05173 /* vlc@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vlc@2x.png"; sourceTree = "<group>"; };
7D6B08C0174A831900A05173 /* vlc-xmas.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vlc-xmas.png"; sourceTree = "<group>"; };
7D6B08C1174A831900A05173 /* vlc-xmas@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "vlc-xmas@2x.png"; sourceTree = "<group>"; };
7D6B08C6174A910500A05173 /* mediaUnread@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "mediaUnread@2x.png"; sourceTree = "<group>"; };
7D6B08C8174A927700A05173 /* mediaUnread.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = mediaUnread.png; sourceTree = "<group>"; };
7D6BA10B1747F26300C0E203 /* VLCPasscodeLockViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VLCPasscodeLockViewController.h; sourceTree = "<group>"; };
7D6BA10C1747F26300C0E203 /* VLCPasscodeLockViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VLCPasscodeLockViewController.m; sourceTree = "<group>"; };
7D6BA10D1747F26300C0E203 /* VLCPasscodeLockViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = VLCPasscodeLockViewController.xib; path = ../Resources/VLCPasscodeLockViewController.xib; sourceTree = "<group>"; };
......@@ -524,6 +528,8 @@
7D10BC661743F9AC00DA7059 /* Library View */ = {
isa = PBXGroup;
children = (
7D6B08C8174A927700A05173 /* mediaUnread.png */,
7D6B08C6174A910500A05173 /* mediaUnread@2x.png */,
A7FF9F3D17428C1900999819 /* DeleteButton.png */,
A7FF9F3F17428C3800999819 /* DeleteButton@2x.png */,
);
......@@ -926,6 +932,8 @@
7D6B08BF174A811E00A05173 /* vlc@2x.png in Resources */,
7D6B08C2174A831900A05173 /* vlc-xmas.png in Resources */,
7D6B08C3174A831900A05173 /* vlc-xmas@2x.png in Resources */,
7D6B08C7174A910500A05173 /* mediaUnread@2x.png in Resources */,
7D6B08C9174A927700A05173 /* mediaUnread.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment