Răsfoiți Sursa

Merge remote-tracking branch 'origin/feat/room' into dev

* origin/feat/room: (48 commits)
  feat: 调整公屏文本字体
  feat: 调整房间底部界面样式
  fix: 修复房间观众列表数据异常的问题
  feat: 进房和创建房间时,调用私有的 extiRoom,确保不存同时在多个房间
  feat: toast 增加图标样式
  feat: 调整麦位点击逻辑
  fix: Bug 374 房间用户列表页,列表序号显示不下(建议自适应)
  fix: Bug 369 新手引导step3的方框有点过于贴边了
  feat: 更新下单场景字段
  feat: 创建订单增加场景字段
  feat: 调整房间类型字段取值
  feat: 更新房间类型的 key
  feat: 增加首页房间列表的 Tab,增加 roomType 的过滤
  feat: 补充房间内用户相关列表的总数显示
  fix: 修复从房间进入别的界面,然后房间结束,此时返回会进入空的房间界面
  fix: 修复部分 Bugs
  fix: 修复部分消费场景没有刷新余额的问题
  feat: 调整用户基础信息缓存逻辑
  feat: 无人的麦位不需要禁麦入口
  fix: 修复杀进程后麦位信息会丢失的问题
  ...
陈文艺 2 zile în urmă
părinte
comite
1805b9693f
100 a modificat fișierele cu 102 adăugiri și 15 ștergeri
  1. 57 15
      Lanu.xcodeproj/project.pbxproj
  2. 1 0
      Lanu/AppDelegate.swift
  3. 0 0
      Lanu/Assets.xcassets/Common/Bean/Contents.json
  4. 0 0
      Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/Contents.json
  5. 0 0
      Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/ic_bean@2x.png
  6. 0 0
      Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/ic_bean@3x.png
  7. 0 0
      Lanu/Assets.xcassets/Common/Check/Contents.json
  8. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check.imageset/Contents.json
  9. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check.imageset/ic_check@2x.png
  10. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check.imageset/ic_check@3x.png
  11. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/Contents.json
  12. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/ic_check_26@2x.png
  13. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/ic_check_26@3x.png
  14. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/Contents.json
  15. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/ic_check_black@2x.png
  16. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/ic_check_black@3x.png
  17. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/Contents.json
  18. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/ic_uncheck@2x.png
  19. 0 0
      Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/ic_uncheck@3x.png
  20. 0 0
      Lanu/Assets.xcassets/Common/Close/Contents.json
  21. 22 0
      Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/Contents.json
  22. BIN
      Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/ic_shutdown@2x.png
  23. BIN
      Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/ic_shutdown@3x.png
  24. 0 0
      Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/Contents.json
  25. 0 0
      Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/ic_x_mark@2x.png
  26. 0 0
      Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/ic_x_mark@3x.png
  27. 0 0
      Lanu/Assets.xcassets/Common/Coin/Contents.json
  28. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/Contents.json
  29. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/ic_coin@2x.png
  30. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/ic_coin@3x.png
  31. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/Contents.json
  32. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/ic_coin_42@2x.png
  33. 0 0
      Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/ic_coin_42@3x.png
  34. 0 0
      Lanu/Assets.xcassets/Common/Contents.json
  35. 0 0
      Lanu/Assets.xcassets/Common/Copy/Contents.json
  36. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/Contents.json
  37. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/ic_copy_left@2x.png
  38. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/ic_copy_left@3x.png
  39. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/Contents.json
  40. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/ic_copy@2x.png
  41. 0 0
      Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/ic_copy@3x.png
  42. 0 0
      Lanu/Assets.xcassets/Common/Create/Contents.json
  43. 0 0
      Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/Contents.json
  44. 0 0
      Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/ic_room_create@2x.png
  45. 0 0
      Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/ic_room_create@3x.png
  46. 0 0
      Lanu/Assets.xcassets/Common/Diamond/Contents.json
  47. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/Contents.json
  48. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/ic_diamond@2x.png
  49. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/ic_diamond@3x.png
  50. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/Contents.json
  51. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/ic_diamond_42@2x.png
  52. 0 0
      Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/ic_diamond_42@3x.png
  53. 0 0
      Lanu/Assets.xcassets/Common/Edit/Contents.json
  54. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/Contents.json
  55. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/ic_edit_clear@2x.png
  56. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/ic_edit_clear@3x.png
  57. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/Contents.json
  58. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@2x.png
  59. 0 0
      Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@3x.png
  60. 0 0
      Lanu/Assets.xcassets/Common/Gender/Contents.json
  61. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/Contents.json
  62. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/ic_gender_female@2x.png
  63. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/ic_gender_female@3x.png
  64. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/Contents.json
  65. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@2x.png
  66. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@3x.png
  67. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/Contents.json
  68. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/ic_gender_male@2x.png
  69. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/ic_gender_male@3x.png
  70. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/Contents.json
  71. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@2x.png
  72. 0 0
      Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@3x.png
  73. 0 0
      Lanu/Assets.xcassets/Common/Gift/Contents.json
  74. 22 0
      Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/Contents.json
  75. BIN
      Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/ic_gift@2x.png
  76. BIN
      Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/ic_gift@3x.png
  77. 0 0
      Lanu/Assets.xcassets/Common/Language/Contents.json
  78. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language.imageset/Contents.json
  79. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language.imageset/ic_language@2x.png
  80. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language.imageset/ic_language@3x.png
  81. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/Contents.json
  82. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/ic_language_18@2x.png
  83. 0 0
      Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/ic_language_18@3x.png
  84. 0 0
      Lanu/Assets.xcassets/Common/Like/Contents.json
  85. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/Contents.json
  86. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/ic_like_empty@2x.png
  87. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/ic_like_empty@3x.png
  88. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/Contents.json
  89. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/ic_like_filled@2x.png
  90. 0 0
      Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/ic_like_filled@3x.png
  91. 0 0
      Lanu/Assets.xcassets/Common/Loading/Contents.json
  92. 0 0
      Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/Contents.json
  93. 0 0
      Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/ic_loading@2x.png
  94. 0 0
      Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/ic_loading@3x.png
  95. 0 0
      Lanu/Assets.xcassets/Common/Location/Contents.json
  96. 0 0
      Lanu/Assets.xcassets/Common/Location/ic_location.imageset/Contents.json
  97. 0 0
      Lanu/Assets.xcassets/Common/Location/ic_location.imageset/ic_location@2x.png
  98. 0 0
      Lanu/Assets.xcassets/Common/Location/ic_location.imageset/ic_location@3x.png
  99. 0 0
      Lanu/Assets.xcassets/Common/Mic/Contents.json
  100. 0 0
      Lanu/Assets.xcassets/Common/Mic/ic_call_mute.imageset/Contents.json

