diff --git a/android/app/build.gradle b/android/app/build.gradle index bb0d83c..df4cf3b 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -3,6 +3,7 @@ apply plugin: 'com.android.application' android { namespace = "com.knots.mobile" compileSdk = rootProject.ext.compileSdkVersion + defaultConfig { applicationId "com.knots.mobile" minSdkVersion rootProject.ext.minSdkVersion @@ -10,12 +11,19 @@ android { versionCode 1 versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + aaptOptions { - // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. - // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 + // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. ignoreAssetsPattern = '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~' } } + + // ✅ Forcer Java 17 + compileOptions { + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 + } + buildTypes { release { minifyEnabled false @@ -25,7 +33,7 @@ android { } repositories { - flatDir{ + flatDir { dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs' } } @@ -51,4 +59,4 @@ try { } } catch(Exception e) { logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work") -} +} \ No newline at end of file diff --git a/android/build.gradle b/android/build.gradle index f8f0e43..b1d1d0c 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,7 +1,16 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + + allprojects { + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + } + } + repositories { google() mavenCentral() diff --git a/public/logo-menu.png b/public/logo-menu.png new file mode 100644 index 0000000..af782a0 Binary files /dev/null and b/public/logo-menu.png differ diff --git a/public/logo-menu.svg b/public/logo-menu.svg new file mode 100644 index 0000000..260388f --- /dev/null +++ b/public/logo-menu.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/src/app/app.component.html b/src/app/app.component.html index 36093e1..90c6b64 100644 --- a/src/app/app.component.html +++ b/src/app/app.component.html @@ -1,336 +1 @@ - - - - - - - - - - - -
-
-
- -

Hello, {{ title }}

-

Congratulations! Your app is running. 🎉

-
- -
-
- @for (item of [ - { title: 'Explore the Docs', link: 'https://angular.dev' }, - { title: 'Learn with Tutorials', link: 'https://angular.dev/tutorials' }, - { title: 'CLI Docs', link: 'https://angular.dev/tools/cli' }, - { title: 'Angular Language Service', link: 'https://angular.dev/tools/language-service' }, - { title: 'Angular DevTools', link: 'https://angular.dev/tools/devtools' }, - ]; track item.title) { - - {{ item.title }} - - - - - } -
- -
-
-
- - - - - - - - - - - + \ No newline at end of file diff --git a/src/app/app.routes.ts b/src/app/app.routes.ts index dc39edb..8b0fce6 100644 --- a/src/app/app.routes.ts +++ b/src/app/app.routes.ts @@ -1,3 +1,29 @@ import { Routes } from '@angular/router'; -export const routes: Routes = []; +export const routes: Routes = [ + { + path: '', + pathMatch: 'full', + redirectTo: '/main/messages', + }, + { + path: 'main', + loadComponent: () => import('./pages/main/main.component').then(x => x.Main), + children: [ + { + path:'groupmessages', + loadComponent: () => import('./pages/groupmessages/groupmessages.component').then(x => x.Groupmessages) + }, + + { + path:'messages', + loadComponent: () => import('./pages/messages/messages.component').then(x => x.Messages) + }, + + { + path:'parameters', + loadComponent: () => import('./pages/parameters/parameters.component').then(x => x.Parameters) + } + ] + } +]; \ No newline at end of file diff --git a/src/app/pages/groupmessages/groupmessages.component.html b/src/app/pages/groupmessages/groupmessages.component.html new file mode 100644 index 0000000..d052821 --- /dev/null +++ b/src/app/pages/groupmessages/groupmessages.component.html @@ -0,0 +1,3 @@ +

+ groupmessage works! +

diff --git a/src/app/pages/groupmessages/groupmessages.component.scss b/src/app/pages/groupmessages/groupmessages.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/groupmessages/groupmessages.component.spec.ts b/src/app/pages/groupmessages/groupmessages.component.spec.ts new file mode 100644 index 0000000..b63b477 --- /dev/null +++ b/src/app/pages/groupmessages/groupmessages.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { GroupmessagesComponent } from './groupmessages.component'; + +describe('GroupmessagesComponent', () => { + let component: GroupmessagesComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ GroupmessagesComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(GroupmessagesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/groupmessages/groupmessages.component.ts b/src/app/pages/groupmessages/groupmessages.component.ts new file mode 100644 index 0000000..53fe7fe --- /dev/null +++ b/src/app/pages/groupmessages/groupmessages.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-groupmessages', + templateUrl: './groupmessages.component.html', + styleUrls: ['./groupmessages.component.scss'], +}) +export class Groupmessages implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/pages/main/main.component.html b/src/app/pages/main/main.component.html new file mode 100644 index 0000000..0680b43 --- /dev/null +++ b/src/app/pages/main/main.component.html @@ -0,0 +1 @@ + diff --git a/src/app/pages/main/main.component.scss b/src/app/pages/main/main.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/main/main.component.spec.ts b/src/app/pages/main/main.component.spec.ts new file mode 100644 index 0000000..145a2a6 --- /dev/null +++ b/src/app/pages/main/main.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MainComponent } from './main.component'; + +describe('MainComponent', () => { + let component: MainComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ MainComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MainComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/main/main.component.ts b/src/app/pages/main/main.component.ts new file mode 100644 index 0000000..bec54da --- /dev/null +++ b/src/app/pages/main/main.component.ts @@ -0,0 +1,16 @@ +import { Component, OnInit } from '@angular/core'; +import {RouterOutlet} from "@angular/router"; + +@Component({ + selector: 'app-main', + imports: [RouterOutlet], + templateUrl: './main.component.html', + styleUrls: ['./main.component.scss'], +}) +export class Main implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/pages/messages/messages.component.html b/src/app/pages/messages/messages.component.html new file mode 100644 index 0000000..9bee74c --- /dev/null +++ b/src/app/pages/messages/messages.component.html @@ -0,0 +1,3 @@ +

+ message works! +

diff --git a/src/app/pages/messages/messages.component.scss b/src/app/pages/messages/messages.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/messages/messages.component.spec.ts b/src/app/pages/messages/messages.component.spec.ts new file mode 100644 index 0000000..ff872b8 --- /dev/null +++ b/src/app/pages/messages/messages.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { MessagesComponent } from './messages.component'; + +describe('MessagesComponent', () => { + let component: MessagesComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ MessagesComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(MessagesComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/messages/messages.component.ts b/src/app/pages/messages/messages.component.ts new file mode 100644 index 0000000..7e57a67 --- /dev/null +++ b/src/app/pages/messages/messages.component.ts @@ -0,0 +1,22 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-messages', + template: ` +
+ menu +
+ menu + + + + `, + styleUrls: ['./messages.component.scss'], +}) +export class Messages implements OnInit { + + constructor() { } + + ngOnInit() {} + +} diff --git a/src/app/pages/parameters/parameters.component.html b/src/app/pages/parameters/parameters.component.html new file mode 100644 index 0000000..1dcb030 --- /dev/null +++ b/src/app/pages/parameters/parameters.component.html @@ -0,0 +1,3 @@ +

+ parameters works! +

diff --git a/src/app/pages/parameters/parameters.component.scss b/src/app/pages/parameters/parameters.component.scss new file mode 100644 index 0000000..e69de29 diff --git a/src/app/pages/parameters/parameters.component.spec.ts b/src/app/pages/parameters/parameters.component.spec.ts new file mode 100644 index 0000000..608f4da --- /dev/null +++ b/src/app/pages/parameters/parameters.component.spec.ts @@ -0,0 +1,24 @@ +import { ComponentFixture, TestBed, waitForAsync } from '@angular/core/testing'; +import { IonicModule } from '@ionic/angular'; + +import { ParametersComponent } from './parameters.component'; + +describe('ParametersComponent', () => { + let component: ParametersComponent; + let fixture: ComponentFixture; + + beforeEach(waitForAsync(() => { + TestBed.configureTestingModule({ + declarations: [ ParametersComponent ], + imports: [IonicModule.forRoot()] + }).compileComponents(); + + fixture = TestBed.createComponent(ParametersComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + })); + + it('should create', () => { + expect(component).toBeTruthy(); + }); +}); diff --git a/src/app/pages/parameters/parameters.component.ts b/src/app/pages/parameters/parameters.component.ts new file mode 100644 index 0000000..a6185e6 --- /dev/null +++ b/src/app/pages/parameters/parameters.component.ts @@ -0,0 +1,14 @@ +import { Component, OnInit } from '@angular/core'; + +@Component({ + selector: 'app-parameters', + templateUrl: './parameters.component.html', + styleUrls: ['./parameters.component.scss'], +}) +export class Parameters implements OnInit { + + constructor() { } + + ngOnInit() {} + +}