dev

iOSClient/Main/CCDetail.h

@@ -32,6 +32,7 @@
 #import "CCGraphics.h"
 
 @class tableMetadata;
+@class NCViewerImagemeter;
 
 @interface CCDetail : UIViewController <MWPhotoBrowserDelegate, ReaderViewControllerDelegate>
 
@@ -57,6 +58,10 @@
 @property (nonatomic, strong) ReaderViewController *readerPDFViewController;
 @property (nonatomic, strong) NSString *passwordPDF;
 
+// IM
+@property (nonatomic, strong) NCViewerImagemeter *imagemeter;
+
+
 @property(nonatomic, weak) IBOutlet UIImageView *imageBackground;
 
 - (void)changeToDisplayMode;

iOSClient/Main/CCDetail.m

@@ -140,6 +140,18 @@
     }
 }
 
+- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id<UIViewControllerTransitionCoordinator>)coordinator
+{
+    [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
+    
+    [coordinator animateAlongsideTransition:nil completion:^(id<UIViewControllerTransitionCoordinatorContext> context) {
+        
+        if (self.imagemeter) {
+            [self.imagemeter updateButtonCoordinate];
+        }
+    }];
+}
+
 - (void)changeTheming
 {
     [appDelegate changeTheming:self];
@@ -252,7 +264,8 @@
     // IMI File
     if ([self.metadataDetail.typeFile isEqualToString: k_metadataTypeFile_imagemeter]) {
         
-        [[NCViewerImagemeter sharedInstance] viewImagemeter:self.metadataDetail detail:self];
+        self.imagemeter = [NCViewerImagemeter new];
+        [self.imagemeter Init:self.metadataDetail detail:self];        
     }
 }
 

iOSClient/Viewer/NCViewerImagemeter.swift

@@ -40,15 +40,10 @@ class NCViewerImagemeter: NSObject {
     private var durationPlayer: TimeInterval = 0
     private var counterSecondPlayer: TimeInterval = 0
 
-    var metadata: tableMetadata!
-    var detail: CCDetail!
+    private var metadata: tableMetadata!
+    private var detail: CCDetail!
     
-    @objc static let sharedInstance: NCViewerImagemeter = {
-        let instance = NCViewerImagemeter()
-        return instance
-    }()
-
-    @objc func viewImagemeter(_ metadata: tableMetadata, detail: CCDetail) {
+    @objc func Init(_ metadata: tableMetadata, detail: CCDetail) {
         
         self.metadata = metadata
         self.detail = detail
@@ -80,12 +75,12 @@ class NCViewerImagemeter: NSObject {
         }
     }
 
-    @objc func updateTimer() {
+    @objc private func updateTimer() {
         counterSecondPlayer += 1
         imagemeterView.progressView.progress = Float(counterSecondPlayer / durationPlayer)
     }
     
-    func imgThumbnails() {
+    private func imgThumbnails() {
         
         guard let annotation = self.annotation else {
             return
@@ -105,7 +100,7 @@ class NCViewerImagemeter: NSObject {
         }
     }
     
-    func imgAudio() {
+    private func imgAudio() {
         
         guard let annotation = self.annotation else {
             return
@@ -127,7 +122,7 @@ class NCViewerImagemeter: NSObject {
         }
     }
     
-    @objc func buttonAction(sender: UIButton!) {
+    @objc private func buttonAction(sender: UIButton!) {
         
         guard let annotation = self.annotation else {
             return
@@ -152,6 +147,10 @@ class NCViewerImagemeter: NSObject {
             }
         }
     }
+    
+    @objc func updateButtonCoordinate() {
+        
+    }
 }
 
 extension NCViewerImagemeter: AVAudioPlayerDelegate {