+ 57 - 15
Lanu.xcodeproj/project.pbxproj

@@ -80,6 +80,7 @@
 				Common/Views/LNAutoSizeTextView.swift,
 				Common/Views/LNCaptchaInputView.swift,
 				Common/Views/LNCircleProgressView.swift,
+				Common/Views/LNCommonInputPanel.swift,
 				Common/Views/LNCountrySelectPanel.swift,
 				Common/Views/LNGenderView.swift,
 				Common/Views/LNNestedScrollView.swift,
@@ -145,6 +146,7 @@
 				"Manager/IM/TUIUtils/String+TUILocalized.swift",
 				"Manager/IM/TUIUtils/V2TIMConversation+Extension.swift",
 				"Manager/IM/TUIUtils/V2TIMMessage+Extension.swift",
+				Manager/LNCommonSceneType.swift,
 				Manager/LNDelayTask.swift,
 				Manager/LNEventDeliver.swift,
 				Manager/Location/LNLocationManager.swift,
@@ -172,9 +174,12 @@
 				Manager/Relation/LNRelationManager.swift,
 				"Manager/Relation/Network/LNHttpManager+Relation.swift",
 				Manager/Relation/Network/LNRelationResponse.swift,
+				Manager/Report/LNReportEvent.swift,
 				Manager/Report/LNReportManager.swift,
 				"Manager/Report/Network/LNHttpManager+Report.swift",
 				Manager/Room/LNRoomManager.swift,
+				"Manager/Room/Network/LNHttpManager+Room.swift",
+				Manager/Room/Network/LNRoomResponse.swift,
 				Manager/Statistic/LNStatisticManager.swift,
 				"Manager/Statistic/Network/LNHttpManager+Statistic.swift",
 				Manager/Statistic/Network/LNStatisticResponse.swift,
