Skip to content

Commit

Permalink
Merge pull request #330 from e-picsa/feat/farmer-nav-buttons
Browse files Browse the repository at this point in the history
Feat/farmer nav buttons
  • Loading branch information
chrismclarke authored Oct 4, 2024
2 parents 9be7e1c + ff729d8 commit d0fe747
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 16 deletions.
4 changes: 2 additions & 2 deletions apps/picsa-apps/extension-app-native/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ android {
applicationId "io.picsa.extension"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 3046000
versionName "3.46.0"
versionCode 3046001
versionName "3.46.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,26 @@
{{ 'Home' | translate }}
</button>
<div class="footer-nav-buttons">
<button mat-button color="white" (click)="previous()" [disabled]="selectedIndex() === 0">
{{ 'Previous' | translate }}
<button
mat-icon-button
color="white"
[attr.aria-labe]="'previous' | translate"
(click)="previous()"
[disabled]="selectedIndex() === 0"
>
<mat-icon>arrow_back</mat-icon>
</button>
<!-- Tab counter - could consider labels/icons although not as much space on mobile -->
<span class="footer-tab-counter">{{ selectedIndex() + 1 }} / {{ totalSections() }}</span>

<button mat-button color="white" (click)="next()" [disabled]="selectedIndex() === totalSections() - 1">
{{ 'Next' | translate }}
<button
mat-icon-button
color="white"
[attr.aria-label]="'next' | translate"
(click)="next()"
[disabled]="selectedIndex() === totalSections() - 1"
>
<mat-icon>arrow_forward</mat-icon>
</button>
</div>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
:host {
--footer-height: 36px;
--footer-height: 48px;
// Adjust farmer tabs to compensate for header and increased footer size
@screen sm {
--footer-height: 48px;
}
@screen md {
--footer-height: 60px;
--footer-height: 64px;
}
}
.content-container {
Expand Down
2 changes: 1 addition & 1 deletion libs/environments/src/version.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@ import packageJson from '../../../package.json';

export const APP_VERSION = {
number: packageJson.version,
date: '2024-10-01',
date: '2024-10-04',
};
6 changes: 3 additions & 3 deletions libs/shared/src/services/core/db_v2/db-sync.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ export class PicsaDatabaseSyncService {
/** Track local document deletions in separate collection to sync to server */
private syncDeleteCollection: RxCollection<ISyncDeleteEntry>;

constructor(private supabaseService: SupabaseService) {
this.subscribeToNetworkChanges();
}
constructor(private supabaseService: SupabaseService) {}

/**
* Register database for sync service to interact with
Expand All @@ -44,6 +42,8 @@ export class PicsaDatabaseSyncService {
this.db = db;
const { sync_delete } = await this.db.addCollections({ sync_delete: SYNC_DELETE_COLLECTION });
this.syncDeleteCollection = sync_delete;
// once db is registered subscribe to network changes to manage syncing
this.subscribeToNetworkChanges();
}

/** Register a given collection to have records pushed to supabase db */
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "picsa-apps",
"version": "3.46.0",
"version": "3.46.1",
"license": "See LICENSE",
"scripts": {
"ng": "nx",
Expand Down

0 comments on commit d0fe747

Please sign in to comment.