From 73e996fb50d07964d7965414901796ced4572aa8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Eudes=20In=C3=A1cio?= Date: Thu, 28 Oct 2021 09:30:28 +0100 Subject: [PATCH 1/4] Screen Orientation for mobile its lock --- package.json | 2 +- src/app/app.component.ts | 10 +++++++++- src/app/home/home.page.ts | 4 +++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 945a26926..63c179b6b 100644 --- a/package.json +++ b/package.json @@ -199,4 +199,4 @@ "url": "git+https://Kayaya@bitbucket.org/equilibriumito/gabinete-digital.git" }, "license": "ISC" -} +} \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0cfd110dd..05cf78fd0 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,6 +8,7 @@ import * as _rollupMoment from 'moment'; import { NgxMatDateFormats } from '@angular-material-components/datetime-picker'; const moment = _rollupMoment || _moment; import { NGX_MAT_DATE_FORMATS } from '@angular-material-components/datetime-picker'; +import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; const CUSTOM_DATE_FORMATS: NgxMatDateFormats = { @@ -35,7 +36,8 @@ export class AppComponent { constructor( private platform: Platform, /* private splashScreen: SplashScreen, */ - private statusBar: StatusBar + private statusBar: StatusBar, + private screenOrientation: ScreenOrientation ) { this.initializeApp(); } @@ -44,6 +46,12 @@ export class AppComponent { this.platform.ready().then(() => { this.statusBar.styleDefault(); /* this.splashScreen.hide(); */ + + if (this.platform.is("tablet")) { + this.screenOrientation.unlock(); + } else if( this.platform.is("mobile")) { + this.screenOrientation.lock(this.screenOrientation.ORIENTATIONS.PORTRAIT_PRIMARY); + } }); } } diff --git a/src/app/home/home.page.ts b/src/app/home/home.page.ts index 67674d637..29b5a962a 100644 --- a/src/app/home/home.page.ts +++ b/src/app/home/home.page.ts @@ -24,6 +24,7 @@ import { BackgroundService } from 'src/app/services/background.service'; import { OfflineManagerService } from 'src/app/services/offline-manager.service'; import { Storage } from '@ionic/storage'; import { EventsService } from 'src/app/services/events.service'; +import { ScreenOrientation } from '@ionic-native/screen-orientation/ngx'; @Component({ @@ -84,7 +85,8 @@ export class HomePage implements OnInit { private backgroundservice: BackgroundService, private offlinemanager: OfflineManagerService, private storage: Storage, - private eventservice: EventsService) { + private eventservice: EventsService, + private screenOrientation: ScreenOrientation) { this.webNotificationPopupService.askNotificationPermission() From f1307949b1d1a2df0da5698edf3fad40c3ccdd5b Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 28 Oct 2021 14:42:54 +0100 Subject: [PATCH 2/4] improve icon --- src/app/pages/search/search.page.html | 8 ++++---- src/assets/www/pdfjs/web/viewer.html | 2 +- src/theme/variables.scss | 6 ++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index 1e6c1766f..a97745b11 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -48,8 +48,8 @@
-
- +
+
@@ -62,7 +62,7 @@
- +
@@ -75,7 +75,7 @@
- +
diff --git a/src/assets/www/pdfjs/web/viewer.html b/src/assets/www/pdfjs/web/viewer.html index 0d7dfbf13..732317389 100644 --- a/src/assets/www/pdfjs/web/viewer.html +++ b/src/assets/www/pdfjs/web/viewer.html @@ -35,7 +35,7 @@ console.log(event) if (event.data && event.data.sender == "cookies") { - + // setCookie() } }); diff --git a/src/theme/variables.scss b/src/theme/variables.scss index d88138a9c..3f22483ee 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -710,7 +710,7 @@ body { --login-background: linear-gradient(180deg, #c63527 60%, #000 100%) !important; --button-hover: #c63527; --button-color: #ffb81c; - --button-text-color: #000; + --button-text-color: white; --inicio-open-page-from-box: #c63527; --header-tab-top-border: #000; @@ -776,8 +776,6 @@ body { } } - - .default { --ion-color-primary: #3880ff; --ion-color-secondary: #e4e8eb75; @@ -785,7 +783,7 @@ body { --button-hover: #42b9fe; --inicio-open-page-from-box: #42b9fe; --button-color: #e0e9ee; - --button-text-color: #white; + --button-text-color: white; --header-tab-top-border: white; --header-tab-text-white: white; --mat-selected: #87cefa; From 4a43571e57c77ad44b870a4b0df01757b7088fcc Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 28 Oct 2021 15:18:52 +0100 Subject: [PATCH 3/4] Improve icons --- src/assets/icon/theme/gov/icons-chat-send.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/icon/theme/gov/icons-chat-send.svg b/src/assets/icon/theme/gov/icons-chat-send.svg index cd0ae4e61..ab4457c38 100644 --- a/src/assets/icon/theme/gov/icons-chat-send.svg +++ b/src/assets/icon/theme/gov/icons-chat-send.svg @@ -1,7 +1,7 @@ - - + + - - + + From 0429c6f30848fb26f468af0c38f32c17ad208f3f Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Thu, 28 Oct 2021 15:29:19 +0100 Subject: [PATCH 4/4] improve --- src/app/pages/search/search.page.html | 3 ++- .../icon/theme/gov/icons-most-searched-words-open.svg | 7 +++++++ src/assets/images/theme/gov/advance-search-show-modal.svg | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 src/assets/icon/theme/gov/icons-most-searched-words-open.svg create mode 100644 src/assets/images/theme/gov/advance-search-show-modal.svg diff --git a/src/app/pages/search/search.page.html b/src/app/pages/search/search.page.html index a97745b11..9c9c2b413 100644 --- a/src/app/pages/search/search.page.html +++ b/src/app/pages/search/search.page.html @@ -27,7 +27,8 @@
- + +
diff --git a/src/assets/icon/theme/gov/icons-most-searched-words-open.svg b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg new file mode 100644 index 000000000..f26180425 --- /dev/null +++ b/src/assets/icon/theme/gov/icons-most-searched-words-open.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/src/assets/images/theme/gov/advance-search-show-modal.svg b/src/assets/images/theme/gov/advance-search-show-modal.svg new file mode 100644 index 000000000..f26180425 --- /dev/null +++ b/src/assets/images/theme/gov/advance-search-show-modal.svg @@ -0,0 +1,7 @@ + + + + + + +