From 1385b3ace03bdb3130284c63610d14f8acdbc298 Mon Sep 17 00:00:00 2001
From: Sebastian Molenda <sebastian@molenda.net>
Date: Fri, 29 May 2026 22:20:33 +0200
Subject: [PATCH] 0.2.3-t7

---
 .gitignore                               |  37 +++++++++++++-
 .gradle/8.5/checksums/checksums.lock     | Bin 17 -> 17 bytes
 .gradle/8.5/checksums/md5-checksums.bin  | Bin 34197 -> 36397 bytes
 .gradle/8.5/checksums/sha1-checksums.bin | Bin 97979 -> 126701 bytes
 .idea/workspace.xml                      |  39 ++++++++++-----
 app/src/main/assets/js/app.js            |  61 ++++++++++++++++-------
 app/src/main/assets/js/dzielenie.js      |  30 +++++++++--
 app/src/main/assets/js/mnozenie.js       |  27 ++++++++--
 8 files changed, 152 insertions(+), 42 deletions(-)

diff --git a/.gitignore b/.gitignore
index b5b62e4..fdb5652 100644
--- a/.gitignore
+++ b/.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
+
diff --git a/.gradle/8.5/checksums/checksums.lock b/.gradle/8.5/checksums/checksums.lock
index 0881312d6c3a5807a7e9925be02ee12375ecfe93..ad421426350cc60a1957aa310a5c96e5c7496a06 100644
GIT binary patch
literal 17
VcmZR+`g5A@KKXl#7{Gva8vsB91+4%8

literal 17
VcmZR+`g5A@KKXl#7{Gwl3IIQc1u*~s

diff --git a/.gradle/8.5/checksums/md5-checksums.bin b/.gradle/8.5/checksums/md5-checksums.bin
index 3ab03852883169871f0583d7185ebc179f1c34e8..2119158a16c383afcf55bdbc094e18099e542b15 100644
GIT binary patch
delta 3039
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
LR$@q!A8f;)V&_88

delta 192
zcmV;x06+h&oC1}L0<bg~0Xma47)g_^7)X;Q884G<8F-Tw8ep@H8aV-z-WwQ`4jeC&
zRU9z0ogA0}lT9AMlO`W`leHf)ll~v4v%Me)0h9G1V6$x^XaSS$BfyizBpH+TBzTjC
zC111sCE)?H_9q7clPxJ2vt22H1e5kH7?UP07qe9^$pMo#Fh`S>Fu{{<G4GRgGDwrv
uGQpFsGpLhpG#HbfG^n#)HTVIOZa3GHT{w`F1v$zB9f7eSkP@>&NK`$MElceH

diff --git a/.gradle/8.5/checksums/sha1-checksums.bin b/.gradle/8.5/checksums/sha1-checksums.bin
index a197b7f13579a72e4e21ce25a46ca4df831f63df..930219c98ccbc239f9e11e707e60cedde5af741b 100644
GIT binary patch
delta 5752
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
AasU7T

delta 347
zcmaERmwoqN)(s{SjK3zEN_cFZDiO#y`Jbf3WH+e^li8#_Hm6B1V45r^Cowrq&S3I7
zx&F<e@|G-<mnp|@mQ^ui+nlDgfpM~)PQ~VZIu?wZ`Si9kO}=YzQ+&cn2@me@D-0mO
z=*{~d3brrZ#3;bDIo4<c<7QP8MXu@B4l*9tEN8!gW%D!VNESBzMh1qJ_0!J^GiFX-
zK9f;=v#Ezyjw<8d?3M09dv&LSjbrfL3!x=+AoP<SAg#Gk@rU?EgO}nH4cI65JmFyc
zyLsx9olKL{o==#}_rhay-U|oT#mC+<Z@%}T04Vx-#b&iH|CuJ+eqS;9?{~?~dOrdf
zH&6Q+0QCE>_mf%we3;DpcZG!A2Z<#szA*`b?P09A4D-fxy9P$d>G=(e3EQ7HFxoS1
buKlkh%A|jCqN2xiuMLcR+t-UQ@?-%3F#V3E

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index aa9ec5e..ccd0453 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -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="" />
diff --git a/app/src/main/assets/js/app.js b/app/src/main/assets/js/app.js
index d1bfe0a..8d40d9f 100644
--- a/app/src/main/assets/js/app.js
+++ b/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,
@@ -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){
diff --git a/app/src/main/assets/js/dzielenie.js b/app/src/main/assets/js/dzielenie.js
index 16a288c..1420d55 100644
--- a/app/src/main/assets/js/dzielenie.js
+++ b/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 = ''
diff --git a/app/src/main/assets/js/mnozenie.js b/app/src/main/assets/js/mnozenie.js
index 5be3efc..64ed945 100644
--- a/app/src/main/assets/js/mnozenie.js
+++ b/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 = ''