Rework Settings

frostcube · May 28, 2024 · 7fa43c1 · 7fa43c1
1 parent c3962ba
commit 7fa43c1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 12 deletions.
diff --git a/ios/App/Podfile.lock b/ios/App/Podfile.lock
@@ -3,7 +3,7 @@ PODS:
     - CapacitorCordova
   - CapacitorApp (5.0.6):
     - Capacitor
-  - CapacitorBrowser (5.1.0):
+  - CapacitorBrowser (5.2.0):
     - Capacitor
   - CapacitorCordova (5.5.1)
   - CapacitorHaptics (5.0.6):
@@ -46,7 +46,7 @@ EXTERNAL SOURCES:
 SPEC CHECKSUMS:
   Capacitor: 9da0a2415e3b6098511f8b5ffdb578d91ee79f8f
   CapacitorApp: 024e1b1bea5f883d79f6330d309bc441c88ad04a
-  CapacitorBrowser: 7a0fb6a1011abfaaf2dfedfd8248f942a8eda3d6
+  CapacitorBrowser: a6deae9e5bf87f62b62a753cff7992c5def9e771
   CapacitorCordova: e128cc7688c070ca0bfa439898a5f609da8dbcfe
   CapacitorHaptics: 1fffc1217c7e64a472d7845be50fb0c2f7d4204c
   CapacitorKeyboard: b978154b024a5f65e044908e37d15b7de58b9d12

diff --git a/src/app/feed/feed.page.ts b/src/app/feed/feed.page.ts
@@ -142,8 +142,8 @@ export class FeedPage {
   async openSettings() {
     const settings = await this.modalController.create({
       component: SettingsComponent,
-      breakpoints: [0, 0.75],
-      initialBreakpoint: 0.5
+      breakpoints: [0, 0.33, 0.66],
+      initialBreakpoint: 0.33
     });
 
     settings.present();

diff --git a/src/app/services/settings.service.ts b/src/app/services/settings.service.ts
@@ -22,7 +22,7 @@ export class SettingsService {
     showImages: false,
     compressedFeed: false,
     locale: 'en-AU',
-    retrievalTimeout: 2000, // 2 seconds
+    retrievalTimeout: 5000, // 5 seconds
     defaultPollingFrequency: 0, // Unlimited
     maxFeedLength: 10
   };

diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
@@ -14,24 +14,42 @@ <h1>Preferences</h1>
       (ionChange)="update()"> Compress feed display </ion-toggle>
     </ion-item>
     <ion-item>
-      <ion-select label="Country" placeholder="currentSettings.locale" [(ngModel)]="currentSettings.locale">
+      <ion-select label="Country" placeholder="currentSettings.locale" [(ngModel)]="currentSettings.locale"
+      (ionChange)="update()">
         <!-- Locale list https://www.oracle.com/java/technologies/javase/java8locales.html -->
         <ion-select-option value="en-AU">Australia (AU)</ion-select-option>
         <ion-select-option value="de-DE">Germany</ion-select-option>
         <ion-select-option value="en-US">United States (US)</ion-select-option>
       </ion-select>
     </ion-item>
     <ion-item>
-      <ion-input label="Feed Retrieval Timeout (ms)" labelPlacement="stacked" [value]="currentSettings.retrievalTimeout"
-      (ionChange)="update()"[(ngModel)]="currentSettings.retrievalTimeout"></ion-input>
+      <ion-select label="Network Connection" placeholder="currentSettings.retrievalTimeout" [(ngModel)]="currentSettings.retrievalTimeout"
+      (ionChange)="update()">
+        <ion-select-option value=2500>Fast</ion-select-option>
+        <ion-select-option value=5000>Average (Default)</ion-select-option>
+        <ion-select-option value=10000>Slow</ion-select-option>
+        <ion-select-option value=60000>Unbearable</ion-select-option>
+      </ion-select>
     </ion-item>
     <ion-item>
-      <ion-input label="Default Polling Frequency (s) - 0 for unlimited" labelPlacement="stacked" [value]="currentSettings.defaultPollingFrequency"
-      (ionChange)="update()"[(ngModel)]="currentSettings.defaultPollingFrequency"></ion-input>
+      <ion-select label="Default Polling Frequency" placeholder="currentSettings.defaultPollingFrequency" 
+      [(ngModel)]="currentSettings.defaultPollingFrequency" (ionChange)="update()">
+        <ion-select-option value=0>Unlimited (Default)</ion-select-option>
+        <ion-select-option value=60>1 minute</ion-select-option>
+        <ion-select-option value=600>10 minutes</ion-select-option>
+        <ion-select-option value=3600>1 hour</ion-select-option>
+      </ion-select>
     </ion-item>
     <ion-item>
-      <ion-input label="Max Feed Items per Feed (Can impact app performance) - 0 for unlimited" labelPlacement="stacked" [value]="currentSettings.maxFeedLength"
-      (ionChange)="update()"[(ngModel)]="currentSettings.maxFeedLength"></ion-input>
+      <ion-select label="Max Feed Items per Feed (Can impact app performance)" placeholder="currentSettings.maxFeedLength" 
+      [(ngModel)]="currentSettings.maxFeedLength" (ionChange)="update()">
+        <ion-select-option value=1>1 item</ion-select-option>
+        <ion-select-option value=10>10 items (Default)</ion-select-option>        
+        <ion-select-option value=25>25 items</ion-select-option>
+        <ion-select-option value=50>50 items</ion-select-option>
+        <ion-select-option value=100>100 items</ion-select-option>
+        <ion-select-option value=0>Unlimited</ion-select-option>
+      </ion-select>
     </ion-item>
   </ion-list>
 </ion-content>