Skip to content

Commit b95625a

Browse files
harshada-15-tsysharshada-15-tsys
committed
NMC - Resolve the issues in code More tab, Settings screen, Share functionality and localization after rebasing
1 parent f04bd9f commit b95625a

72 files changed

Lines changed: 1498 additions & 1010 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎AppIcon.icon/Assets/Nextcloud-logo-white.svg‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎AppIcon.icon/Assets/logo.svg‎

Lines changed: 19 additions & 0 deletions
Loading

‎AppIcon.icon/icon.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"fill" : {
33
"linear-gradient" : [
4-
"display-p3:0.10980,0.68627,1.00000,1.00000",
5-
"srgb:0.00000,0.50980,0.78824,1.00000"
4+
"display-p3:0.88627,0.00000,0.45490,1.00000",
5+
"srgb:0.88627,0.00000,0.45490,1.00000"
66
],
77
"orientation" : {
88
"start" : {
@@ -19,10 +19,10 @@
1919
{
2020
"layers" : [
2121
{
22-
"image-name" : "Nextcloud-logo-white.svg",
23-
"name" : "Nextcloud-logo-white",
22+
"image-name" : "logo.svg",
23+
"name" : "logo",
2424
"position" : {
25-
"scale" : 6.8,
25+
"scale" : 3,
2626
"translation-in-points" : [
2727
0,
2828
0

‎Brand/Custom.xcassets/AppIcon.appiconset/Contents.json‎

Lines changed: 75 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -1,155 +1,154 @@
1-
21
{
32
"images" : [
43
{
5-
"size" : "20x20",
6-
"idiom" : "iphone",
74
"filename" : "Icon-App-20x20@2x.png",
8-
"scale" : "2x"
5+
"idiom" : "iphone",
6+
"scale" : "2x",
7+
"size" : "20x20"
98
},
109
{
11-
"size" : "20x20",
12-
"idiom" : "iphone",
1310
"filename" : "Icon-App-20x20@3x.png",
14-
"scale" : "3x"
11+
"idiom" : "iphone",
12+
"scale" : "3x",
13+
"size" : "20x20"
1514
},
1615
{
17-
"size" : "29x29",
18-
"idiom" : "iphone",
1916
"filename" : "Icon-App-29x29@1x.png",
20-
"scale" : "1x"
17+
"idiom" : "iphone",
18+
"scale" : "1x",
19+
"size" : "29x29"
2120
},
2221
{
23-
"size" : "29x29",
24-
"idiom" : "iphone",
2522
"filename" : "Icon-App-29x29@2x.png",
26-
"scale" : "2x"
23+
"idiom" : "iphone",
24+
"scale" : "2x",
25+
"size" : "29x29"
2726
},
2827
{
29-
"size" : "29x29",
30-
"idiom" : "iphone",
3128
"filename" : "Icon-App-29x29@3x.png",
32-
"scale" : "3x"
29+
"idiom" : "iphone",
30+
"scale" : "3x",
31+
"size" : "29x29"
3332
},
3433
{
35-
"size" : "40x40",
36-
"idiom" : "iphone",
3734
"filename" : "Icon-App-40x40@2x.png",
38-
"scale" : "2x"
35+
"idiom" : "iphone",
36+
"scale" : "2x",
37+
"size" : "40x40"
3938
},
4039
{
41-
"size" : "40x40",
42-
"idiom" : "iphone",
4340
"filename" : "Icon-App-40x40@3x.png",
44-
"scale" : "3x"
41+
"idiom" : "iphone",
42+
"scale" : "3x",
43+
"size" : "40x40"
4544
},
4645
{
47-
"size" : "57x57",
48-
"idiom" : "iphone",
4946
"filename" : "Icon-App-57x57@1x.png",
50-
"scale" : "1x"
47+
"idiom" : "iphone",
48+
"scale" : "1x",
49+
"size" : "57x57"
5150
},
5251
{
53-
"size" : "57x57",
54-
"idiom" : "iphone",
5552
"filename" : "Icon-App-57x57@2x.png",
56-
"scale" : "2x"
53+
"idiom" : "iphone",
54+
"scale" : "2x",
55+
"size" : "57x57"
5756
},
5857
{
59-
"size" : "60x60",
60-
"idiom" : "iphone",
6158
"filename" : "Icon-App-60x60@2x.png",
62-
"scale" : "2x"
59+
"idiom" : "iphone",
60+
"scale" : "2x",
61+
"size" : "60x60"
6362
},
6463
{
65-
"size" : "60x60",
66-
"idiom" : "iphone",
6764
"filename" : "Icon-App-60x60@3x.png",
68-
"scale" : "3x"
65+
"idiom" : "iphone",
66+
"scale" : "3x",
67+
"size" : "60x60"
6968
},
7069
{
71-
"size" : "20x20",
72-
"idiom" : "ipad",
7370
"filename" : "Icon-App-20x20@1x.png",
74-
"scale" : "1x"
71+
"idiom" : "ipad",
72+
"scale" : "1x",
73+
"size" : "20x20"
7574
},
7675
{
77-
"size" : "20x20",
78-
"idiom" : "ipad",
7976
"filename" : "Icon-App-20x20@2x.png",
80-
"scale" : "2x"
77+
"idiom" : "ipad",
78+
"scale" : "2x",
79+
"size" : "20x20"
8180
},
8281
{
83-
"size" : "29x29",
84-
"idiom" : "ipad",
8582
"filename" : "Icon-App-29x29@1x.png",
86-
"scale" : "1x"
83+
"idiom" : "ipad",
84+
"scale" : "1x",
85+
"size" : "29x29"
8786
},
8887
{
89-
"size" : "29x29",
90-
"idiom" : "ipad",
9188
"filename" : "Icon-App-29x29@2x.png",
92-
"scale" : "2x"
89+
"idiom" : "ipad",
90+
"scale" : "2x",
91+
"size" : "29x29"
9392
},
9493
{
95-
"size" : "40x40",
96-
"idiom" : "ipad",
9794
"filename" : "Icon-App-40x40@1x.png",
98-
"scale" : "1x"
95+
"idiom" : "ipad",
96+
"scale" : "1x",
97+
"size" : "40x40"
9998
},
10099
{
101-
"size" : "40x40",
102-
"idiom" : "ipad",
103100
"filename" : "Icon-App-40x40@2x.png",
104-
"scale" : "2x"
101+
"idiom" : "ipad",
102+
"scale" : "2x",
103+
"size" : "40x40"
105104
},
106105
{
107-
"size" : "50x50",
108-
"idiom" : "ipad",
109106
"filename" : "Icon-Small-50x50@1x.png",
110-
"scale" : "1x"
107+
"idiom" : "ipad",
108+
"scale" : "1x",
109+
"size" : "50x50"
111110
},
112111
{
113-
"size" : "50x50",
114-
"idiom" : "ipad",
115112
"filename" : "Icon-Small-50x50@2x.png",
116-
"scale" : "2x"
113+
"idiom" : "ipad",
114+
"scale" : "2x",
115+
"size" : "50x50"
117116
},
118117
{
119-
"size" : "72x72",
120-
"idiom" : "ipad",
121118
"filename" : "Icon-App-72x72@1x.png",
122-
"scale" : "1x"
119+
"idiom" : "ipad",
120+
"scale" : "1x",
121+
"size" : "72x72"
123122
},
124123
{
125-
"size" : "72x72",
126-
"idiom" : "ipad",
127124
"filename" : "Icon-App-72x72@2x.png",
128-
"scale" : "2x"
125+
"idiom" : "ipad",
126+
"scale" : "2x",
127+
"size" : "72x72"
129128
},
130129
{
131-
"size" : "76x76",
132-
"idiom" : "ipad",
133130
"filename" : "Icon-App-76x76@1x.png",
134-
"scale" : "1x"
131+
"idiom" : "ipad",
132+
"scale" : "1x",
133+
"size" : "76x76"
135134
},
136135
{
137-
"size" : "76x76",
138-
"idiom" : "ipad",
139136
"filename" : "Icon-App-76x76@2x.png",
140-
"scale" : "2x"
137+
"idiom" : "ipad",
138+
"scale" : "2x",
139+
"size" : "76x76"
141140
},
142141
{
143-
"size" : "83.5x83.5",
144-
"idiom" : "ipad",
145142
"filename" : "Icon-App-83.5x83.5@2x.png",
146-
"scale" : "2x"
143+
"idiom" : "ipad",
144+
"scale" : "2x",
145+
"size" : "83.5x83.5"
147146
},
148147
{
149-
"size" : "1024x1024",
150-
"idiom" : "ios-marketing",
151148
"filename" : "ItunesArtwork@2x.png",
152-
"scale" : "1x"
149+
"idiom" : "ios-marketing",
150+
"scale" : "1x",
151+
"size" : "1024x1024"
153152
}
154153
],
155154
"info" : {

‎Brand/Custom.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png‎

-43.3 KB
Binary file not shown.

‎Brand/iOSClient.plist‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -60,22 +60,22 @@
6060
<key>NSAllowsArbitraryLoads</key>
6161
<false/>
6262
</dict>
63-
<key>NSCameraUsageDescription</key>
64-
<string>Camera access is required to scan documents and take photos in this app.</string>
65-
<key>NSFaceIDUsageDescription</key>
66-
<string>Face ID is required to authenticate using face recognition.</string>
67-
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
68-
<string>This app needs access to your location even in the background to automatically start uploading files when significant movement is detected. GPS is not used.</string>
69-
<key>NSLocationAlwaysUsageDescription</key>
70-
<string>The app uses your location to automatically trigger file uploads when you move between areas.</string>
71-
<key>NSLocationWhenInUseUsageDescription</key>
72-
<string>This app uses your location to detect movement and automatically upload files. It does not use GPS and does not store your location.</string>
73-
<key>NSMicrophoneUsageDescription</key>
74-
<string>Microphone access is required to create voice notes.</string>
75-
<key>NSPhotoLibraryAddUsageDescription</key>
76-
<string>This lets you upload and save photos using this app. Photos can then be browsed and viewed via the Media tab.</string>
77-
<key>NSPhotoLibraryUsageDescription</key>
78-
<string>This lets you upload and save photos using this app. Photos can then be browsed and viewed via the Media tab.</string>
63+
<key>NSCameraUsageDescription</key>
64+
<string>Camera access is required to scan documents and take photos in this app.</string>
65+
<key>NSFaceIDUsageDescription</key>
66+
<string>Face ID is required to authenticate using face recognition.</string>
67+
<key>NSLocationAlwaysAndWhenInUseUsageDescription</key>
68+
<string>This app needs access to your location even in the background to automatically start uploading files when significant movement is detected. GPS is not used.</string>
69+
<key>NSLocationAlwaysUsageDescription</key>
70+
<string>The app uses your location to automatically trigger file uploads when you move between areas.</string>
71+
<key>NSLocationWhenInUseUsageDescription</key>
72+
<string>This app uses your location to detect movement and automatically upload files. It does not use GPS and does not store your location.</string>
73+
<key>NSMicrophoneUsageDescription</key>
74+
<string>Microphone access is required to create voice notes.</string>
75+
<key>NSPhotoLibraryAddUsageDescription</key>
76+
<string>This lets you upload and save photos using this app. Photos can then be browsed and viewed via the Media tab.</string>
77+
<key>NSPhotoLibraryUsageDescription</key>
78+
<string>This lets you upload and save photos using this app. Photos can then be browsed and viewed via the Media tab.</string>
7979
<key>NSUserActivityTypes</key>
8080
<array>
8181
<string>AccountIntent</string>

‎Localizable.strings‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
// MARK: Albums
2+
"_albums_loading_popup_desc_" = "Wait a moment...";
3+
"_albums_list_nav_title_" = "Albums";
4+
"_albums_list_new_album_btn_" = "New";
5+
"_albums_list_loading_msg_" = "Loading...";
6+
"_albums_list_error_msg_" = "Unable to load albums. Please try again later!";
7+
"_albums_list_album_name_validation_nonempty_" = "Album name cannot be empty.";
8+
"_albums_list_album_name_validation_min_length_" = "Album name must be at least 3 characters.";
9+
"_albums_list_album_name_validation_max_length_" = "Album name cannot be more than 30 characters.";
10+
"_albums_list_album_name_validation_specials_" = "Album name cannot contain slashes.";
11+
"_albums_list_empty_heading_" = "Create\nAlbums\nfor your\nPhotos";
12+
"_albums_list_empty_subheading_" = "You can organize all your photos in as many albums as you like. You haven't created an album yet.";
13+
"_albums_list_empty_new_album_btn_" = "Create album";
14+
"_albums_list_own_albums_heading_" = "My albums";
15+
"_albums_list_entities_" = "Items";
16+
"_albums_list_new_album_popup_title_" = "Create new Album";
17+
"_albums_list_new_album_popup_desc_" = "Please enter an album name between 3 and 30 characters.";
18+
"_albums_list_new_album_popup_hint_" = "Album's name";
19+
"_albums_list_new_album_popup_positive_btn_" = "Create";
20+
"_albums_list_new_album_popup_negative_btn_" = "Cancel";
21+
"_albums_list_rename_album_popup_title_" = "Rename Album";
22+
"_albums_list_rename_album_popup_desc_" = "Please enter new album name between 3 and 30 characters.";
23+
"_albums_list_rename_album_popup_hint_" = "Album's new name";
24+
"_albums_list_rename_album_popup_positive_btn_" = "Rename";
25+
"_albums_list_rename_album_popup_negative_btn_" = "Cancel";
26+
"_albums_photo_selection_sheet_title_" = "Select items";
27+
"_albums_photo_selection_sheet_back_btn_" = "Back";
28+
"_albums_photo_selection_sheet_done_btn_" = "Done";
29+
"_albums_photos_loading_msg_" = "Loading photos...";
30+
"_albums_photos_error_msg_" = "Unable to load photos. Please try again later!";
31+
"_albums_photos_empty_heading_" = "All that's\nmissing are\nyour photos";
32+
"_albums_photos_empty_subheading_" = "You can add as many photos as you like. A photo can also belong to more than one album.";
33+
"_albums_photos_empty_add_photos_btn_" = "Add photos";
34+
"_albums_photos_add_photos_btn_" = "Add";
35+
"_albums_photos_rename_album_btn_" = "Rename Album";
36+
"_albums_photos_delete_album_btn_" = "Delete Album";
37+
"_albums_delete_album_popup_title_" = "Delete Album?";
38+
"_albums_delete_album_popup_desc_" = "Are you sure you want to delete this album? This action cannot be undone.";
39+
"_albums_delete_album_popup_positive_btn_" = "Delete";
40+
"_albums_delete_album_popup_negative_btn_" = "Cancel";
41+
"_add_to_album" = "Add to Album";
42+
"_remove_from_album_" = "Remove from Album";
43+
"_album_already_exists_" = "Could not complete the operation, album with the same name exists";

0 commit comments

Comments
 (0)