Refactor: Restringimento drag & drop, legenda impostazioni, modalità offline e rimozione sezione liturgia

This commit is contained in:
David Frassi
2026-05-18 01:36:18 +02:00
parent 9982441c3c
commit 961b7ba65c
22 changed files with 988 additions and 500 deletions
-22
View File
@@ -1,22 +0,0 @@
import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { FormsModule } from '@angular/forms';
import { IonicModule } from '@ionic/angular';
import { RouterModule } from '@angular/router';
import { LiturgiaPage } from './liturgia.page';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
RouterModule.forChild([
{
path: '',
component: LiturgiaPage
}
])
],
declarations: [LiturgiaPage]
})
export class LiturgiaPageModule {}
-71
View File
@@ -1,71 +0,0 @@
<ion-header [translucent]="true" class="ion-no-border">
<ion-toolbar class="bg-gradient">
<ion-buttons slot="start">
<ion-back-button defaultHref="/settings" color="secondary"></ion-back-button>
</ion-buttons>
<ion-title class="outfit-font">Liturgia del Giorno</ion-title>
</ion-toolbar>
</ion-header>
<ion-content [fullscreen]="true" class="bg-gradient">
<div class="liturgia-container ion-padding">
<div class="date-header-wrapper ion-margin-bottom">
<div class="date-header glass">
<div class="date-navigation">
<ion-button fill="clear" color="secondary" (click)="liturgyService.prevDay()">
<ion-icon name="chevron-back-outline"></ion-icon>
</ion-button>
<h2 class="outfit-font">{{ getTodayString() }}</h2>
<ion-button fill="clear" color="secondary" (click)="liturgyService.nextDay()">
<ion-icon name="chevron-forward-outline"></ion-icon>
</ion-button>
</div>
</div>
</div>
<div *ngIf="liturgyService.loading()" class="ion-text-center ion-padding">
<ion-spinner name="crescent" color="secondary"></ion-spinner>
<p class="outfit-font">Caricamento letture...</p>
</div>
<div *ngIf="!liturgyService.loading() && liturgyService.readings() as r" class="readings-content">
<ion-accordion-group class="glass-accordion ion-margin-bottom">
<!-- Prima Lettura -->
<ion-accordion value="prima" *ngIf="r.primaLettura">
<ion-item slot="header" class="transparent-item">
<ion-label class="outfit-font reading-title">Prima Lettura</ion-label>
</ion-item>
<div class="reading-text ion-padding" slot="content" [innerHTML]="r.primaLettura"></div>
</ion-accordion>
<!-- Seconda Lettura -->
<ion-accordion value="seconda" *ngIf="r.secondaLettura">
<ion-item slot="header" class="transparent-item">
<ion-label class="outfit-font reading-title">Seconda Lettura</ion-label>
</ion-item>
<div class="reading-text ion-padding" slot="content" [innerHTML]="r.secondaLettura"></div>
</ion-accordion>
<!-- Vangelo -->
<ion-accordion value="vangelo" *ngIf="r.vangelo">
<ion-item slot="header" class="transparent-item">
<ion-label class="outfit-font reading-title">Vangelo</ion-label>
</ion-item>
<div class="reading-text ion-padding" slot="content" [innerHTML]="r.vangelo"></div>
</ion-accordion>
</ion-accordion-group>
<!-- Le sezioni dei suggerimenti sono state rimosse temporaneamente in attesa dell'implementazione AI lato server -->
</div>
<div *ngIf="!liturgyService.loading() && !liturgyService.readings()" class="ion-text-center ion-padding glass">
<p class="outfit-font">Non è stato possibile caricare le letture per oggi.</p>
<ion-button fill="clear" color="secondary" (click)="liturgyService.fetchTodayLiturgy()">Riprova</ion-button>
</div>
</div>
</ion-content>
-144
View File
@@ -1,144 +0,0 @@
.bg-gradient {
--background: transparent;
background: linear-gradient(135deg, #1a1a2e 0%, #16213e 100%);
}
.liturgia-container {
max-width: 800px;
margin: 0 auto;
}
.glass {
background: rgba(255, 255, 255, 0.05);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 16px;
padding: 16px;
}
.date-header {
display: flex;
flex-direction: column;
align-items: center;
gap: 12px;
.date-navigation {
display: flex;
align-items: center;
justify-content: space-between;
width: 100%;
h2 {
margin: 0;
font-size: 1.1rem;
color: var(--ion-color-secondary);
text-transform: capitalize;
text-align: center;
}
}
}
.keywords-container {
display: flex;
flex-wrap: wrap;
gap: 4px;
margin-bottom: 16px;
}
.moment-group {
.moment-header {
margin-bottom: 8px;
ion-badge {
font-size: 0.9rem;
padding: 6px 12px;
border-radius: 8px;
}
}
}
.glass-accordion {
background: rgba(255, 255, 255, 0.05);
backdrop-filter: blur(10px);
-webkit-backdrop-filter: blur(10px);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 16px;
overflow: hidden;
ion-accordion {
--background: transparent;
border-bottom: 1px solid rgba(255, 255, 255, 0.1);
&:last-child {
border-bottom: none;
}
.reading-title {
color: var(--ion-color-secondary);
font-size: 1.1rem;
font-weight: 600;
margin: 0;
}
.reading-text {
color: rgba(255, 255, 255, 0.9);
line-height: 1.6;
font-size: 1rem;
white-space: pre-wrap;
background: rgba(0, 0, 0, 0.2);
::ng-deep br {
display: block;
content: "";
margin-top: 10px;
}
}
}
}
.section-title {
color: #fff;
font-size: 1.2rem;
margin-bottom: 16px;
}
.song-card {
padding: 0;
transition: transform 0.2s ease;
&:active {
transform: scale(0.98);
}
.song-title {
color: #fff;
font-weight: 600;
}
.song-author {
color: rgba(255, 255, 255, 0.5);
font-size: 0.85rem;
}
}
.transparent-item {
--background: transparent;
--color: #fff;
--padding-start: 16px;
--padding-end: 16px;
}
/* Alto Contrasto per Liturgia */
:host-context(body.high-contrast) {
.glass-accordion {
// Mantengo il look glass per gli header come richiesto
ion-accordion {
.reading-text {
color: #000 !important; // Testo nero
background: #fff !important; // Sfondo bianco solido per massimo contrasto
padding: 20px !important;
}
}
}
}
-42
View File
@@ -1,42 +0,0 @@
import { Component, OnInit, inject, signal } from '@angular/core';
import { LiturgyService } from '../../services/liturgy.service';
import { Router } from '@angular/router';
import { Canto } from '../../services/canti.service';
@Component({
selector: 'app-liturgia',
templateUrl: './liturgia.page.html',
styleUrls: ['./liturgia.page.scss'],
standalone: false
})
export class LiturgiaPage implements OnInit {
public liturgyService = inject(LiturgyService);
private router = inject(Router);
ngOnInit() {
this.liturgyService.fetchTodayLiturgy();
}
suggest() {
this.liturgyService.suggestSongs();
}
onDateChange(event: any) {
const newDate = event.detail.value.split('T')[0];
this.liturgyService.fetchTodayLiturgy(newDate);
}
openSong(song: Canto) {
this.router.navigate(['/player'], { queryParams: { id: song.id } });
}
getTodayString(): string {
const date = new Date(this.liturgyService.selectedDate());
return date.toLocaleDateString('it-IT', {
weekday: 'long',
day: 'numeric',
month: 'long',
year: 'numeric'
});
}
}
+4 -4
View File
@@ -1,6 +1,6 @@
<ion-header [translucent]="true" class="ion-no-border">
<ion-toolbar class="bg-gradient top-toolbar">
<ion-buttons slot="start">
<ion-buttons slot="end">
<div class="offline-badge-header" *ngIf="!connectivityService.isOnline()">
<ion-icon name="cloud-offline-outline"></ion-icon>
</div>
@@ -57,7 +57,7 @@
</ion-button>
<!-- Youtube Link -->
<ion-button *ngIf="canto()?.link_youtube && canto()?.link_youtube!.length > 5" fill="clear" (click)="openYoutube()">
<ion-button *ngIf="connectivityService.isOnline() && canto()?.link_youtube && canto()?.link_youtube!.length > 5" fill="clear" (click)="openYoutube()">
<ion-icon name="logo-youtube" color="danger"></ion-icon>
</ion-button>
</div>
@@ -100,7 +100,7 @@
<ion-footer class="ion-no-border">
<!-- Audio Player Toolbar -->
<ion-toolbar class="global-player-toolbar glass" *ngIf="canto()?.link_youtube && canto()?.link_youtube!.length > 5 && !settingsService.fullscreenMode()">
<ion-toolbar class="global-player-toolbar glass" *ngIf="youtubePlayerService.isPlayerSupported() && canto()?.link_youtube && canto()?.link_youtube!.length > 5 && !settingsService.fullscreenMode()">
<div class="player-content">
<div class="controls-row">
<ion-button fill="clear" color="secondary" (click)="prevSong()" class="skip-btn">
@@ -182,7 +182,7 @@
</div>
<!-- Actions -->
<div class="group">
<div class="group" *ngIf="connectivityService.isOnline()">
<ion-button *ngIf="canto()?.link_youtube && canto()?.link_youtube!.length > 5" fill="clear" size="small" (click)="openYoutube()">
<ion-icon slot="icon-only" name="logo-youtube" color="danger"></ion-icon>
</ion-button>
+15 -3
View File
@@ -208,19 +208,31 @@
.slim-controls {
display: flex;
justify-content: space-between;
justify-content: flex-start;
align-items: center;
width: 100%;
padding: 0 8px;
padding: 4px 12px;
overflow-x: auto;
gap: 16px;
-webkit-overflow-scrolling: touch;
&::-webkit-scrollbar {
display: none;
}
.mic-btn-portrait {
flex-shrink: 0;
}
.group {
display: flex;
display: inline-flex;
align-items: center;
gap: 4px;
background: rgba(255, 255, 255, 0.05);
padding: 2px 6px;
border-radius: 12px;
border: 1px solid rgba(255, 255, 255, 0.1);
flex-shrink: 0;
}
.page-indicator {
+3
View File
@@ -447,6 +447,9 @@ export class PlayerPage implements OnInit, AfterViewInit, OnDestroy {
}
private initPlayer(id: string) {
if (!this.youtubePlayerService.isPlayerSupported()) {
return;
}
const startT = this.initialStartTime;
this.initialStartTime = 0; // Reset
+120 -7
View File
@@ -59,13 +59,37 @@
</ion-label>
<ion-toggle slot="end" [checked]="settingsService.showEditor()" (ionChange)="settingsService.toggleEditor()" color="secondary" [disabled]="true"></ion-toggle>
</ion-item>
<ion-item class="transparent-item" lines="none" routerLink="/liturgia" detail="true" button>
<ion-icon name="book-outline" slot="start" color="secondary"></ion-icon>
<ion-label class="outfit-font">
<h2 class="settings-item-title">Liturgia del Giorno</h2>
<p class="settings-item-subtitle">Letture e suggerimenti canti</p>
</ion-label>
</ion-item>
</div>
<!-- Messa di Riferimento Selection -->
<div class="settings-group glass ion-margin-bottom">
<div class="group-header ion-padding-start ion-padding-top">
<h2 class="outfit-font settings-group-title">
Messa di Riferimento (Suggeriti)
</h2>
</div>
<div class="select-item-container ion-padding-horizontal ion-padding-bottom">
<div class="select-label-row">
<ion-icon name="calendar-outline" color="secondary" class="select-icon"></ion-icon>
<div class="select-text-group">
<h2 class="settings-item-title outfit-font">Seleziona Messa</h2>
<p class="settings-item-subtitle outfit-font">Scegli la messa per i canti consigliati</p>
</div>
</div>
<div class="select-box-wrapper">
<ion-select [value]="cantiLettureService.selectedMassDate()"
(ionChange)="onMassChange($event)"
interface="action-sheet"
class="custom-select-block"
placeholder="Seleziona una messa...">
<ion-select-option *ngFor="let mass of cantiLettureService.availableMasses()" [value]="mass.date">
{{ mass.formattedLabel }}
</ion-select-option>
</ion-select>
</div>
</div>
</div>
<!-- Display Mode Section -->
@@ -123,6 +147,95 @@
</div>
</div>
<!-- Legenda Pulsanti Canto -->
<div class="settings-group glass ion-margin-top">
<div class="group-header ion-padding-start ion-padding-top">
<h2 class="outfit-font settings-group-title">
Legenda Pulsanti del Canto
</h2>
</div>
<div class="legend-content ion-padding-horizontal ion-padding-bottom">
<p class="legend-intro outfit-font">
All'interno della schermata di lettura del canto trovi vari pulsanti per controllare la visualizzazione e lo scorrimento:
</p>
<div class="legend-list">
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="mic" color="danger"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">Scroll Acustico (Karaoke)</h4>
<p class="outfit-font">
Attiva lo scorrimento vocale intelligente. L'app ascolta il canto o lo strumento e fa scorrere testo e accordi a tempo di musica, senza bisogno di toccare lo schermo. Uno slider verticale permette di regolare la sensibilità.
</p>
</div>
</div>
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="musical-note" color="secondary"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">Trasposizione Tonalità (+ / -)</h4>
<p class="outfit-font">
Disponibile in modalità "Accordi". Alza o abbassa la tonalità del canto di semitono in semitono, ricalcolando gli accordi all'istante.
</p>
</div>
</div>
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="arrow-up-circle" color="secondary"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">Riavvia Canto</h4>
<p class="outfit-font">
Riporta la visualizzazione all'inizio del testo e azzera il tracciamento vocale dello scroll acustico.
</p>
</div>
</div>
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="chevron-back" color="secondary"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">Navigazione Righe</h4>
<p class="outfit-font">
Permette di avanzare o tornare indietro manualmente tra le righe del testo del canto.
</p>
</div>
</div>
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="add-circle-outline" color="secondary"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">Zoom Caratteri</h4>
<p class="outfit-font">
Ingrandisce o rimpicciolisce il testo e gli accordi (puoi usare anche il gesto "pinch-to-zoom" sullo schermo).
</p>
</div>
</div>
<div class="legend-item">
<div class="legend-icon-wrapper">
<ion-icon name="logo-youtube" color="danger"></ion-icon>
</div>
<div class="legend-text">
<h4 class="outfit-font">YouTube Esterno</h4>
<p class="outfit-font">
Apre la traccia o il video ufficiale del canto direttamente sull'applicazione esterna di YouTube (quando online).
</p>
</div>
</div>
</div>
</div>
</div>
<div class="credits-footer ion-padding-top ion-text-center">
<p class="outfit-font email-text">
info@canticristiani.it
+148
View File
@@ -176,3 +176,151 @@ ion-radio {
}
}
}
.select-item-container {
display: flex;
flex-direction: column;
gap: 12px;
}
.select-label-row {
display: flex;
align-items: center;
gap: 12px;
}
.select-icon {
font-size: 1.5rem;
flex-shrink: 0;
}
.select-text-group {
display: flex;
flex-direction: column;
.settings-item-title {
font-size: 1rem !important;
font-weight: 600 !important;
line-height: 1.2;
margin: 0;
}
.settings-item-subtitle {
font-size: 0.85rem !important;
margin-top: 2px !important;
}
}
.select-box-wrapper {
background: rgba(255, 255, 255, 0.05);
border: 1px solid rgba(255, 255, 255, 0.1);
border-radius: 12px;
padding: 4px 12px;
transition: background 0.2s ease, border-color 0.2s ease;
&:active {
background: rgba(255, 255, 255, 0.1);
border-color: rgba(255, 255, 255, 0.2);
}
}
.custom-select-block {
--placeholder-color: rgba(255, 255, 255, 0.4);
--placeholder-opacity: 1;
--color: var(--ion-color-secondary);
color: var(--ion-color-secondary);
font-family: 'Outfit', sans-serif;
font-weight: 500;
width: 100%;
font-size: 0.95rem;
&::part(placeholder), &::part(text) {
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}
:host-context(body.high-contrast) {
.select-box-wrapper {
background: rgba(0, 0, 0, 0.05) !important;
border-color: rgba(0, 0, 0, 0.3) !important;
}
.custom-select-block {
--color: black !important;
color: black !important;
}
.legend-content {
.legend-intro {
color: #333333 !important;
}
.legend-item {
.legend-icon-wrapper {
background: rgba(0, 0, 0, 0.05) !important;
border: 1px solid #cccccc;
}
.legend-text {
h4 {
color: #000000 !important;
}
p {
color: #222222 !important;
}
}
}
}
}
.legend-content {
.legend-intro {
font-size: 0.9rem;
color: rgba(255, 255, 255, 0.7);
margin-bottom: 16px;
line-height: 1.4;
}
.legend-list {
display: flex;
flex-direction: column;
gap: 16px;
}
.legend-item {
display: flex;
align-items: flex-start;
gap: 12px;
.legend-icon-wrapper {
width: 32px;
height: 32px;
border-radius: 8px;
background: rgba(255, 255, 255, 0.05);
display: flex;
align-items: center;
justify-content: center;
flex-shrink: 0;
ion-icon {
font-size: 1.2rem;
}
}
.legend-text {
flex: 1;
h4 {
margin: 0 0 4px 0;
font-size: 0.95rem;
font-weight: 600;
color: var(--ion-color-secondary);
}
p {
margin: 0;
font-size: 0.82rem;
color: rgba(255, 255, 255, 0.6);
line-height: 1.4;
}
}
}
}
+6
View File
@@ -10,6 +10,7 @@ import { PlaylistService } from '../../services/playlist.service';
import { Router } from '@angular/router';
import { MyCantiService } from '../../services/my-canti.service';
import { CantiLettureService } from '../../services/canti-letture.service';
@Component({
selector: 'app-settings',
@@ -24,6 +25,7 @@ export class SettingsPage {
public cantiService = inject(CantiService);
public connectivityService = inject(ConnectivityService);
public playlistService = inject(PlaylistService);
public cantiLettureService = inject(CantiLettureService);
private swUpdate = inject(SwUpdate);
private toastCtrl = inject(ToastController);
private modalCtrl = inject(ModalController);
@@ -38,6 +40,10 @@ export class SettingsPage {
this.settingsService.setShowChordsDefault(event.detail.value === 'chords');
}
onMassChange(event: any) {
this.cantiLettureService.setSelectedMass(event.detail.value);
}
async fullRefresh() {
// 1. Refresh JSON data
this.cantiService.refresh();