@@ -301,7 +306,6 @@
 				Views/Order/OrderRecords/LNOrderRecordListViewController.swift,
 				Views/Order/Refund/LNOrderProtestViewController.swift,
 				Views/Order/Refund/LNOrderRefundViewController.swift,
-				"Views/Profile/Edit/LNCommonAlertView+Profile.swift",
 				Views/Profile/Edit/LNEditBioPanel.swift,
 				Views/Profile/Edit/LNEditGenderPanel.swift,
 				Views/Profile/Edit/LNEditInterestPanel.swift,
@@ -311,7 +315,6 @@
 				Views/Profile/Edit/LNEditVoicePanel.swift,
 				Views/Profile/Feed/LNCreateFeedViewController.swift,
 				Views/Profile/Feed/LNFeedCommentCell.swift,
-				Views/Profile/Feed/LNFeedCommentInputPanel.swift,
 				Views/Profile/Feed/LNFeedCommentListPanel.swift,
 				Views/Profile/Feed/LNFeedCommentView.swift,
 				Views/Profile/Feed/LNFeedLikeView.swift,
@@ -319,6 +322,8 @@
 				Views/Profile/Feed/LNProfileFeedItemCell.swift,
 				Views/Profile/Feed/LNProfileFeedProvider.swift,
 				Views/Profile/Feed/LNVideoFeedDetailViewController.swift,
+				"Views/Profile/LNCommonAlertView+Profile.swift",
+				"Views/Profile/LNCommonAlertView+Relation.swift",
 				Views/Profile/Mine/LNMineFunctionView.swift,
 				Views/Profile/Mine/LNMineOrderRecordView.swift,
 				Views/Profile/Mine/LNMineQRCodeShareView.swift,
@@ -331,27 +336,70 @@
 				Views/Profile/Post/LNPostSkillSelectPanel.swift,
 				Views/Profile/Profile/Detail/LNProfileBaseProvider.swift,
 				Views/Profile/Profile/Detail/LNProfileSkillListProvider.swift,
+				Views/Profile/Profile/Detail/LNProfileUserDetailView.swift,
 				Views/Profile/Profile/Detail/LNProfileUserInfoProvider.swift,
 				Views/Profile/Profile/LNProfileBottomMenu.swift,
 				Views/Profile/Profile/LNProfileInfosView.swift,
+				Views/Profile/Profile/LNProfileInRoomView.swift,
 				Views/Profile/Profile/LNProfilePhotoWall.swift,
 				Views/Profile/Profile/LNProfileScoreFloatingView.swift,
 				Views/Profile/Profile/LNProfileStaringPanel.swift,
 				Views/Profile/Profile/LNProfileTabView.swift,
-				Views/Profile/Profile/LNProfileUserDetailView.swift,
 				Views/Profile/Profile/LNProfileUserInfoView.swift,
 				Views/Profile/Profile/LNProfileViewController.swift,
 				Views/Profile/Profile/LNProfileVoiceBarView.swift,
-				"Views/Profile/Relation/LNCommonAlertView+Relation.swift",
 				Views/Profile/Relation/LNUserRelationItemCell.swift,
 				Views/Profile/Relation/LNUserRelationListView.swift,
 				Views/Profile/Relation/LNUserRelationViewController.swift,
 				Views/Report/LNReportViewController.swift,
