liuzhenxing1118 1 жил өмнө
parent
commit
fdcb1cad05
32 өөрчлөгдсөн 8 нэмэгдсэн , 301 устгасан
  1. 3 2
      artimenring-iOS/Artimenring/Classes/ViewController/Bind/RelationViewController.m
  2. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_1.imageset/Contents.json
  3. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_1.imageset/bd_relation_1.png
  4. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_10.imageset/Contents.json
  5. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_10.imageset/bd_relation_10.png
  6. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_11.imageset/Contents.json
  7. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_11.imageset/bd_relation_11.png
  8. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_12.imageset/Contents.json
  9. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_12.imageset/bd_relation_12.png
  10. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_13.imageset/Contents.json
  11. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_13.imageset/bd_relation_13.png
  12. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_14.imageset/Contents.json
  13. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_14.imageset/bd_relation_14.png
  14. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_2.imageset/Contents.json
  15. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_2.imageset/bd_relation_2.png
  16. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_3.imageset/Contents.json
  17. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_3.imageset/bd_relation_3.png
  18. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_4.imageset/Contents.json
  19. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_4.imageset/bd_relation_4.png
  20. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_5.imageset/Contents.json
  21. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_5.imageset/bd_relation_5.png
  22. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_6.imageset/Contents.json
  23. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_6.imageset/bd_relation_6.png
  24. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_7.imageset/Contents.json
  25. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_7.imageset/bd_relation_7.png
  26. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_8.imageset/Contents.json
  27. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_8.imageset/bd_relation_8.png
  28. 0 21
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_9.imageset/Contents.json
  29. BIN
      artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_9.imageset/bd_relation_9.png
  30. 5 5
      artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/Contents.json
  31. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/contact_family_14@2x.png
  32. BIN
      artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/contact_family_14@3x.png

+ 3 - 2
artimenring-iOS/Artimenring/Classes/ViewController/Bind/RelationViewController.m

@@ -24,6 +24,8 @@
 - (void)viewDidLoad {
     [super viewDidLoad];
     
+    self.title = NSLocalizedString(@"BD.Title.Relation", nil);
+    
     [self.navigationController.navigationBar setBarTintColor:[UIColor colorWithRed:1 green:1 blue:1 alpha:0.82]];
     [self.navigationController.navigationBar setTintColor:[UIColor colorWithRed:0/255.0f green:1/255.0f blue:75/255.0f alpha:1]];
     self.navigationController.navigationBar.barStyle = UIBaselineAdjustmentNone;
@@ -31,13 +33,12 @@
     
     if (@available(iOS 11.0, *)) {
         self.navigationController.navigationBar.prefersLargeTitles = YES;
-        [self.navigationItem setLargeTitleDisplayMode:UINavigationItemLargeTitleDisplayModeNever];
+        [self.navigationItem setLargeTitleDisplayMode:UINavigationItemLargeTitleDisplayModeAlways];
         [self.navigationController.navigationBar setLargeTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:[UIColor colorWithRed:0/255.0f green:1/255.0f blue:75/255.0f alpha:1], NSForegroundColorAttributeName,[UIFont systemFontOfSize:32.0f weight:UIFontWeightMedium],NSFontAttributeName,nil]];
     } else {
         // Fallback on earlier versions
     }
     
-    
     [self.navigationController setNavigationBarHidden:NO];
     
     self.edgesForExtendedLayout = UIRectEdgeNone;

+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_1.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_1.imageset/bd_relation_1.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_10.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_10.imageset/bd_relation_10.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_11.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_11.imageset/bd_relation_11.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_12.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_12.imageset/bd_relation_12.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_13.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_13.imageset/bd_relation_13.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_14.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_14.imageset/bd_relation_14.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_2.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_2.imageset/bd_relation_2.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_3.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_3.imageset/bd_relation_3.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_4.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_4.imageset/bd_relation_4.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_5.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_5.imageset/bd_relation_5.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_6.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_6.imageset/bd_relation_6.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_7.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_7.imageset/bd_relation_7.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_8.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_8.imageset/bd_relation_8.png


+ 0 - 21
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_9.imageset/Contents.json

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

BIN
artimenring-iOS/Artimenring/Images.xcassets/BindDevice/bd_relation_9.imageset/bd_relation_9.png


+ 5 - 5
artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/Contents.json

@@ -5,18 +5,18 @@
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "contact_family_14@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "contact_family_14@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
-}
+}

BIN
artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/contact_family_14@2x.png


BIN
artimenring-iOS/Artimenring/Images.xcassets/Contact/contact_family_14.imageset/contact_family_14@3x.png