Skip to content

Commit d44cbe4

Browse files
authored
Merge pull request #25 from byrdsandbytes/feature/sc-2040-add-back-buttons-to-sub-pages
Feature/sc 2040 add back buttons to sub pages
2 parents 89fc4fc + 4fec8bc commit d44cbe4

File tree

11 files changed

+73
-67
lines changed

11 files changed

+73
-67
lines changed

CHANGELOG.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
# Changelog
22

3+
## [0.3.0] - 2025-08-30
4+
5+
### Added
6+
- Add livereload command for native platform development
7+
8+
### Fixed
9+
- Fix tabbar issue on iPad
10+
11+
312
## [0.2.2] - 2025-08-12
413

514
### Added

ionic.config.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
{
22
"name": "beatnik",
3-
"integrations": {},
3+
"integrations": {
4+
"capacitor": {}
5+
},
46
"type": "angular"
57
}

package-lock.json

Lines changed: 22 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "beatnik",
3-
"version": "0.2.2",
3+
"version": "0.3.0",
44
"author": "byrds & bytes gmbh",
5-
"homepage": "https://beatnik.ch",
5+
"homepage": "https://beatnik.audio",
66
"scripts": {
77
"ng": "ng",
88
"start": "ng serve",
@@ -13,7 +13,9 @@
1313
"generate:service": "ionic g service services/$npm_config_name && ng generate --skip-tests=true class model/$npm_config_name --type=model",
1414
"generate:component": "ionic g component $npm_config_name && ng generate module $npm_config_name",
1515
"generate:page": "ionic g page pages/$npm_config_name",
16-
"generate:guard": "ng g guard guards/$npm_config_name"
16+
"generate:guard": "ng g guard guards/$npm_config_name",
17+
"ios": "ionic cap run ios -l --external",
18+
"android": "ionic cap run android -l --external"
1719
},
1820
"private": true,
1921
"dependencies": {
@@ -26,9 +28,9 @@
2628
"@angular/platform-browser-dynamic": "^19.0.0",
2729
"@angular/router": "^19.0.0",
2830
"@capacitor/android": "^7.2.0",
29-
"@capacitor/app": "^7.0.1",
30-
"@capacitor/core": "^7.2.0",
31-
"@capacitor/haptics": "^7.0.1",
31+
"@capacitor/app": "7.0.2",
32+
"@capacitor/core": "7.4.2",
33+
"@capacitor/haptics": "7.0.2",
3234
"@capacitor/ios": "^7.2.0",
3335
"@capacitor/keyboard": "7.0.1",
3436
"@capacitor/preferences": "^7.0.1",
@@ -56,7 +58,7 @@
5658
"@angular/compiler-cli": "^19.0.0",
5759
"@angular/language-service": "^19.0.0",
5860
"@capacitor/assets": "^3.0.5",
59-
"@capacitor/cli": "^7.2.0",
61+
"@capacitor/cli": "7.4.2",
6062
"@ionic/angular-toolkit": "^12.0.0",
6163
"@types/jasmine": "~5.1.0",
6264
"@typescript-eslint/eslint-plugin": "^8.18.0",

src/app/pages/menu/menu.page.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@
2525
<ion-icon slot="start" name="information-circle"></ion-icon>
2626
<ion-label>About</ion-label>
2727
</ion-item>
28+
<ion-item lines="none">
29+
</ion-item>
2830
</ion-list>
2931
</div>
32+
<p class="version-label">v.{{version}}</p>
33+
3034
</ion-content>

src/app/pages/menu/menu.page.scss

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
.version-label {
2+
font-size: 12px;
3+
color: gray;
4+
text-align: center;
5+
margin-top: 16px;
6+
}

src/app/pages/menu/menu.page.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
import { Component, OnInit } from '@angular/core';
2+
import packageJson from '../../../../package.json';
23

34
@Component({
45
selector: 'app-menu',
@@ -8,9 +9,18 @@ import { Component, OnInit } from '@angular/core';
89
})
910
export class MenuPage implements OnInit {
1011

12+
version: string = '0.0.0';
13+
1114
constructor() { }
1215

1316
ngOnInit() {
17+
this.version = packageJson.version;
18+
19+
}
20+
21+
async getVersion() {
22+
// get version from package.json
1423
}
24+
1525

1626
}

src/app/tabs/tabs.page.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<ion-tabs>
1+
<ion-tabs >
22
<div class="page-padding-bottom">
33
</div>
44
<ion-tab-bar class="tabbar" slot="bottom" color="dark">

src/app/tabs/tabs.page.scss

Lines changed: 0 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +0,0 @@
1-
.bottom-sheet {
2-
position: fixed;
3-
left: 0;
4-
right: 0;
5-
bottom: 40px; // stays under the tab-bar
6-
height: 90vh; // <-- max-height breakpoint
7-
background: var(--ion-color-dark);
8-
border-radius: 16px 16px 0 0;
9-
box-shadow: 0 -2px 10px rgba(0, 0, 0, 0.15);
10-
transition: transform 0.3s ease;
11-
z-index: 10;
12-
will-change: transform;
13-
/* Optional, avoids flash of full sheet before TS runs */
14-
transform: translateY(calc(90vh - 120px)); // collapsed offset (min-height)
15-
}
16-
17-
.drag-handle {
18-
width: 40px;
19-
height: 5px;
20-
background: #ccc;
21-
border-radius: 5px;
22-
margin: 10px auto;
23-
}
24-
25-
.backdrop {
26-
position: fixed;
27-
inset: 0; // shorthand for top/left/right/bottom
28-
background: rgba(0,0,0,.3);
29-
z-index: 5;
30-
}
31-
32-
.page-padding-bottom {
33-
margin-bottom: 300px; // Adjust as needed to ensure content is not obscured by the tab bar
34-
}
35-

src/global.scss

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,14 @@
5555
// --height: 50%;
5656
--border-radius: 16px;
5757
// --box-shadow: 0 10px 15px -3px rgb(0 0 0 / 0.1), 0 4px 6px -4px rgb(0 0 0 / 0.1);
58-
margin-bottom: calc(50px + var(--ion-safe-area-bottom, 0));
58+
margin-bottom: calc(8vh + var(--ion-safe-area-bottom, 12px)); // Adjust for tab bar and safe area
5959
// margin-bottom: (var(--ion-safe-area-bottom, 0) + 50px);
6060
--width: 100%;
6161
}
6262

63-
/* src/global.scss */
63+
ion-tab-bar {
64+
height: 8vh; /* Sets height to 8% of the viewport's height */
65+
}
6466

6567
/* Regular */
6668
@font-face {

0 commit comments

Comments
 (0)