-				Views/Room/LNCreateRoomPanel.swift,
-				Views/Room/LNRoomNameInputPanel.swift,
+				Views/Room/Bottom/Input/LNRoomMessageInputView.swift,
+				Views/Room/Bottom/Join/LNRoomJoinMenuView.swift,
+				Views/Room/Bottom/LNRoomBottomMenuView.swift,
+				Views/Room/Bottom/Mic/LNRoomBottomMicView.swift,
+				Views/Room/Create/LNCreateRoomPanel.swift,
+				Views/Room/Create/LNRoomNameInputPanel.swift,
+				Views/Room/Join/Apply/LNRoomApplySeatCell.swift,
+				Views/Room/Join/Apply/LNRoomApplySeatListPanel.swift,
+				Views/Room/Join/Apply/LNRoomApplySeatPanel.swift,
+				Views/Room/Join/Invite/LNRoomInviteSeatCell.swift,
+				Views/Room/Join/Invite/LNRoomInviteSeatPanel.swift,
+				Views/Room/Join/LNRoomGameCategoryFilterPanel.swift,
+				Views/Room/Join/Manage/LNRoomManageSeatCell.swift,
+				Views/Room/Join/Manage/LNRoomManageSeatListPanel.swift,
+				Views/Room/Join/Manage/LNRoomManageSeatListView.swift,
+				Views/Room/Join/Manage/LNRoomManageSeatTabView.swift,
+				"Views/Room/LNCommonAlertView+Room.swift",
+				Views/Room/LNRoomListViewController.swift,
+				Views/Room/LNRoomOrderGuideView.swift,
+				Views/Room/LNRoomSheetMenu.swift,
+				Views/Room/LNRoomViewController.swift,
+				Views/Room/Message/LNRoomChatMessageCell.swift,
+				Views/Room/Message/LNRoomMessageView.swift,
+				Views/Room/Message/LNRoomSystemMessageCell.swift,
+				Views/Room/Message/LNRoomUnknownMessageCell.swift,
+				Views/Room/Message/LNRoomWelcomeMessageCell.swift,
+				Views/Room/Profile/LNRoomProfileBottomMenu.swift,
+				Views/Room/Profile/LNRoomProfileCardPanel.swift,
+				Views/Room/Profile/LNRoomProfileSkillView.swift,
+				Views/Room/Seats/LNRoomSeatSpeakingView.swift,
+				Views/Room/Seats/LNRoomSeatsView.swift,
+				Views/Room/Seats/LNRoomUserSeatView.swift,
+				Views/Room/Settings/LNRoomInfoEditPanel.swift,
+				Views/Room/Settings/LNRoomSettingMenuPanel.swift,
+				Views/Room/Top/LNRoomTopMenuView.swift,
+				"Views/Room/ViewModel/LiveInfo+Extension.swift",
 				Views/Room/ViewModel/LNRoomViewModel.swift,
+				Views/Room/ViewModel/Message/LNRoomChatMessageItem.swift,
+				Views/Room/ViewModel/Message/LNRoomSystemMessageItem.swift,
+				Views/Room/ViewModel/RoomInfo/LNRoomInfo.swift,
+				Views/Room/ViewModel/Seat/LNRoomSeatItem.swift,
 				Views/Search/LNUserSearchHistoryView.swift,
-				Views/Search/LNUserSearchItemCell.swift,
+				Views/Search/LNUserSearchOverviewListView.swift,
+				Views/Search/LNUserSearchRoomCardView.swift,
+				Views/Search/LNUserSearchRoomListView.swift,
+				Views/Search/LNUserSearchTabsView.swift,
+				Views/Search/LNUserSearchUserCardView.swift,
+				Views/Search/LNUserSearchUserListView.swift,
 				Views/Search/LNUserSearchViewController.swift,
 				Views/Settings/LNAboutViewController.swift,
 				"Views/Settings/LNCommonAlertView+Account.swift",
@@ -383,6 +431,8 @@
 		};
 		FBB67E232EC48B440070E686 /* ThirdParty */ = {
 			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+			);
 			path = ThirdParty;
 			sourceTree = "<group>";
 		};
@@ -535,14 +585,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-resources.sh\"\n";
@@ -578,14 +624,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Gami/Pods-Gami-frameworks.sh\"\n";

+ 1 - 0
Lanu/AppDelegate.swift

@@ -31,6 +31,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         _ = LNKeyboardManager.shared
         _ = LNConfigManager.shared
         _ = LNOrderManager.shared
+        _ = LNRoomManager.shared
         
         LNEventDeliver.notifyAppLaunchFinished()
         

