Skip to content
Snippets Groups Projects
Commit cf8b4eed authored by bpresles's avatar bpresles
Browse files

iPad fixes

parent 9a1e0891
No related branches found
No related tags found
No related merge requests found
Pipeline #7035 skipped
......@@ -6,7 +6,7 @@
/node_modules/
/platforms/ios/
/platforms/*
/resources/android/build/local.properties
/resources/android/build/Cesium.keystore
/resources/android/build/release-signing.properties
......@@ -42,3 +42,4 @@
/env.sh
/npm-debug.log
/package-lock.json
/Cesium.keystore
\ No newline at end of file
{
"android": {
"debug": {
"keystore": "./Cesium.keystore",
"storePassword": "Ces1um2020!",
"alias": "Cesium",
"password": "Ces1um2020!",
"keystoreType": "jks"
},
"release": {
"keystore": "./Cesium.keystore",
"storePassword": "Ces1um2020!",
"alias": "Cesium",
"password": "Ces1um2020!",
"keystoreType": "jks"
}
},
"ios": {
"debug": {
"codeSignIdentity": "iPhone Developer",
"developmentTeam": "3TH8P5JJ9J",
"automaticProvisioning": true,
"packageType": "development"
},
"release": {
"codeSignIdentity": "iPhone Developer",
"developmentTeam": "3TH8P5JJ9J",
"automaticProvisioning": true,
"packageType": "app-store"
}
}
}
\ No newline at end of file
......@@ -19,6 +19,11 @@ if (rootdir) {
var platform = platforms[x].trim().toLowerCase();
// Do not remove desktop code for iOS and macOS (support for tablets and desktop macs)
if (platform === 'ios' || platform === 'osx') {
continue;
}
var wwwPath;
if(platform == 'android') {
wwwPath = path.join(rootdir, 'platforms', platform, 'assets', 'www');
......@@ -79,8 +84,7 @@ if (rootdir) {
.pipe(removeCode(platformRemoveCodeOptions))
.pipe(ngAnnotate({single_quotes: true}))
.pipe(gulp.dest(wwwPath + '/dist/dist_js/plugins'))
);
);
}
}
......@@ -32,6 +32,7 @@
"dependencies": {
"cordova": "^9.0.0",
"cordova-android": "6.4.0",
"cordova-clipboard": "^1.3.0",
"cordova-ios": "git+https://github.com/bpresles/cordova-ios.git#5.1.0",
"cordova-osx": "^5.0.0",
"cordova-plugin-camera": "^2.4.1",
......@@ -124,7 +125,7 @@
"locator": "https://github.com/phonegap/phonegap-plugin-barcodescanner.git"
},
"cordova-plugin-ionic-keyboard",
"cordova-plugin-ionic-webview"
"cordova-plugin-ionic-webview@4.1.2"
],
"cordovaPlatforms": [
{
......@@ -140,10 +141,7 @@
],
"cordova": {
"plugins": {
"cordova-plugin-camera": {
"CAMERA_USAGE_DESCRIPTION": "Scan QRCode or avatar",
"PHOTOLIBRARY_USAGE_DESCRIPTION": "Avatar"
},
"cordova-plugin-camera": {},
"cordova-plugin-console": {},
"cordova-plugin-device": {},
"cordova-plugin-dialogs": {},
......@@ -159,7 +157,11 @@
"phonegap-plugin-barcodescanner": {
"CAMERA_USAGE_DESCRIPTION": "Scan QRCode"
},
"cordova-plugin-ionic-webview": {}
"ionic-plugin-keyboard": {},
"cordova-clipboard": {},
"cordova-plugin-ionic-webview": {
"ANDROID_SUPPORT_ANNOTATIONS_VERSION": "27.+"
}
},
"platforms": [
"ios",
......
resources/icon.png

59.4 KiB | W: | H:

resources/icon.png

379 KiB | W: | H:

resources/icon.png
resources/icon.png
resources/icon.png
resources/icon.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -1623,6 +1623,20 @@ $ionicon-var-badge-editable: $ionicon-var-edit + "\00a0";
/*
Badge inside toolbar's button
*/
.platform-ipad {
.bar-title {
border-color: $button-dark-border;
background-color: $dark;
background-image: linear-gradient(0deg,$button-dark-border,$button-dark-border 50%,transparent 50%);
.title {
background-color: white;
margin-left: 0;
margin-right: 0;
height: 44px;
}
}
}
.bar {
.badge-button {
......
This diff is collapsed.
......@@ -94,7 +94,7 @@ angular.module("cesium.config", [])
}
},
"version": "1.4.7",
"build": "2019-10-19T08:55:47.281Z",
"build": "2019-10-28T13:25:36.444Z",
"newIssueUrl": "https://git.duniter.org/clients/cesium-grp/cesium/issues/new"
})
......
......@@ -51,7 +51,7 @@
expose-aside-when="large"
enable-menu-with-back-views="false"
width="225">
<ion-header-bar>
<ion-header-bar class="bar-title">
<h1 class="title dark hidden-sm hidden-xs" >
<span class="animate-fade-in animate-show-hide ng-hide" ng-show="$root.currency.name">
{{:locale:'COMMON.APP_NAME'|translate}} {{$root.currency.name|abbreviate}}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment