Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch fixes #575

Merged
merged 2 commits into from
Apr 17, 2024
Merged

Patch fixes #575

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f3908c
Fix #573
eb1 Apr 17, 2024
da4d6b3
Fix #574
eb1 Apr 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions config.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,42 @@
<resource-file src="www/res/icon/ios/usx_44.png" />
<resource-file src="www/res/icon/ios/usx_64.png" />
<resource-file src="www/res/icon/ios/usx_320.png" />
<!-- EDB 5 Apr 2024: new privacy API requirement for iOS / this fills in PrivacyInfo.xcprivacy template -->
<privacy-manifest>
<key>NSPrivacyTracking</key>
<false />
<key>NSPrivacyTrackingDomains</key>
<array />
<key>NSPrivacyCollectedDataTypes</key>
<array/>
<key>NSPrivacyAccessedAPITypes</key>
<array>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryFileTimestamp</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>0A2A.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryDiskSpace</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>E174.1</string>
</array>
</dict>
<dict>
<key>NSPrivacyAccessedAPIType</key>
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
<key>NSPrivacyAccessedAPITypeReasons</key>
<array>
<string>CA92.1</string>
</array>
</dict>
</array>
</privacy-manifest>
<!-- EDB 8/16/21 TODO: config-file items are up to date, but some icon files do need to be
manually copied over into the XCode project before releasing. -->
<config-file mode="replace" parent="UISupportedInterfaceOrientations" target="*-Info.plist">
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"devDependencies": {
"cordova-android": "^12.0.1",
"cordova-clipboard": "github:ihadeed/cordova-clipboard",
"cordova-ios": "^7.0.1",
"cordova-ios": "^7.1.0",
"cordova-plugin-add-swift-support": "^2.0.2",
"cordova-plugin-chooser": "^1.3.2",
"cordova-plugin-customurlscheme": "^5.0.2",
Expand Down Expand Up @@ -95,4 +95,4 @@
"ios"
]
}
}
}
28 changes: 20 additions & 8 deletions www/js/views/ProjectViews.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -705,7 +705,7 @@ define(function (require) {
{
hint: true,
highlight: true,
minLength: 1
minLength: 2
},
{
name: 'languages',
Expand All @@ -723,7 +723,7 @@ define(function (require) {
return data.attributes.name;
},
source: this.languageMatches(this.theLangs),
limit: 25,
limit: 200,
templates: {
empty: ['<div>No languages found</div>'].join('\n'),
pending: ['<div>Searching...</div>'].join('\n'),
Expand All @@ -734,16 +734,22 @@ define(function (require) {
strSuggestion += data.attributes.localname
strSuggestion += '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0];
strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : "";
strSuggestion += '</span>';
} else if (data.attributes.localnames != null && data.attributes.localnames.length > 0) {
strSuggestion += data.attributes.localnames[0];
strSuggestion += '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0];
strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : "";
strSuggestion += '</span>';
} else if (data.attributes.name != null && data.attributes.name.length > 0) {
strSuggestion += data.attributes.name + '&nbsp;(' + data.attributes.tag + ')';
strSuggestion += data.attributes.name + '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : "";
strSuggestion += '</span>';
} else {
strSuggestion += data.attributes.names[0] + '&nbsp;(' + data.attributes.tag + ')';
strSuggestion += data.attributes.names[0] + '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : "";
strSuggestion += '</span>';
}
// close out and return the suggestion
strSuggestion += '</div>';;
Expand Down Expand Up @@ -778,7 +784,7 @@ define(function (require) {
{
hint: true,
highlight: true,
minLength: 1
minLength: 2
},
{
name: 'languages',
Expand All @@ -796,7 +802,7 @@ define(function (require) {
return data.attributes.name;
},
source: this.languageMatches(this.theLangs),
limit: 25,
limit: 200,
templates: {
empty: ['<div>No languages found</div>'].join('\n'),
pending: ['<div>Searching...</div>'].join('\n'),
Expand All @@ -807,16 +813,22 @@ define(function (require) {
strSuggestion += data.attributes.localname
strSuggestion += '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0];
strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : "";
strSuggestion += '</span>';
} else if (data.attributes.localnames != null && data.attributes.localnames.length > 0) {
strSuggestion += data.attributes.localnames[0];
strSuggestion += '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.name != null) ? data.attributes.name : data.attributes.names[0];
strSuggestion += (data.attributes.regionname != null) ? (" / " + data.attributes.regionname) : "";
strSuggestion += '</span>';
} else if (data.attributes.name != null && data.attributes.name.length > 0) {
strSuggestion += data.attributes.name + '&nbsp;(' + data.attributes.tag + ')';
strSuggestion += data.attributes.name + '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : "";
strSuggestion += '</span>';
} else {
strSuggestion += data.attributes.names[0] + '&nbsp;(' + data.attributes.tag + ')';
strSuggestion += data.attributes.names[0] + '&nbsp;(' + data.attributes.tag + ')<span class=\"subtext\">';
strSuggestion += (data.attributes.regionname != null) ? data.attributes.regionname : "";
strSuggestion += '</span>';
}
// close out and return the suggestion
strSuggestion += '</div>';;
Expand Down
22 changes: 2 additions & 20 deletions www/res/css/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1370,7 +1370,7 @@ div.preview div.pile {
.subtext {
display: block;
font-size: 0.6rem;
color: #999;
color: #555;
}
.topcoat-checkbox__checkmark {
margin-right: 6px;
Expand Down Expand Up @@ -1905,27 +1905,9 @@ typeahead styles
}

#scrollable-dropdown-menu .tt-menu {
max-height: 175px;
max-height: max(175px, calc(100vh - 300px)); /* available space - keyboard (vertical), or 175px if that's too small */
overflow-y: auto;
}
.tt-menu::-webkit-scrollbar {
background-color: rgb(221, 225, 225);
width: 12px;
}
.tt-menu::-webkit-scrollbar-thumb {
background-color: #ccc;
border-radius: 10px;
-moz-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
}
.tt-menu::-webkit-scrollbar-track {
background-color: rgb(221, 225, 225);
border-radius: 10px;
-moz-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
-webkit-box-shadow: inset 0 0 6px rgba(0,0,0,0.3);
box-shadow: inset 0 0 6px rgba(0, 0, 0, 0.3);
}

.tt-menu {
background-color: #fff;
Expand Down
2 changes: 1 addition & 1 deletion www/tpl/ProjectSourceLanguage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="source" class="control-group" style="height:100%;">
<div id="source" class="control-group" style="height:100%; overflow: visible;">
<div class="control-row" style="padding-bottom: 0"><label for="LanguageName">* {{ t 'view.lblSourceLanguageName'}}</label></div>
<div class="control-row full" id="scrollable-dropdown-menu"><input type="text" id="LanguageName" class="topcoat-text-input full typeahead" value="{{SourceLanguageName}}" placeholder={{ t 'view.lblStartTyping'}} required></div>
<div class="control-row"><label for="LanguageVariant">{{ t 'view.lblLanguageVariant'}}</label><input type="text" id="LanguageVariant" class="topcoat-text-input full" value="{{SourceVariant}}"></div>
Expand Down
2 changes: 1 addition & 1 deletion www/tpl/ProjectTargetLanguage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="source" class="control-group" style="height:100%;">
<div id="source" class="control-group" style="height:100%; overflow: visible;">
<div class="control-row" style="padding-bottom: 0"><label for="LanguageName">* {{ t 'view.lblTargetLanguageName'}}</label></div>
<div class="control-row full"><input type="text" id="LanguageName" class="topcoat-text-input full typeahead" value="{{TargetLanguageName}}" placeholder={{ t 'view.lblStartTyping'}} required></div>
<div class="control-row"><label for="LanguageVariant">{{ t 'view.lblLanguageVariant'}}</label><input type="text" id="LanguageVariant" class="topcoat-text-input full" value="{{TargetVariant}}"></div>
Expand Down
Loading