+ 0 - 0
Lanu/Assets.xcassets/Bean/Contents.json → Lanu/Assets.xcassets/Common/Bean/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Bean/ic_bean.imageset/Contents.json → Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Bean/ic_bean.imageset/ic_bean@2x.png → Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/ic_bean@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Bean/ic_bean.imageset/ic_bean@3x.png → Lanu/Assets.xcassets/Common/Bean/ic_bean.imageset/ic_bean@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/Contents.json → Lanu/Assets.xcassets/Common/Check/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check.imageset/Contents.json → Lanu/Assets.xcassets/Common/Check/ic_check.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check.imageset/ic_check@2x.png → Lanu/Assets.xcassets/Common/Check/ic_check.imageset/ic_check@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check.imageset/ic_check@3x.png → Lanu/Assets.xcassets/Common/Check/ic_check.imageset/ic_check@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_26.imageset/Contents.json → Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_26.imageset/ic_check_26@2x.png → Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/ic_check_26@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_26.imageset/ic_check_26@3x.png → Lanu/Assets.xcassets/Common/Check/ic_check_26.imageset/ic_check_26@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_black.imageset/Contents.json → Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_black.imageset/ic_check_black@2x.png → Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/ic_check_black@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_check_black.imageset/ic_check_black@3x.png → Lanu/Assets.xcassets/Common/Check/ic_check_black.imageset/ic_check_black@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_uncheck.imageset/Contents.json → Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_uncheck.imageset/ic_uncheck@2x.png → Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/ic_uncheck@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Check/ic_uncheck.imageset/ic_uncheck@3x.png → Lanu/Assets.xcassets/Common/Check/ic_uncheck.imageset/ic_uncheck@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Coin/Contents.json → Lanu/Assets.xcassets/Common/Close/Contents.json


+ 22 - 0
Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/Contents.json

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

BIN
Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/ic_shutdown@2x.png


BIN
Lanu/Assets.xcassets/Common/Close/ic_shutdown.imageset/ic_shutdown@3x.png


+ 0 - 0
Lanu/Assets.xcassets/XMark/ic_x_mark.imageset/Contents.json → Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/XMark/ic_x_mark.imageset/ic_x_mark@2x.png → Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/ic_x_mark@2x.png


+ 0 - 0
Lanu/Assets.xcassets/XMark/ic_x_mark.imageset/ic_x_mark@3x.png → Lanu/Assets.xcassets/Common/Close/ic_x_mark.imageset/ic_x_mark@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Copy/Contents.json → Lanu/Assets.xcassets/Common/Coin/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin.imageset/Contents.json → Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin.imageset/ic_coin@2x.png → Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/ic_coin@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin.imageset/ic_coin@3x.png → Lanu/Assets.xcassets/Common/Coin/ic_coin.imageset/ic_coin@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin_42.imageset/Contents.json → Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin_42.imageset/ic_coin_42@2x.png → Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/ic_coin_42@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Coin/ic_coin_42.imageset/ic_coin_42@3x.png → Lanu/Assets.xcassets/Common/Coin/ic_coin_42.imageset/ic_coin_42@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Diamond/Contents.json → Lanu/Assets.xcassets/Common/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Edit/Contents.json → Lanu/Assets.xcassets/Common/Copy/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_left.imageset/Contents.json → Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_left.imageset/ic_copy_left@2x.png → Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/ic_copy_left@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_left.imageset/ic_copy_left@3x.png → Lanu/Assets.xcassets/Common/Copy/ic_copy_left.imageset/ic_copy_left@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_right.imageset/Contents.json → Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_right.imageset/ic_copy@2x.png → Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/ic_copy@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Copy/ic_copy_right.imageset/ic_copy@3x.png → Lanu/Assets.xcassets/Common/Copy/ic_copy_right.imageset/ic_copy@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/Contents.json → Lanu/Assets.xcassets/Common/Create/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Room/ic_room_create.imageset/Contents.json → Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Room/ic_room_create.imageset/ic_room_create@2x.png → Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/ic_room_create@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Room/ic_room_create.imageset/ic_room_create@3x.png → Lanu/Assets.xcassets/Common/Create/ic_room_create.imageset/ic_room_create@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Language/Contents.json → Lanu/Assets.xcassets/Common/Diamond/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond.imageset/Contents.json → Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond.imageset/ic_diamond@2x.png → Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/ic_diamond@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond.imageset/ic_diamond@3x.png → Lanu/Assets.xcassets/Common/Diamond/ic_diamond.imageset/ic_diamond@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond_42.imageset/Contents.json → Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond_42.imageset/ic_diamond_42@2x.png → Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/ic_diamond_42@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Diamond/ic_diamond_42.imageset/ic_diamond_42@3x.png → Lanu/Assets.xcassets/Common/Diamond/ic_diamond_42.imageset/ic_diamond_42@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Like/Contents.json → Lanu/Assets.xcassets/Common/Edit/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_clear.imageset/Contents.json → Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_clear.imageset/ic_edit_clear@2x.png → Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/ic_edit_clear@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_clear.imageset/ic_edit_clear@3x.png → Lanu/Assets.xcassets/Common/Edit/ic_edit_clear.imageset/ic_edit_clear@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_gradient.imageset/Contents.json → Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@2x.png → Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@3x.png → Lanu/Assets.xcassets/Common/Edit/ic_edit_gradient.imageset/ic_profile_avatar_edit_gradient@3x.png


