Moze wersja 1.0.0?

.gitea/workflows/build-apk.yml

@@ -27,17 +27,136 @@ jobs:
       - name: Grant execute permission
         run: chmod +x ./gradlew
 
+      - name: Update version in assets
+        run: |
+          set -e
+          TAG="${{ github.ref_name }}"
+          # Jeśli tag jest pusty (np. push nie na tag), użyjemy skróconego SHA
+          if [ -z "$TAG" ] || [ "$TAG" = "main" ]; then
+            TAG=$(git rev-parse --short HEAD)
+          fi
+          echo "Setting version to: $TAG"
+          # Aktualizacja pliku js/version.js
+          echo "const APP_VERSION = '$TAG';" > app/src/main/assets/js/version.js
+          echo "document.addEventListener('DOMContentLoaded', () => {
+            const el = document.getElementById('app-version') || document.getElementById('commit-sha');
+            if (el) el.textContent = '$TAG';
+          });" >> app/src/main/assets/js/version.js
+
       - name: Build APK
         run: ./gradlew assembleRelease
 
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-release
-          path: app/build/outputs/apk/release/app-release.apk
+      - name: Locate APK
+        id: locate_apk
+        run: |
+          set -e
+          APK_PATH=$(ls app/build/outputs/apk/release/*.apk | head -n1 || true)
+          if [ -z "$APK_PATH" ]; then
+            echo "No APK found in app/build/outputs/apk/release" >&2
+            exit 1
+          fi
+          echo "APK_PATH=$APK_PATH" >> $GITHUB_ENV
+          echo "Found $APK_PATH"
 
-      - name: Upload APK
-        uses: actions/upload-artifact@v4
-        with:
-          name: app-release
-          path: app/build/outputs/apk/release/app-release.apk
+  # Note: uploading artifacts with actions/upload-artifact@v4 is not supported
+  # on some self-hosted/enterprise runners (GHES). We skip storing artifacts
+  # via that action and instead upload the APK directly to the Gitea release
+  # in the steps below.
+
+      - name: Create Gitea release
+        id: create_release
+        env:
+          GITEA_TOKEN: ${{ secrets.GIT_TOKEN }}
+          GITEA_SERVER: ${{ secrets.GIT_SERVER }}
+        run: |
+          set -e
+          SERVER_CLEAN=$(echo "$GITEA_SERVER" | sed 's#/$##')
+          API_BASE="${SERVER_CLEAN}/api/v1"
+
+          OWNER="${{ github.repository_owner }}"
+          REPO_NAME=$(echo "${{ github.repository }}" | cut -d/ -f2)
+          TAG="${{ github.ref_name }}"
+
+          echo "Debug Info:"
+          echo "- API URL: $API_BASE/repos/$OWNER/$REPO_NAME/releases"
+          echo "- OWNER: $OWNER"
+          echo "- REPO: $REPO_NAME"
+          echo "- TAG: $TAG"
+
+          # Próba utworzenia release z przechwyceniem statusu HTTP
+          RESPONSE_FILE=$(mktemp)
+          HTTP_STATUS=$(curl -s -o "$RESPONSE_FILE" -w "%{http_code}" \
+            -H "Content-Type: application/json" \
+            -H "Authorization: token $GITEA_TOKEN" \
+            -X POST \
+            -d "{
+              \"tag_name\": \"$TAG\",
+              \"name\": \"$TAG\",
+              \"body\": \"Automated release for $TAG\",
+              \"draft\": false,
+              \"prerelease\": false
+            }" \
+            "$API_BASE/repos/$OWNER/$REPO_NAME/releases")
+
+          RESPONSE_BODY=$(cat "$RESPONSE_FILE")
+          echo "HTTP Status: $HTTP_STATUS"
+          echo "Response: $RESPONSE_BODY"
+
+          if [ "$HTTP_STATUS" -eq 409 ]; then
+            echo "Release already exists, fetching existing ID..."
+            RESPONSE_BODY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$API_BASE/repos/$OWNER/$REPO_NAME/releases/tags/$TAG")
+            RELEASE_ID=$(echo "$RESPONSE_BODY" | sed -n 's/.*"id":\([0-9]*\),.*/\1/p' | head -n1)
+          elif [ "$HTTP_STATUS" -eq 201 ]; then
+            RELEASE_ID=$(echo "$RESPONSE_BODY" | sed -n 's/.*"id":\([0-9]*\),.*/\1/p' | head -n1)
+          else
+            echo "Failed to create release. Expected 201 or 409, got $HTTP_STATUS"
+            exit 1
+          fi
+
+          if [ -z "$RELEASE_ID" ]; then
+            echo "Failed to extract RELEASE_ID from response"
+            exit 1
+          fi
+
+          echo "RELEASE_ID=$RELEASE_ID" >> $GITHUB_ENV
+          echo "Successfully processed release ID: $RELEASE_ID"
+
+      - name: Upload APK to Gitea release
+        env:
+          GITEA_TOKEN: ${{ secrets.GIT_TOKEN }}
+          GITEA_SERVER: ${{ secrets.GIT_SERVER }}
+        run: |
+          set -e
+          SERVER_CLEAN=$(echo "$GITEA_SERVER" | sed 's#/$##')
+          API_BASE="${SERVER_CLEAN}/api/v1"
+
+          OWNER="${{ github.repository_owner }}"
+          REPO_NAME=$(echo "${{ github.repository }}" | cut -d/ -f2)
+          TAG="${{ github.ref_name }}"
+
+          if [ -z "$APK_PATH" ]; then
+            echo "APK_PATH not set" >&2
+            exit 1
+          fi
+          if [ -z "$RELEASE_ID" ]; then
+            echo "RELEASE_ID not set" >&2
+            exit 1
+          fi
+
+          # Tworzymy ładną nazwę dla pliku
+          FRIENDLY_NAME="Matma-${TAG}.apk"
+          cp "$APK_PATH" "./$FRIENDLY_NAME"
+
+          UPLOAD_URL="$API_BASE/repos/$OWNER/$REPO_NAME/releases/$RELEASE_ID/assets?name=$FRIENDLY_NAME"
+          echo "Uploading $FRIENDLY_NAME to $UPLOAD_URL"
+
+          curl --fail -s -H "Authorization: token $GITEA_TOKEN" \
+               -H "Content-Type: application/octet-stream" \
+               --data-binary @"./$FRIENDLY_NAME" \
+               "$UPLOAD_URL"
+
+          # Dodanie bezpośredniego linku do podsumowania buildu w Gitea
+          DOWNLOAD_URL="${SERVER_CLEAN}/${OWNER}/${REPO_NAME}/releases/download/${TAG}/${FRIENDLY_NAME}"
+          echo "### ✅ APK gotowy do pobrania!" >> $GITHUB_STEP_SUMMARY
+          echo "[Pobierz plik $FRIENDLY_NAME]($DOWNLOAD_URL)" >> $GITHUB_STEP_SUMMARY
+          echo "Adres: $DOWNLOAD_URL" >> $GITHUB_STEP_SUMMARY

.gitignore

@@ -1,3 +1,38 @@
 .DS_Store
 ./QuizzyTemplate
-./QuizzyTemplate/*
+/.QuizzyTemplate
+
+# Android/Gradle
+/.gradle/
+/build/
+/app/build/
+/**/build/
+
+# Gradle wrapper
+/gradle/wrapper/gradle-wrapper.jar
+
+# Local configuration
+/local.properties
+
+# Keystore
+*.jks
+
+# Generated APKs/outputs
+**/outputs/
+**/apk/**
+*.apk
+*.ap_
+
+# IntelliJ / Android Studio
+.idea/
+*.iml
+
+# macOS
+.DS_Store
+
+# NPM / Node
+node_modules/
+
+# Misc
+*.log
+

.idea/workspace.xml

@@ -4,14 +4,7 @@
     <option name="autoReloadType" value="NONE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="51538617-7e5b-4e71-9f47-7bda274cf4cc" name="Changes" comment="">
-      <change beforePath="$PROJECT_DIR$/.gradle/8.5/checksums/checksums.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.5/checksums/checksums.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.5/dependencies-accessors/dependencies-accessors.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/8.5/fileHashes/fileHashes.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/8.5/fileHashes/fileHashes.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/MainActivity.kt" beforeDir="false" afterPath="$PROJECT_DIR$/MainActivity.kt" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/build.gradle" beforeDir="false" afterPath="$PROJECT_DIR$/app/build.gradle" afterDir="false" />
-    </list>
+    <list default="true" id="51538617-7e5b-4e71-9f47-7bda274cf4cc" name="Changes" comment="" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -20,6 +13,18 @@
   <component name="ClangdSettings">
     <option name="formatViaClangd" value="false" />
   </component>
+  <component name="ExternalProjectsManager">
+    <system id="GRADLE">
+      <state>
+        <projects_view>
+          <tree_state>
+            <expand />
+            <select />
+          </tree_state>
+        </projects_view>
+      </state>
+    </system>
+  </component>
   <component name="Git.Settings">
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
   </component>
@@ -32,20 +37,21 @@
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">{
-  &quot;keyToString&quot;: {
-    &quot;ModuleVcsDetector.initialDetectionPerformed&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.ShowReadmeOnStart&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.git.unshallow&quot;: &quot;true&quot;,
-    &quot;RunOnceActivity.readMode.enableVisualFormatting&quot;: &quot;true&quot;,
-    &quot;cf.first.check.clang-format&quot;: &quot;false&quot;,
-    &quot;cidr.known.project.marker&quot;: &quot;true&quot;,
-    &quot;git-widget-placeholder&quot;: &quot;master&quot;,
-    &quot;kotlin-language-version-configured&quot;: &quot;true&quot;,
-    &quot;last_opened_file_path&quot;: &quot;/Users/aln/Work/Matma&quot;
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.cidr.known.project.marker": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "RunOnceActivity.readMode.enableVisualFormatting": "true",
+    "android.gradle.sync.needed": "true",
+    "cf.first.check.clang-format": "false",
+    "cidr.known.project.marker": "true",
+    "git-widget-placeholder": "master",
+    "kotlin-language-version-configured": "true",
+    "last_opened_file_path": "/Users/aln/Work/Matma"
   }
-}</component>
+}]]></component>
   <component name="TaskManager">
     <task active="true" id="Default" summary="Default task">
       <changelist id="51538617-7e5b-4e71-9f47-7bda274cf4cc" name="Changes" comment="" />

README.md

@@ -13,3 +13,33 @@ Pliki
 Jak uruchomić
 
 Otwórz plik `index.html` w przeglądarce (najlepiej na urządzeniu mobilnym lub w trybie responsywnym).
+
+Signing a release APK/AAB
+------------------------
+
+Aby uniknąć ostrzeżeń "nieznany deweloper" lub instalatora na Androidzie, zbuduj podpisany pakiet APK lub AAB i zainstaluj go zamiast debugowego APK.
+
+1. Utwórz magazyn kluczy (jeśli go nie masz):
+
+```bash
+keytool -genkey -v -keystore my-release-key.jks -keyalg RSA -keysize 2048 -validity 10000 -alias my_key_alias
+```
+
+2. Skopiuj `gradle.properties.example` do swojego osobistego pliku `~/.gradle/gradle.properties` i uzupełnij wartości (nie commituj prawdziwych haseł do kontroli wersji).
+
+3. Zbuduj podpisany pakiet APK lub AAB:
+
+```bash
+./gradlew assembleRelease   # podpisany APK (jeśli podpisywanie jest skonfigurowane)
+./gradlew bundleRelease     # AAB do Sklepu Play
+```
+
+4. Zainstaluj APK za pomocą adb:
+
+```bash
+adb install -r app/build/outputs/apk/release/app-release.apk
+```
+
+Lub przesłać AAB do Google Play (testowanie wewnętrzne) — zalecane w celu najłatwiejszej dystrybucji.
+
+Jeśli chcesz tylko przetestować lokalnie i zobaczyć ostrzeżenie "Nieznane źródła", możesz tymczasowo włączyć instalowanie z nieznanych źródeł na urządzeniu, ale dystrybucja podpisanego wydania jest bezpieczniejszym podejściem.

app/build.gradle

@@ -14,10 +14,39 @@ android {
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    // Signing configuration for release builds.
+    // Configure the following properties in either your
+    // - ~/.gradle/gradle.properties (recommended for secrets), or
+    // - <project root>/gradle.properties (do NOT commit passwords)
+    //
+    // Example properties:
+    // MYAPP_STORE_FILE=keystores/my-release-key.jks
+    // MYAPP_STORE_PASSWORD=your_store_password
+    // MYAPP_KEY_ALIAS=my_key_alias
+    // MYAPP_KEY_PASSWORD=your_key_password
+    signingConfigs {
+        release {
+            // Only configure signing when the properties are provided.
+            if (project.hasProperty('MYAPP_STORE_FILE')) {
+                storeFile file(MYAPP_STORE_FILE)
+                storePassword MYAPP_STORE_PASSWORD
+                keyAlias MYAPP_KEY_ALIAS
+                keyPassword MYAPP_KEY_PASSWORD
+            }
+        }
+    }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            // Apply signing config if available. This keeps debug and CI builds
+            // working even when signing properties are absent locally.
+            if (project.hasProperty('MYAPP_STORE_FILE')) {
+                signingConfig signingConfigs.release
+            }
+            // Ensure release builds are not debuggable.
+            debuggable false
         }
     }
 

app/build/intermediates/assets/debug/js/app.js

@@ -55,19 +55,19 @@ const statusEl = document.getElementById('status');
 // load settings from localStorage
 function loadSettings(){
   try{
-  let progressInner = null
+    const raw = (typeof localStorage !== 'undefined') ? localStorage.getItem('matma:settings') : null
     if (raw) {
       const s = JSON.parse(raw)
       state.settings = Object.assign(state.settings, s)
     }
   }catch(e){ console.warn('settings load failed', e) }
-  // reflect to inputs
-  settingTimed.value = state.settings.timedSeconds
-  settingMaxResult.value = state.settings.maxResult
-  settingMaxOperand.value = state.settings.maxOperand
-  settingSessionProblems.value = state.settings.sessionProblems
-  settingAllowNegative.checked = !!state.settings.allowNegative
-  settingAllowFraction.checked = !!state.settings.allowFraction
+  // reflect to inputs (guard in case some inputs are missing)
+  if (settingTimed) settingTimed.value = state.settings.timedSeconds
+  if (settingMaxResult) settingMaxResult.value = state.settings.maxResult
+  if (settingMaxOperand) settingMaxOperand.value = state.settings.maxOperand
+  if (settingSessionProblems) settingSessionProblems.value = state.settings.sessionProblems
+  if (settingAllowNegative) settingAllowNegative.checked = !!state.settings.allowNegative
+  if (settingAllowFraction) settingAllowFraction.checked = !!state.settings.allowFraction
 }
 
 function saveSettings(){
@@ -145,16 +145,16 @@ function startPlay(){
   renderProblem()
 
   if (state.mode === 'timed'){
-    progressInner.style.width = '0%'
-    startTimer(state.settings.timedSeconds)
-    statusEl.textContent = 'Na czas';
-    timerEl.classList.remove('hidden');
+  if (progressInner) progressInner.style.width = '0%'
+  startTimer(state.settings.timedSeconds)
+  if (statusEl) statusEl.textContent = 'Na czas';
+  if (timerEl) timerEl.classList.remove('hidden');
   } else {
-    progressInner.style.width = '0%'
-    state.sessionSolved = 0
-    state.sessionTarget = Math.max(1, state.settings.sessionProblems)
-    updateProgress()
-    timerEl.classList.add('hidden');
+  if (progressInner) progressInner.style.width = '0%'
+  state.sessionSolved = 0
+  state.sessionTarget = Math.max(1, state.settings.sessionProblems)
+  updateProgress()
+  if (timerEl) timerEl.classList.add('hidden');
   }
 }
 
@@ -311,14 +311,14 @@ backspaceBtn.addEventListener('click', ()=>{
 
 function startTimer(seconds){
   state.timeLeft = seconds
-  timerEl.textContent = state.timeLeft
+  if (timerEl) timerEl.textContent = state.timeLeft
 
   stopTimer();
   state.timerId = setInterval(()=>{
     state.timeLeft -= 1
-    timerEl.textContent = state.timeLeft
+    if (timerEl) timerEl.textContent = state.timeLeft
     const pct = Math.max(0, (state.timeLeft / seconds) * 100)
-    progressInner.style.width = pct + '%'
+    if (progressInner) progressInner.style.width = pct + '%'
     if (state.timeLeft <= 0) {
       stopTimer()
       endSession()
@@ -357,9 +357,9 @@ summaryBack.addEventListener('click', ()=>{
 
 function updateProgress(){
   if (state.mode === 'training'){
-    const pct = Math.min(100, Math.round((state.sessionSolved/state.sessionTarget)*100))
-    progressInner.style.width = pct + '%'
-    statusEl.textContent = `${state.sessionSolved}/${state.sessionTarget}`
+  const pct = Math.min(100, Math.round((state.sessionSolved/state.sessionTarget)*100))
+  if (progressInner) progressInner.style.width = pct + '%'
+  if (statusEl) statusEl.textContent = `${state.sessionSolved}/${state.sessionTarget}`
   }
 }
 

app/build/intermediates/assets/debug/js/components.js

@@ -1,7 +1,20 @@
 // Komponenty HTML loader
 function loadComponent(path, replaceMap = {}) {
+  // If path is a full mapped origin used by WebViewAssetLoader, strip it to a relative path.
+  const mappedOrigin = 'https://appassets.androidplatform.net/assets/';
+  if (path.startsWith(mappedOrigin)) {
+    path = path.slice(mappedOrigin.length);
+  }
+
+  // If an absolute path starting with '/' is provided, remove leading slash to make it
+  // relative to the current document (works under local http server and WebViewAssetLoader).
+  if (path.startsWith('/')) path = path.slice(1);
+
   return fetch(path)
-    .then(r => r.text())
+    .then(r => {
+      if (!r.ok) throw new Error('Failed to load component: ' + path);
+      return r.text();
+    })
     .then(html => {
       Object.entries(replaceMap).forEach(([key, val]) => {
         html = html.replaceAll(key, val);

app/build/intermediates/assets/debug/js/czytanie.js

@@ -83,9 +83,8 @@
   }
 
   // ── Back to list ──────────────────────────────────────────────────────────
+  // Zakończ button: natychmiast wróć do listy bez potwierdzenia
   readBackBtn.addEventListener('click', () => {
-    const active = yOffset > 0 || autoTimer !== null
-    if (active && !confirm('Wrócić do listy tekstów?')) return
     clearInterval(autoTimer)
     autoTimer = null
     readWrap.classList.add('hidden')

app/build/intermediates/assets/debug/js/dyktando.js

@@ -296,9 +296,8 @@
   }
 
   // ── Navigation ────────────────────────────────────────────────────────────
+  // Zakończ button: natychmiast wracamy do listy bez potwierdzenia
   playBackBtn.addEventListener('click', () => {
-    const inProgress = blanks.length > 0 && current < blanks.length
-    if (inProgress && !confirm('Przerwać dyktando i wrócić do listy?')) return
     goToList()
   })
 

app/build/intermediates/assets/debug/js/dzielenie.js

@@ -136,7 +136,8 @@
     let sha = (window.COMMIT_SHA || '').toString().trim()
     if (!sha) {
       try {
-        const res = await fetch('/version.sha', { cache: 'no-cache' })
+  // use relative path so the request works under WebViewAssetLoader or a local server
+  const res = await fetch('version.sha', { cache: 'no-cache' })
         if (res.ok) {
           const txt = await res.text()
           const first = txt.split(/\r?\n/).find(l => l.trim().length > 0)

app/build/intermediates/assets/debug/js/mnozenie.js

@@ -136,7 +136,8 @@
     let sha = (window.COMMIT_SHA || '').toString().trim()
     if (!sha) {
       try {
-        const res = await fetch('/version.sha', { cache: 'no-cache' })
+  // use relative path so the request works under WebViewAssetLoader or a local server
+  const res = await fetch('version.sha', { cache: 'no-cache' })
         if (res.ok) {
           const txt = await res.text()
           const first = txt.split(/\r?\n/).find(l => l.trim().length > 0)

app/build/intermediates/assets/debug/js/nav.js

@@ -4,14 +4,10 @@
     const backBtn = document.getElementById('back-to-hub')
     if (!backBtn) return
 
+    // Immediately navigate back to hub/menu without confirmation
     backBtn.addEventListener('click', (e) => {
-      const playScreen = document.getElementById('play-screen')
-      const taskActive = playScreen && !playScreen.classList.contains('hidden')
-      if (taskActive) {
-        e.preventDefault()
-        const ok = confirm('Masz aktywne zadanie. Czy na pewno chcesz wyjść do menu?')
-        if (ok) window.location.href = backBtn.getAttribute('href')
-      }
+      const href = backBtn.getAttribute('href')
+      if (href) window.location.href = href
     })
   })
 })()

app/build/intermediates/incremental/packageDebug/tmp/debug/dex-renamer-state.txt

@@ -1,4 +1,4 @@
-#Wed May 27 14:04:13 CEST 2026
+#Wed May 27 14:53:22 CEST 2026
 base.2=/Users/aln/Work/Matma/app/build/intermediates/dex/debug/mergeProjectDexDebug/6/classes.dex
 path.2=6/classes.dex
 base.1=/Users/aln/Work/Matma/app/build/intermediates/dex/debug/mergeProjectDexDebug/0/classes.dex

app/build/kotlin/compileDebugKotlin/cacheable/caches-jvm/lookups/counters.tab

@@ -1,2 +1,2 @@
-3
+4
 0

app/src/main/assets/czytanie.html

@@ -52,9 +52,17 @@
     </div>
 
     <div id="footer-placeholder"></div>
+    <header class="app-header">
+      <button id="back-btn" class="app-nav-btn">← Menu</button>
+      <div class="header-title">Nauka Czytania</div>
+    </header>
+    <footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
+      Wersja: <span id="app-version">...</span>
+    </footer>
     <script src="js/nav.js?v=20260521"></script>
     <script src="js/czytanie.js?v=20260524"></script>
     <script src="js/components.js"></script>
+    <script src="js/version.js"></script>
     <script>
       // Ładowanie nagłówka i stopki
       loadComponent('components/header.html', {

app/src/main/assets/dyktando.html

@@ -59,9 +59,13 @@
     </div>
 
     <div id="footer-placeholder"></div>
+    <footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
+      Wersja: <span id="app-version">...</span>
+    </footer>
     <script src="js/nav.js?v=20260521"></script>
     <script src="js/dyktando.js?v=20260524"></script>
     <script src="js/components.js"></script>
+    <script src="js/version.js"></script>
     <script>
       loadComponent('components/header.html', {
         '{TITLE}': '✏️ Dyktando',

app/src/main/assets/dzielenie.html

@@ -95,9 +95,13 @@
   </div>
 
   <div id="footer-placeholder"></div>
+  <footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
+      Wersja: <span id="app-version">...</span>
+    </footer>
   <script src="js/nav.js?v=20260521"></script>
   <script src="js/dzielenie.js?v=20260524"></script>
   <script src="js/components.js"></script>
+  <script src="js/version.js"></script>
   <script>
     loadComponent('components/header.html', {
       '{TITLE}': '÷ Nauka Dzielenia',

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

@@ -9,6 +9,7 @@ const state = {
   timeLeft: 60,
   sessionSolved: 0,
   sessionTarget: 20,
+  history: [],
   settings: {
     timedSeconds: 60,
     maxResult: 40,
@@ -55,19 +56,19 @@ const statusEl = document.getElementById('status');
 // load settings from localStorage
 function loadSettings(){
   try{
-  let progressInner = null
+    const raw = (typeof localStorage !== 'undefined') ? localStorage.getItem('matma:settings') : null
     if (raw) {
       const s = JSON.parse(raw)
       state.settings = Object.assign(state.settings, s)
     }
   }catch(e){ console.warn('settings load failed', e) }
-  // reflect to inputs
-  settingTimed.value = state.settings.timedSeconds
-  settingMaxResult.value = state.settings.maxResult
-  settingMaxOperand.value = state.settings.maxOperand
-  settingSessionProblems.value = state.settings.sessionProblems
-  settingAllowNegative.checked = !!state.settings.allowNegative
-  settingAllowFraction.checked = !!state.settings.allowFraction
+  // reflect to inputs (guard in case some inputs are missing)
+  if (settingTimed) settingTimed.value = state.settings.timedSeconds
+  if (settingMaxResult) settingMaxResult.value = state.settings.maxResult
+  if (settingMaxOperand) settingMaxOperand.value = state.settings.maxOperand
+  if (settingSessionProblems) settingSessionProblems.value = state.settings.sessionProblems
+  if (settingAllowNegative) settingAllowNegative.checked = !!state.settings.allowNegative
+  if (settingAllowFraction) settingAllowFraction.checked = !!state.settings.allowFraction
 }
 
 function saveSettings(){
@@ -137,6 +138,7 @@ function startPlay(){
   menuScreen.classList.add('hidden')
   playScreen.classList.remove('hidden')
   state.score = 0
+  state.history = []
   scoreEl.textContent = state.score
   state.answerBuffer = ''
   answerEl.textContent = ''
@@ -145,68 +147,89 @@ function startPlay(){
   renderProblem()
 
   if (state.mode === 'timed'){
-    progressInner.style.width = '0%'
-    startTimer(state.settings.timedSeconds)
-    statusEl.textContent = 'Na czas';
-    timerEl.classList.remove('hidden');
+  if (progressInner) progressInner.style.width = '0%'
+  startTimer(state.settings.timedSeconds)
+  if (statusEl) statusEl.textContent = 'Na czas';
+  if (timerEl) timerEl.classList.remove('hidden');
   } else {
-    progressInner.style.width = '0%'
-    state.sessionSolved = 0
-    state.sessionTarget = Math.max(1, state.settings.sessionProblems)
-    updateProgress()
-    timerEl.classList.add('hidden');
+  if (progressInner) progressInner.style.width = '0%'
+  state.sessionSolved = 0
+  state.sessionTarget = Math.max(1, state.settings.sessionProblems)
+  updateProgress()
+  if (timerEl) timerEl.classList.add('hidden');
   }
 }
 
 function generateProblem(){
   const ops = Array.from(state.ops)
-  const op = ops[Math.floor(Math.random()*ops.length)]
   const maxOp = Math.max(1, state.settings.maxOperand)
   const maxRes = Math.max(1, state.settings.maxResult)
-  let a = 0, b = 0
-  for (let i=0;i<200;i++){
+  let a = 0, b = 0, op = '';
+
+  const maxAttempts = 200;
+  for (let i = 0; i < maxAttempts; i++) {
+    op = ops[Math.floor(Math.random()*ops.length)]
+    let candidate = null;
+
     if (op === 'div'){
       b = randInt(1, maxOp)
       if (!state.settings.allowFraction){
         const maxQByOp = Math.floor(maxOp / b)
         const maxQ = Math.min(maxRes, maxQByOp)
-        if (maxQ < 0) continue
-        const q = randInt(0, maxQ)
-        a = q * b
-        if (state.settings.allowNegative && Math.random() < 0.2) a = -a
-        return {a,b,op}
+        if (maxQ >= 0) {
+            const q = randInt(0, maxQ)
+            a = q * b
+            if (state.settings.allowNegative && Math.random() < 0.2) a = -a
+            candidate = {a,b,op}
+        }
       } else {
         const maxResultNByOp = Math.floor((10 * maxOp) / b)
         const maxResultN = Math.min(maxRes * 10, maxResultNByOp)
-        if (maxResultN < 0) continue
-        const result_n = randInt(0, maxResultN)
-        if ((result_n * b) % 10 !== 0) continue
-        a = (result_n * b) / 10
-        if (state.settings.allowNegative && Math.random() < 0.2) a = -a
-        return {a,b,op}
+        if (maxResultN >= 0) {
+            const result_n = randInt(0, maxResultN)
+            if ((result_n * b) % 10 === 0) {
+                a = (result_n * b) / 10
+                if (state.settings.allowNegative && Math.random() < 0.2) a = -a
+                candidate = {a,b,op}
+            }
+        }
       }
     } else if (op === 'mul'){
       a = randInt(0, maxOp)
       b = randInt(0, maxOp)
-      if (a * b <= maxRes) return {a,b,op}
+      if (a * b <= maxRes) candidate = {a,b,op}
     } else if (op === 'add'){
       a = randInt(0, maxOp)
       b = randInt(0, maxOp)
-      if (a + b <= maxRes) return {a,b,op}
+      if (a + b <= maxRes) candidate = {a,b,op}
     } else if (op === 'sub'){
       a = randInt(0, maxOp)
       b = randInt(0, maxOp)
       if (!state.settings.allowNegative){
         if (a < b) [a,b] = [b,a]
-        if (a - b <= maxRes) return {a,b,op}
+        if (a - b <= maxRes) candidate = {a,b,op}
       } else {
-        if (Math.abs(a - b) <= maxRes) return {a,b,op}
+        if (Math.abs(a - b) <= maxRes) candidate = {a,b,op}
       }
     }
+
+    if (candidate) {
+        // Generujemy klucz dla historii. Dla dodawania i mnożenia 2+3 to to samo co 3+2.
+        const key = (op === 'add' || op === 'mul')
+            ? `${op}:${[candidate.a, candidate.b].sort().join(',')}`
+            : `${op}:${candidate.a},${candidate.b}`;
+
+        if (!state.history.includes(key) || i === maxAttempts - 1) {
+            state.history.push(key);
+            if (state.history.length > 20) state.history.shift();
+            return candidate;
+        }
+    }
   }
+
   a = Math.min(maxOp, Math.floor(maxRes/2))
   b = Math.min(maxOp, 1)
-  return {a,b,op}
+  return {a,b,op: ops[0] || 'add'}
 }
 
 function randInt(min,max){
@@ -311,14 +334,14 @@ backspaceBtn.addEventListener('click', ()=>{
 
 function startTimer(seconds){
   state.timeLeft = seconds
-  timerEl.textContent = state.timeLeft
+  if (timerEl) timerEl.textContent = state.timeLeft
 
   stopTimer();
   state.timerId = setInterval(()=>{
     state.timeLeft -= 1
-    timerEl.textContent = state.timeLeft
+    if (timerEl) timerEl.textContent = state.timeLeft
     const pct = Math.max(0, (state.timeLeft / seconds) * 100)
-    progressInner.style.width = pct + '%'
+    if (progressInner) progressInner.style.width = pct + '%'
     if (state.timeLeft <= 0) {
       stopTimer()
       endSession()
@@ -357,9 +380,9 @@ summaryBack.addEventListener('click', ()=>{
 
 function updateProgress(){
   if (state.mode === 'training'){
-    const pct = Math.min(100, Math.round((state.sessionSolved/state.sessionTarget)*100))
-    progressInner.style.width = pct + '%'
-    statusEl.textContent = `${state.sessionSolved}/${state.sessionTarget}`
+  const pct = Math.min(100, Math.round((state.sessionSolved/state.sessionTarget)*100))
+  if (progressInner) progressInner.style.width = pct + '%'
+  if (statusEl) statusEl.textContent = `${state.sessionSolved}/${state.sessionTarget}`
   }
 }
 

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

@@ -1,7 +1,20 @@
 // Komponenty HTML loader
 function loadComponent(path, replaceMap = {}) {
+  // If path is a full mapped origin used by WebViewAssetLoader, strip it to a relative path.
+  const mappedOrigin = 'https://appassets.androidplatform.net/assets/';
+  if (path.startsWith(mappedOrigin)) {
+    path = path.slice(mappedOrigin.length);
+  }
+
+  // If an absolute path starting with '/' is provided, remove leading slash to make it
+  // relative to the current document (works under local http server and WebViewAssetLoader).
+  if (path.startsWith('/')) path = path.slice(1);
+
   return fetch(path)
-    .then(r => r.text())
+    .then(r => {
+      if (!r.ok) throw new Error('Failed to load component: ' + path);
+      return r.text();
+    })
     .then(html => {
       Object.entries(replaceMap).forEach(([key, val]) => {
         html = html.replaceAll(key, val);

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

@@ -83,9 +83,8 @@
   }
 
   // ── Back to list ──────────────────────────────────────────────────────────
+  // Zakończ button: natychmiast wróć do listy bez potwierdzenia
   readBackBtn.addEventListener('click', () => {
-    const active = yOffset > 0 || autoTimer !== null
-    if (active && !confirm('Wrócić do listy tekstów?')) return
     clearInterval(autoTimer)
     autoTimer = null
     readWrap.classList.add('hidden')

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

@@ -296,9 +296,8 @@
   }
 
   // ── Navigation ────────────────────────────────────────────────────────────
+  // Zakończ button: natychmiast wracamy do listy bez potwierdzenia
   playBackBtn.addEventListener('click', () => {
-    const inProgress = blanks.length > 0 && current < blanks.length
-    if (inProgress && !confirm('Przerwać dyktando i wrócić do listy?')) return
     goToList()
   })
 

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

@@ -1,6 +1,6 @@
 // Nauka Dzielenia
 ;(function () {
-  const st = { divisor: null, total: 20, solved: 0, score: 0, current: null, buf: '' }
+  const st = { divisor: null, total: 20, solved: 0, score: 0, current: null, buf: '', history: [] }
 
   const selectScreen  = document.getElementById('select-screen')
   const playScreen    = document.getElementById('play-screen')
@@ -26,13 +26,14 @@
     st.total  = Math.max(5, Math.min(100, parseInt(totalInput.value, 10) || 20))
     st.solved = 0
     st.score  = 0
+    st.history = []
     show(playScreen)
     nextProblem()
   })
 
   document.getElementById('back-btn').addEventListener('click', () => show(selectScreen))
   document.getElementById('again-btn').addEventListener('click', () => {
-    st.solved = 0; st.score = 0; show(playScreen); nextProblem()
+    st.solved = 0; st.score = 0; st.history = []; show(playScreen); nextProblem()
   })
   document.getElementById('change-btn').addEventListener('click', () => show(selectScreen))
 
@@ -60,9 +61,28 @@
   function randInt(min, max) { return Math.floor(Math.random() * (max - min + 1)) + min }
 
   function nextProblem() {
-    const b      = st.divisor || randInt(1, 10) // divisor
-    const answer = randInt(1, 10)               // quotient (always integer)
-    const a      = b * answer                   // dividend
+    let a, b, answer, key;
+    const maxAttempts = 50;
+
+    for (let i = 0; i < maxAttempts; i++) {
+        b = st.divisor || randInt(1, 10) // divisor
+        answer = randInt(1, 10)          // quotient
+        a = b * answer                   // dividend
+
+        // Jeśli wybrano konkretny dzielnik, kluczem jest iloraz (wynik).
+        // W przeciwnym razie kluczem jest całe działanie.
+        key = st.divisor ? answer : `${a}:${b}`;
+
+        if (!st.history.includes(key) || i === maxAttempts - 1) {
+            st.history.push(key);
+            break;
+        }
+    }
+
+    if (st.history.length > (st.divisor ? 6 : 15)) {
+        st.history.shift();
+    }
+
     st.current   = { a, b, answer }
     problemEl.textContent = `${a} ÷ ${b}`
     feedbackEl.textContent = ''
@@ -136,7 +156,8 @@
     let sha = (window.COMMIT_SHA || '').toString().trim()
     if (!sha) {
       try {
-        const res = await fetch('/version.sha', { cache: 'no-cache' })
+  // use relative path so the request works under WebViewAssetLoader or a local server
+  const res = await fetch('version.sha', { cache: 'no-cache' })
         if (res.ok) {
           const txt = await res.text()
           const first = txt.split(/\r?\n/).find(l => l.trim().length > 0)

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

@@ -1,6 +1,6 @@
 // Nauka Mnożenia
 ;(function () {
-  const st = { table: null, total: 20, solved: 0, score: 0, current: null, buf: '' }
+  const st = { table: null, total: 20, solved: 0, score: 0, current: null, buf: '', history: [] }
 
   const selectScreen  = document.getElementById('select-screen')
   const playScreen    = document.getElementById('play-screen')
@@ -27,13 +27,14 @@
     st.total  = Math.max(5, Math.min(100, parseInt(totalInput.value, 10) || 20))
     st.solved = 0
     st.score  = 0
+    st.history = []
     show(playScreen)
     nextProblem()
   })
 
   document.getElementById('back-btn').addEventListener('click', () => show(selectScreen))
   document.getElementById('again-btn').addEventListener('click', () => {
-    st.solved = 0; st.score = 0; show(playScreen); nextProblem()
+    st.solved = 0; st.score = 0; st.history = []; show(playScreen); nextProblem()
   })
   document.getElementById('change-btn').addEventListener('click', () => show(selectScreen))
 
@@ -61,8 +62,26 @@
   function randInt(min, max) { return Math.floor(Math.random() * (max - min + 1)) + min }
 
   function nextProblem() {
-    const a = st.table || randInt(1, 10)
-    const b = randInt(1, 10)
+    let a, b, key;
+    const maxAttempts = 50;
+
+    for (let i = 0; i < maxAttempts; i++) {
+        a = st.table || randInt(1, 10)
+        b = randInt(1, 10)
+        // Jeśli wybrano konkretną tabelkę, kluczem jest tylko drugi składnik.
+        // Jeśli "wszystkie", kluczem jest posortowana para (żeby 2x3 i 3x2 były traktowane tak samo).
+        key = st.table ? b : [a, b].sort().join('x');
+
+        if (!st.history.includes(key) || i === maxAttempts - 1) {
+            st.history.push(key);
+            break;
+        }
+    }
+
+    if (st.history.length > (st.table ? 6 : 15)) {
+        st.history.shift();
+    }
+
     st.current = { a, b, answer: a * b }
     problemEl.textContent = `${a} × ${b}`
     feedbackEl.textContent = ''
@@ -136,7 +155,8 @@
     let sha = (window.COMMIT_SHA || '').toString().trim()
     if (!sha) {
       try {
-        const res = await fetch('/version.sha', { cache: 'no-cache' })
+  // use relative path so the request works under WebViewAssetLoader or a local server
+  const res = await fetch('version.sha', { cache: 'no-cache' })
         if (res.ok) {
           const txt = await res.text()
           const first = txt.split(/\r?\n/).find(l => l.trim().length > 0)

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

@@ -4,14 +4,10 @@
     const backBtn = document.getElementById('back-to-hub')
     if (!backBtn) return
 
+    // Immediately navigate back to hub/menu without confirmation
     backBtn.addEventListener('click', (e) => {
-      const playScreen = document.getElementById('play-screen')
-      const taskActive = playScreen && !playScreen.classList.contains('hidden')
-      if (taskActive) {
-        e.preventDefault()
-        const ok = confirm('Masz aktywne zadanie. Czy na pewno chcesz wyjść do menu?')
-        if (ok) window.location.href = backBtn.getAttribute('href')
-      }
+      const href = backBtn.getAttribute('href')
+      if (href) window.location.href = href
     })
   })
 })()

app/src/main/assets/mnozenie.html

@@ -95,9 +95,13 @@
   </div>
 
   <div id="footer-placeholder"></div>
+  <footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
+      Wersja: <span id="app-version">...</span>
+    </footer>
   <script src="js/nav.js?v=20260521"></script>
   <script src="js/mnozenie.js?v=20260524"></script>
   <script src="js/components.js"></script>
+  <script src="js/version.js"></script>
   <script>
     loadComponent('components/header.html', {
       '{TITLE}': '× Nauka Mnożenia',

app/src/main/assets/testy.html

@@ -148,6 +148,9 @@
   </div>
 
   <div id="footer-placeholder"></div>
+  <footer class="app-footer" style="text-align: center; padding: 1rem; font-size: 0.8rem; color: #64748b;">
+      Wersja: <span id="app-version">...</span>
+    </footer>
   <script src="js/version.js?v=20260521" defer></script>
   <script src="js/nav.js?v=20260521"></script>
   <script src="js/app.js?v=20260524"></script>

app/src/main/java/com/example/app/MainActivity.kt

@@ -1,9 +1,12 @@
 package com.example.app
 
 import android.os.Bundle
+import android.webkit.WebResourceRequest
+import android.webkit.WebResourceResponse
 import android.webkit.WebView
 import android.webkit.WebViewClient
 import androidx.appcompat.app.AppCompatActivity
+import androidx.webkit.WebViewAssetLoader
 
 class MainActivity : AppCompatActivity() {
 
@@ -11,16 +14,27 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         val webView = WebView(this)
-    // Enable remote debugging for WebView so we can inspect JS console via chrome://inspect
-    WebView.setWebContentsDebuggingEnabled(true)
+
+        // Enable remote debugging for WebView so we can inspect JS console via chrome://inspect
+        WebView.setWebContentsDebuggingEnabled(true)
 
         webView.settings.javaScriptEnabled = true
-        webView.settings.allowFileAccess = true
         webView.settings.domStorageEnabled = true
 
-        webView.webViewClient = WebViewClient()
+        // Use WebViewAssetLoader to serve files from /assets/ over a secure origin.
+        val assetLoader = WebViewAssetLoader.Builder()
+            .addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this))
+            .build()
 
-        webView.loadUrl("file:///android_asset/index.html")
+        webView.webViewClient = object : WebViewClient() {
+            override fun shouldInterceptRequest(view: WebView?, request: WebResourceRequest?): WebResourceResponse? {
+                if (request == null) return null
+                return assetLoader.shouldInterceptRequest(request.url)
+            }
+        }
+
+        // Load the app via the mapped secure origin so fetch() requests are allowed
+        webView.loadUrl("https://appassets.androidplatform.net/assets/index.html")
 
         setContentView(webView)
     }

gradle.properties.example

@@ -0,0 +1,12 @@
+# Example properties for signing your release APK/AAB.
+# DO NOT commit real passwords. Copy this to gradle.properties in your home
+# directory (~/.gradle/gradle.properties) or to a secure CI secret store.
+
+# Path to your keystore file (relative to project root or absolute path)
+MYAPP_STORE_FILE=keystores/my-release-key.jks
+# Your keystore password
+MYAPP_STORE_PASSWORD=
+# Your key alias inside the keystore
+MYAPP_KEY_ALIAS=
+# Your key password (often same as store password)
+MYAPP_KEY_PASSWORD=