znowu zjebal

.gitea/workflows/build-apk.yml

@@ -8,20 +8,13 @@ on:
 jobs:
   build:
     runs-on: ubuntu-latest
+    container:
+      image: cimg/android:2024.01
 
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
-      - name: Setup JDK
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: 17
-
-      - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
-
       - name: Grant execute permission
         run: chmod +x ./gradlew
 
@@ -33,3 +26,9 @@ jobs:
         with:
           name: app-release
           path: app/build/outputs/apk/release/app-release.apk
+
+      - name: Upload APK
+        uses: actions/upload-artifact@v4
+        with:
+          name: app-release
+          path: app/build/outputs/apk/release/app-release.apk

app/src/main/assets/css/styles.css

@@ -265,7 +265,7 @@ body {
 }
 
 .progress-bar {
-  width: 120px;
+  width: 100%;
   height: 8px;
   background-color: #e2e8f0;
   border-radius: 4px;

app/src/main/assets/js/app.js

@@ -55,7 +55,7 @@ const statusEl = document.getElementById('status');
 // load settings from localStorage
 function loadSettings(){
   try{
-    const raw = localStorage.getItem('matma:settings')
+  let progressInner = null
     if (raw) {
       const s = JSON.parse(raw)
       state.settings = Object.assign(state.settings, s)

app/src/main/assets/js/czytanie.js

@@ -21,7 +21,7 @@
   const readViewport  = document.getElementById('read-viewport')
   const readTextEl    = document.getElementById('read-text')
   const nextLineBtn   = document.getElementById('next-line-btn')
-  const progressBar   = document.getElementById('read-progress-bar-inner')
+  let progressBar = null
 
   // ── Load text list from dyktanda.json ────────────────────────────────────
   fetch('json/dyktanda.json')
@@ -132,6 +132,7 @@
 
   function updateProgressBar() {
     const progress = maxOffset > 0 ? (yOffset / maxOffset) * 100 : 100
-    progressBar.style.width = `${progress}%`
+    if (!progressBar) progressBar = document.getElementById('read-progress-bar-inner')
+    if (progressBar) progressBar.style.width = `${progress}%`
   }
 })()

app/src/main/assets/js/dyktando.js

@@ -35,7 +35,7 @@
   const summaryScore   = document.getElementById('summary-score')
   const summaryBackBtn = document.getElementById('summary-back-btn')
   const dykScroll      = document.getElementById('dyk-scroll')
-  const progressBar    = document.getElementById('dyk-progress-bar-inner')
+  let progressBar = null
 
   // ── Load texts ────────────────────────────────────────────────────────────
   fetch('json/dyktanda.json')
@@ -53,6 +53,20 @@
       textList.innerHTML = '<p style="color:var(--muted)">Nie udało się wczytać tekstów.</p>'
     })
 
+    // Poczekaj na dynamiczne załadowanie progress bara
+    document.addEventListener('DOMContentLoaded', () => {
+      // progress bar jest ładowany przez loadComponent w dyktando.html
+      const checkProgressBar = () => {
+        const el = document.getElementById('dyk-progress-bar-inner')
+        if (el) {
+          progressBar = el
+        } else {
+          setTimeout(checkProgressBar, 50)
+        }
+      }
+      checkProgressBar()
+    })
+
   customStartBtn.addEventListener('click', () => {
     const txt = customInput.value.trim()
     if (!txt) return
@@ -98,7 +112,7 @@
     textDisplay.classList.remove('hidden')
     choicesEl.classList.remove('hidden')
     progressEl.textContent = ''
-    progressBar.style.width = '0%'
+    if (progressBar) progressBar.style.width = '0%'
 
     listWrap.classList.add('hidden')
     playWrap.classList.remove('hidden')

app/src/main/assets/js/dzielenie.js

@@ -8,7 +8,7 @@
   const problemEl     = document.getElementById('problem')
   const answerEl      = document.getElementById('answer')
   const feedbackEl    = document.getElementById('feedback')
-  const progressInner = document.getElementById('progress-inner')
+  let progressInner = null
   const progressLabel = document.getElementById('progress-label')
   const summaryText   = document.getElementById('summary-text')
   const totalInput    = document.getElementById('total-input')
@@ -99,7 +99,10 @@
 
   function updateBar() {
     const pct = st.total > 0 ? Math.round((st.solved / st.total) * 100) : 0
-    progressInner.style.width = pct + '%'
+    if (!progressInner) {
+      progressInner = document.getElementById('progress-inner')
+    }
+    if (progressInner) progressInner.style.width = pct + '%'
     progressLabel.textContent = `${st.solved}/${st.total}`
   }
 

app/src/main/assets/js/mnozenie.js

@@ -8,7 +8,7 @@
   const problemEl     = document.getElementById('problem')
   const answerEl      = document.getElementById('answer')
   const feedbackEl    = document.getElementById('feedback')
-  const progressInner = document.getElementById('progress-inner')
+  let progressInner = null
   const progressLabel = document.getElementById('progress-label')
   const scoreLabel    = document.getElementById('score-label') // This element is removed, but we might re-purpose the logic
   const summaryText   = document.getElementById('summary-text')
@@ -99,7 +99,8 @@
 
   function updateBar() {
     const pct = st.total > 0 ? Math.round((st.solved / st.total) * 100) : 0
-    progressInner.style.width = pct + '%'
+    if (!progressInner) progressInner = document.getElementById('progress-inner')
+    if (progressInner) progressInner.style.width = pct + '%'
     progressLabel.textContent = `${st.solved}/${st.total}`
     // scoreLabel is removed, so we comment this out
     // scoreLabel.textContent = `✔ ${st.score}`