+ 0 - 0
Lanu/Assets.xcassets/More/Contents.json → Lanu/Assets.xcassets/Common/Gender/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female.imageset/Contents.json → Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female.imageset/ic_gender_female@2x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/ic_gender_female@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female.imageset/ic_gender_female@3x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_female.imageset/ic_gender_female@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female_with_bg.imageset/Contents.json → Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@2x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@3x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_female_with_bg.imageset/ic_gender_female@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male.imageset/Contents.json → Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male.imageset/ic_gender_male@2x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/ic_gender_male@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male.imageset/ic_gender_male@3x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_male.imageset/ic_gender_male@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male_with_bg.imageset/Contents.json → Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@2x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@3x.png → Lanu/Assets.xcassets/Common/Gender/ic_gender_male_with_bg.imageset/ic_gender_male@3x.png


+ 0 - 0
Lanu/Assets.xcassets/NoData/Contents.json → Lanu/Assets.xcassets/Common/Gift/Contents.json


+ 22 - 0
Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/Contents.json

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

BIN
Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/ic_gift@2x.png


BIN
Lanu/Assets.xcassets/Common/Gift/ic_gift.imageset/ic_gift@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Search/Contents.json → Lanu/Assets.xcassets/Common/Language/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language.imageset/Contents.json → Lanu/Assets.xcassets/Common/Language/ic_language.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language.imageset/ic_language@2x.png → Lanu/Assets.xcassets/Common/Language/ic_language.imageset/ic_language@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language.imageset/ic_language@3x.png → Lanu/Assets.xcassets/Common/Language/ic_language.imageset/ic_language@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language_18.imageset/Contents.json → Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language_18.imageset/ic_language_18@2x.png → Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/ic_language_18@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Language/ic_language_18.imageset/ic_language_18@3x.png → Lanu/Assets.xcassets/Common/Language/ic_language_18.imageset/ic_language_18@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Send/Contents.json → Lanu/Assets.xcassets/Common/Like/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_empty.imageset/Contents.json → Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_empty.imageset/ic_like_empty@2x.png → Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/ic_like_empty@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_empty.imageset/ic_like_empty@3x.png → Lanu/Assets.xcassets/Common/Like/ic_like_empty.imageset/ic_like_empty@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_filled.imageset/Contents.json → Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_filled.imageset/ic_like_filled@2x.png → Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/ic_like_filled@2x.png


+ 0 - 0
Lanu/Assets.xcassets/Like/ic_like_filled.imageset/ic_like_filled@3x.png → Lanu/Assets.xcassets/Common/Like/ic_like_filled.imageset/ic_like_filled@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Share/Contents.json → Lanu/Assets.xcassets/Common/Loading/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/ic_loading.imageset/Contents.json → Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/ic_loading.imageset/ic_loading@2x.png → Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/ic_loading@2x.png


+ 0 - 0
Lanu/Assets.xcassets/ic_loading.imageset/ic_loading@3x.png → Lanu/Assets.xcassets/Common/Loading/ic_loading.imageset/ic_loading@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Sorted/Contents.json → Lanu/Assets.xcassets/Common/Location/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/ic_location.imageset/Contents.json → Lanu/Assets.xcassets/Common/Location/ic_location.imageset/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/ic_location.imageset/ic_location@2x.png → Lanu/Assets.xcassets/Common/Location/ic_location.imageset/ic_location@2x.png


+ 0 - 0
Lanu/Assets.xcassets/ic_location.imageset/ic_location@3x.png → Lanu/Assets.xcassets/Common/Location/ic_location.imageset/ic_location@3x.png


+ 0 - 0
Lanu/Assets.xcassets/Star/Contents.json → Lanu/Assets.xcassets/Common/Mic/Contents.json


+ 0 - 0
Lanu/Assets.xcassets/IM/Call/ic_call_mute.imageset/Contents.json → Lanu/Assets.xcassets/Common/Mic/ic_call_mute.imageset/Contents.json


Unele fișiere nu au fost afișate deoarece prea multe fișiere au fost modificate în acest diff