Moze wersja 1.0.0?

0.2.3-t9
0.2.3-t8
2026-05-29 22:53:11 +02:00 · 2026-05-29 22:37:21 +02:00 · 2026-05-29 22:26:03 +02:00 · 2026-05-29 22:20:33 +02:00
14 changed files with 246 additions and 81 deletions
@@ -27,6 +27,22 @@ 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

@@ -54,27 +70,22 @@ jobs:
          GITEA_SERVER: ${{ secrets.GIT_SERVER }}
        run: |
          set -e
+          SERVER_CLEAN=$(echo "$GITEA_SERVER" | sed 's#/$##')
+          API_BASE="${SERVER_CLEAN}/api/v1"

-          API_BASE="${GITEA_SERVER}/api/v1"
+          OWNER="${{ github.repository_owner }}"
+          REPO_NAME=$(echo "${{ github.repository }}" | cut -d/ -f2)
+          TAG="${{ github.ref_name }}"

-          REMOTE_URL=$(git config --get remote.origin.url)
-          echo "Remote URL: $REMOTE_URL"
+          echo "Debug Info:"
+          echo "- API URL: $API_BASE/repos/$OWNER/$REPO_NAME/releases"
+          echo "- OWNER: $OWNER"
+          echo "- REPO: $REPO_NAME"
+          echo "- TAG: $TAG"

-          REPO_FULL=$(echo "$REMOTE_URL" \
-            | sed -E 's#https?://[^/]+/##' \
-            | sed 's/\.git$//')
-
-          OWNER=$(echo "$REPO_FULL" | cut -d/ -f1)
-          REPO_NAME=$(echo "$REPO_FULL" | cut -d/ -f2)
-
-          echo "OWNER=$OWNER"
-          echo "REPO_NAME=$REPO_NAME"
-
-          TAG="${GITEA_REF_NAME}"
-
-          echo "Creating release $TAG for $OWNER/$REPO_NAME"
-
-          CREATE_RESPONSE=$(curl -s \
+          # 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 \
@@ -87,44 +98,65 @@ jobs:
            }" \
            "$API_BASE/repos/$OWNER/$REPO_NAME/releases")

-          echo "$CREATE_RESPONSE"
+          RESPONSE_BODY=$(cat "$RESPONSE_FILE")
+          echo "HTTP Status: $HTTP_STATUS"
+          echo "Response: $RESPONSE_BODY"

-          RELEASE_ID=$(echo "$CREATE_RESPONSE" \
-            | grep -o '"id":[0-9]*' \
-            | head -n1 \
-            | cut -d: -f2)
-
-          if [ -z "$RELEASE_ID" ]; then
-            echo "Failed to create release"
+          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

-          echo "RELEASE_ID=$RELEASE_ID" >> $GITEA_ENV
+          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
-          API_BASE=${GITEA_SERVER:+$GITEA_SERVER/api/v1}
-          API_BASE=${API_BASE:-https://gitea.com/api/v1}
-          REMOTE_URL=$(git config --get remote.origin.url || true)
-          REPO_FULL=$(echo "$REMOTE_URL" | sed -E 's#.*[:/](.+/.+)\.git$#\1#')
-          OWNER=$(echo "$REPO_FULL" | cut -d/ -f1)
-          REPO_NAME=$(echo "$REPO_FULL" | cut -d/ -f2)
-          APK_PATH=${APK_PATH:-$APK_PATH}
+          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
-          RELEASE_ID=${RELEASE_ID}
          if [ -z "$RELEASE_ID" ]; then
            echo "RELEASE_ID not set" >&2
            exit 1
          fi

-          UPLOAD_URL="$API_BASE/repos/$OWNER/$REPO_NAME/releases/$RELEASE_ID/assets?name=$(basename $APK_PATH)"
-          echo "Uploading $APK_PATH to $UPLOAD_URL"
+          # Tworzymy ładną nazwę dla pliku
+          FRIENDLY_NAME="Matma-${TAG}.apk"
+          cp "$APK_PATH" "./$FRIENDLY_NAME"

-          curl --fail -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/octet-stream" \
-            --data-binary @"$APK_PATH" "$UPLOAD_URL"
+          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
@@ -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
+
@@ -13,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>
@@ -25,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="" />
@@ -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', {
@@ -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',
@@ -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',
@@ -9,6 +9,7 @@ const state = {
  timeLeft: 60,
  sessionSolved: 0,
  sessionTarget: 20,
+  history: [],
  settings: {
    timedSeconds: 60,
    maxResult: 40,
@@ -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 = ''
@@ -160,53 +162,74 @@ function startPlay(){

 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){
@@ -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 = ''
@@ -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 = ''
@@ -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',
@@ -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>
Author	SHA1	Message	Date
Sebastian Molenda	244aa8457a	Moze wersja 1.0.0? Deploy to FTP / deploy (push) Successful in 5s Details Build APK / build (push) Successful in 2m11s Details	2026-05-29 22:53:11 +02:00
Sebastian Molenda	03bcb465cf	0.2.3-t9 Deploy to FTP / deploy (push) Successful in 5s Details Build APK / build (push) Successful in 1m56s Details	2026-05-29 22:37:21 +02:00
Sebastian Molenda	b2721c2ec3	0.2.3-t8 Deploy to FTP / deploy (push) Successful in 5s Details Build APK / build (push) Failing after 1m56s Details	2026-05-29 22:26:03 +02:00
Sebastian Molenda	1385b3ace0	0.2.3-t7 Deploy to FTP / deploy (push) Successful in 4s Details Build APK / build (push) Failing after 1m57s Details	2026-05-29 22:20:33 +02:00