Marino Faggiana 7 سال پیش
والد
کامیت
1c3711fa6c

+ 23 - 0
iOSClient/Images.xcassets/swipeDelete.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/swipeDelete.imageset/swipeDelete.png


BIN
iOSClient/Images.xcassets/swipeDelete.imageset/swipeDelete@2x.png


BIN
iOSClient/Images.xcassets/swipeDelete.imageset/swipeDelete@3x.png


+ 23 - 0
iOSClient/Images.xcassets/swipeFavorite.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/swipeFavorite.imageset/swipeFavorite.png


BIN
iOSClient/Images.xcassets/swipeFavorite.imageset/swipeFavorite@2x.png


BIN
iOSClient/Images.xcassets/swipeFavorite.imageset/swipeFavorite@3x.png


+ 23 - 0
iOSClient/Images.xcassets/swipeMore.imageset/Contents.json

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

BIN
iOSClient/Images.xcassets/swipeMore.imageset/swipeMore.png


BIN
iOSClient/Images.xcassets/swipeMore.imageset/swipeMore@2x.png


BIN
iOSClient/Images.xcassets/swipeMore.imageset/swipeMore@3x.png


+ 3 - 5
iOSClient/Main/CCMain.m

@@ -5456,17 +5456,15 @@
     // MGSwipe
 
     //configure left buttons
-    NSString *titleLeftButtonFavorite = [NSString stringWithFormat:@" %@ ", NSLocalizedString(@"_favorite_", nil)];
     if (metadata.favorite)
-        cell.leftButtons = @[[MGSwipeButton buttonWithTitle:titleLeftButtonFavorite icon:[UIImage imageNamed:@"favorite"] backgroundColor:[UIColor redColor]]];
+        cell.leftButtons = @[[MGSwipeButton buttonWithTitle:[NSString stringWithFormat:@" %@ ", NSLocalizedString(@"_unfavorite_", nil)] icon:[UIImage imageNamed:@"swipeFavorite"] backgroundColor:[UIColor redColor]]];
     else
-        cell.leftButtons = @[[MGSwipeButton buttonWithTitle:titleLeftButtonFavorite icon:[UIImage imageNamed:@"favorite"] backgroundColor:[UIColor greenColor]]];
+        cell.leftButtons = @[[MGSwipeButton buttonWithTitle:[NSString stringWithFormat:@" %@ ", NSLocalizedString(@"_favorite_", nil)] icon:[UIImage imageNamed:@"swipeFavorite"] backgroundColor:[UIColor colorWithRed:242.0/255.0 green:220.0/255.0 blue:132.0/255.0 alpha:1.000]]];
     cell.leftExpansion.buttonIndex = 0;
     cell.leftExpansion.fillOnTrigger = NO;
     
     //configure right buttons
-    cell.rightButtons = @[[MGSwipeButton buttonWithTitle:NSLocalizedString(@"_delete_", nil) backgroundColor:[UIColor redColor]],
-                          [MGSwipeButton buttonWithTitle:NSLocalizedString(@"_more_", nil) backgroundColor:[UIColor lightGrayColor]]];
+    cell.rightButtons = @[[MGSwipeButton buttonWithTitle:[NSString stringWithFormat:@" %@ ", NSLocalizedString(@"_delete_", nil)] icon:[UIImage imageNamed:@"swipeDelete"] backgroundColor:[UIColor redColor]], [MGSwipeButton buttonWithTitle:[NSString stringWithFormat:@" %@ ", NSLocalizedString(@"_more_", nil)] icon:[UIImage imageNamed:@"swipeMore"] backgroundColor:[UIColor lightGrayColor]]];
     cell.rightSwipeSettings.transition = MGSwipeTransitionBorder;
     
     //restore swipeOffset after relod

+ 1 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -213,6 +213,7 @@
 
 "_favorites_"                   = "Favorites";
 "_favorite_"                    = "Favorite";
+"_unfavorite_"                  = "Unfavorite";
 "_no_files_uploaded_"           = "No files uploaded";
 "_tutorial_favorite_view_"      = "Files and folders you mark as favorites will show up here";
 "_tutorial_offline_view_"       = "Files copied here will be available offline.\n\nThey will be synchronized with your cloud.";