Compare commits
19 Commits
7bab05fb24
..
v0.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
| 35b19cf140 | |||
| 0b3c8e8a02 | |||
| d890c6e15d | |||
| ccbb3549d1 | |||
| 145c148bbc | |||
| 3402bb1c13 | |||
| 92b66f5b8b | |||
| cd5d92feff | |||
| d3ef35f9ce | |||
| 367402e777 | |||
| f59f0f19c8 | |||
| 44338d1502 | |||
| d9885a2d17 | |||
| 8dd8ccd5f7 | |||
| d3407057f2 | |||
| 0386b615b1 | |||
| ea84777b97 | |||
| 3bcf995c10 | |||
| 202562878a |
@@ -0,0 +1,43 @@
|
|||||||
|
name: Build APK
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
tags:
|
||||||
|
- 'v*'
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
build:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
container:
|
||||||
|
image: cimg/android:2024.01
|
||||||
|
|
||||||
|
steps:
|
||||||
|
- name: Install Node.js
|
||||||
|
run: |
|
||||||
|
sudo apt-get update
|
||||||
|
sudo apt-get install -y curl
|
||||||
|
curl -fsSL https://deb.nodesource.com/setup_20.x | sudo -E bash -
|
||||||
|
sudo apt-get install -y nodejs
|
||||||
|
- name: Checkout
|
||||||
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
|
- name: Generate Gradle Wrapper
|
||||||
|
run: gradle wrapper
|
||||||
|
|
||||||
|
- name: Grant execute permission
|
||||||
|
run: chmod +x ./gradlew
|
||||||
|
|
||||||
|
- 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: Upload APK
|
||||||
|
uses: actions/upload-artifact@v4
|
||||||
|
with:
|
||||||
|
name: app-release
|
||||||
|
path: app/build/outputs/apk/release/app-release.apk
|
||||||
@@ -25,6 +25,6 @@ jobs:
|
|||||||
server: ${{ secrets.FTP_HOST }}
|
server: ${{ secrets.FTP_HOST }}
|
||||||
username: ${{ secrets.FTP_USER }}
|
username: ${{ secrets.FTP_USER }}
|
||||||
password: ${{ secrets.FTP_PASS }}
|
password: ${{ secrets.FTP_PASS }}
|
||||||
local-dir: ./
|
local-dir: app/src/main/assets/
|
||||||
server-dir: /
|
server-dir: /
|
||||||
|
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -0,0 +1,2 @@
|
|||||||
|
#Wed May 27 00:12:10 CEST 2026
|
||||||
|
gradle.version=8.5
|
||||||
Binary file not shown.
Binary file not shown.
Generated
+59
@@ -0,0 +1,59 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="AutoImportSettings">
|
||||||
|
<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>
|
||||||
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
|
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
|
||||||
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
|
</component>
|
||||||
|
<component name="ClangdSettings">
|
||||||
|
<option name="formatViaClangd" value="false" />
|
||||||
|
</component>
|
||||||
|
<component name="Git.Settings">
|
||||||
|
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
|
||||||
|
</component>
|
||||||
|
<component name="ProjectColorInfo">{
|
||||||
|
"associatedIndex": 2,
|
||||||
|
"fromUser": false
|
||||||
|
}</component>
|
||||||
|
<component name="ProjectId" id="3EHNE822z12n2x6rUf57MsHEkbE" />
|
||||||
|
<component name="ProjectViewState">
|
||||||
|
<option name="hideEmptyMiddlePackages" value="true" />
|
||||||
|
<option name="showLibraryContents" value="true" />
|
||||||
|
</component>
|
||||||
|
<component name="PropertiesComponent">{
|
||||||
|
"keyToString": {
|
||||||
|
"ModuleVcsDetector.initialDetectionPerformed": "true",
|
||||||
|
"RunOnceActivity.ShowReadmeOnStart": "true",
|
||||||
|
"RunOnceActivity.cidr.known.project.marker": "true",
|
||||||
|
"RunOnceActivity.git.unshallow": "true",
|
||||||
|
"RunOnceActivity.readMode.enableVisualFormatting": "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 name="TaskManager">
|
||||||
|
<task active="true" id="Default" summary="Default task">
|
||||||
|
<changelist id="51538617-7e5b-4e71-9f47-7bda274cf4cc" name="Changes" comment="" />
|
||||||
|
<created>1779831422173</created>
|
||||||
|
<option name="number" value="Default" />
|
||||||
|
<option name="presentableId" value="Default" />
|
||||||
|
<updated>1779831422173</updated>
|
||||||
|
</task>
|
||||||
|
<servers />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
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() {
|
||||||
|
|
||||||
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
|
super.onCreate(savedInstanceState)
|
||||||
|
|
||||||
|
val webView = WebView(this)
|
||||||
|
|
||||||
|
webView.settings.javaScriptEnabled = true
|
||||||
|
webView.settings.domStorageEnabled = true
|
||||||
|
|
||||||
|
// Use WebViewAssetLoader to serve files from /assets/ over a secure origin.
|
||||||
|
val assetLoader = WebViewAssetLoader.Builder()
|
||||||
|
.addPathHandler("/assets/", WebViewAssetLoader.AssetsPathHandler(this))
|
||||||
|
.build()
|
||||||
|
|
||||||
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$">
|
||||||
|
<sourceFolder url="file://$MODULE_DIR$" isTestSource="false" packagePrefix="com.example.app" />
|
||||||
|
</content>
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
apply plugin: 'com.android.application'
|
||||||
|
apply plugin: 'kotlin-android'
|
||||||
|
|
||||||
|
android {
|
||||||
|
namespace 'com.example.app'
|
||||||
|
compileSdk 34
|
||||||
|
|
||||||
|
defaultConfig {
|
||||||
|
applicationId "com.example.app"
|
||||||
|
minSdk 21
|
||||||
|
targetSdk 34
|
||||||
|
versionCode 1
|
||||||
|
versionName "1.0"
|
||||||
|
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||||
|
}
|
||||||
|
|
||||||
|
buildTypes {
|
||||||
|
release {
|
||||||
|
minifyEnabled false
|
||||||
|
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
compileOptions {
|
||||||
|
sourceCompatibility JavaVersion.VERSION_17
|
||||||
|
targetCompatibility JavaVersion.VERSION_17
|
||||||
|
}
|
||||||
|
|
||||||
|
kotlinOptions {
|
||||||
|
jvmTarget = "17"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
dependencies {
|
||||||
|
implementation 'androidx.core:core-ktx:1.9.0'
|
||||||
|
implementation 'androidx.appcompat:appcompat:1.6.1'
|
||||||
|
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.9.22"
|
||||||
|
implementation 'androidx.webkit:webkit:1.8.0'
|
||||||
|
}
|
||||||
@@ -0,0 +1 @@
|
|||||||
|
{}
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
#- File Locator -
|
||||||
|
listingFile=../../../outputs/apk/debug/output-metadata.json
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
appMetadataVersion=1.1
|
||||||
|
androidGradlePluginVersion=8.2.2
|
||||||
File diff suppressed because it is too large
Load Diff
@@ -55,7 +55,7 @@ const statusEl = document.getElementById('status');
|
|||||||
// load settings from localStorage
|
// load settings from localStorage
|
||||||
function loadSettings(){
|
function loadSettings(){
|
||||||
try{
|
try{
|
||||||
const raw = localStorage.getItem('matma:settings')
|
let progressInner = null
|
||||||
if (raw) {
|
if (raw) {
|
||||||
const s = JSON.parse(raw)
|
const s = JSON.parse(raw)
|
||||||
state.settings = Object.assign(state.settings, s)
|
state.settings = Object.assign(state.settings, s)
|
||||||
@@ -21,7 +21,7 @@
|
|||||||
const readViewport = document.getElementById('read-viewport')
|
const readViewport = document.getElementById('read-viewport')
|
||||||
const readTextEl = document.getElementById('read-text')
|
const readTextEl = document.getElementById('read-text')
|
||||||
const nextLineBtn = document.getElementById('next-line-btn')
|
const nextLineBtn = document.getElementById('next-line-btn')
|
||||||
const progressBar = document.getElementById('read-progress-bar-inner')
|
let progressBar = null
|
||||||
|
|
||||||
// ── Load text list from dyktanda.json ────────────────────────────────────
|
// ── Load text list from dyktanda.json ────────────────────────────────────
|
||||||
fetch('json/dyktanda.json')
|
fetch('json/dyktanda.json')
|
||||||
@@ -52,11 +52,16 @@
|
|||||||
clearInterval(autoTimer)
|
clearInterval(autoTimer)
|
||||||
autoTimer = null
|
autoTimer = null
|
||||||
|
|
||||||
readTitleEl.textContent = title
|
if (!readTitleEl || !readTextEl || !speedBtn || !readWrap || !listWrap) {
|
||||||
readTextEl.textContent = text
|
console.warn('czytanie: missing DOM elements', { readTitleEl, readTextEl, speedBtn, readWrap, listWrap })
|
||||||
readTextEl.style.transform = 'translateY(0)'
|
}
|
||||||
speedBtn.textContent = SPEED_LABELS[0]
|
|
||||||
progressBar.style.width = '0%'
|
if (readTitleEl) readTitleEl.textContent = title
|
||||||
|
if (readTextEl) readTextEl.textContent = text
|
||||||
|
if (readTextEl) readTextEl.style.transform = 'translateY(0)'
|
||||||
|
if (speedBtn) speedBtn.textContent = SPEED_LABELS[0]
|
||||||
|
if (!progressBar) progressBar = document.getElementById('read-progress-bar-inner')
|
||||||
|
if (progressBar) progressBar.style.width = '0%'
|
||||||
|
|
||||||
listWrap.classList.add('hidden')
|
listWrap.classList.add('hidden')
|
||||||
readWrap.classList.remove('hidden')
|
readWrap.classList.remove('hidden')
|
||||||
@@ -132,6 +137,7 @@
|
|||||||
|
|
||||||
function updateProgressBar() {
|
function updateProgressBar() {
|
||||||
const progress = maxOffset > 0 ? (yOffset / maxOffset) * 100 : 100
|
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}%`
|
||||||
}
|
}
|
||||||
})()
|
})()
|
||||||
@@ -35,7 +35,7 @@
|
|||||||
const summaryScore = document.getElementById('summary-score')
|
const summaryScore = document.getElementById('summary-score')
|
||||||
const summaryBackBtn = document.getElementById('summary-back-btn')
|
const summaryBackBtn = document.getElementById('summary-back-btn')
|
||||||
const dykScroll = document.getElementById('dyk-scroll')
|
const dykScroll = document.getElementById('dyk-scroll')
|
||||||
const progressBar = document.getElementById('dyk-progress-bar-inner')
|
let progressBar = null
|
||||||
|
|
||||||
// ── Load texts ────────────────────────────────────────────────────────────
|
// ── Load texts ────────────────────────────────────────────────────────────
|
||||||
fetch('json/dyktanda.json')
|
fetch('json/dyktanda.json')
|
||||||
@@ -53,6 +53,20 @@
|
|||||||
textList.innerHTML = '<p style="color:var(--muted)">Nie udało się wczytać tekstów.</p>'
|
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', () => {
|
customStartBtn.addEventListener('click', () => {
|
||||||
const txt = customInput.value.trim()
|
const txt = customInput.value.trim()
|
||||||
if (!txt) return
|
if (!txt) return
|
||||||
@@ -98,7 +112,7 @@
|
|||||||
textDisplay.classList.remove('hidden')
|
textDisplay.classList.remove('hidden')
|
||||||
choicesEl.classList.remove('hidden')
|
choicesEl.classList.remove('hidden')
|
||||||
progressEl.textContent = ''
|
progressEl.textContent = ''
|
||||||
progressBar.style.width = '0%'
|
if (progressBar) progressBar.style.width = '0%'
|
||||||
|
|
||||||
listWrap.classList.add('hidden')
|
listWrap.classList.add('hidden')
|
||||||
playWrap.classList.remove('hidden')
|
playWrap.classList.remove('hidden')
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
const problemEl = document.getElementById('problem')
|
const problemEl = document.getElementById('problem')
|
||||||
const answerEl = document.getElementById('answer')
|
const answerEl = document.getElementById('answer')
|
||||||
const feedbackEl = document.getElementById('feedback')
|
const feedbackEl = document.getElementById('feedback')
|
||||||
const progressInner = document.getElementById('progress-inner')
|
let progressInner = null
|
||||||
const progressLabel = document.getElementById('progress-label')
|
const progressLabel = document.getElementById('progress-label')
|
||||||
const summaryText = document.getElementById('summary-text')
|
const summaryText = document.getElementById('summary-text')
|
||||||
const totalInput = document.getElementById('total-input')
|
const totalInput = document.getElementById('total-input')
|
||||||
@@ -99,7 +99,10 @@
|
|||||||
|
|
||||||
function updateBar() {
|
function updateBar() {
|
||||||
const pct = st.total > 0 ? Math.round((st.solved / st.total) * 100) : 0
|
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}`
|
progressLabel.textContent = `${st.solved}/${st.total}`
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -8,7 +8,7 @@
|
|||||||
const problemEl = document.getElementById('problem')
|
const problemEl = document.getElementById('problem')
|
||||||
const answerEl = document.getElementById('answer')
|
const answerEl = document.getElementById('answer')
|
||||||
const feedbackEl = document.getElementById('feedback')
|
const feedbackEl = document.getElementById('feedback')
|
||||||
const progressInner = document.getElementById('progress-inner')
|
let progressInner = null
|
||||||
const progressLabel = document.getElementById('progress-label')
|
const progressLabel = document.getElementById('progress-label')
|
||||||
const scoreLabel = document.getElementById('score-label') // This element is removed, but we might re-purpose the logic
|
const scoreLabel = document.getElementById('score-label') // This element is removed, but we might re-purpose the logic
|
||||||
const summaryText = document.getElementById('summary-text')
|
const summaryText = document.getElementById('summary-text')
|
||||||
@@ -99,7 +99,8 @@
|
|||||||
|
|
||||||
function updateBar() {
|
function updateBar() {
|
||||||
const pct = st.total > 0 ? Math.round((st.solved / st.total) * 100) : 0
|
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}`
|
progressLabel.textContent = `${st.solved}/${st.total}`
|
||||||
// scoreLabel is removed, so we comment this out
|
// scoreLabel is removed, so we comment this out
|
||||||
// scoreLabel.textContent = `✔ ${st.score}`
|
// scoreLabel.textContent = `✔ ${st.score}`
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{
|
||||||
|
"version": 3,
|
||||||
|
"artifactType": {
|
||||||
|
"type": "COMPATIBLE_SCREEN_MANIFEST",
|
||||||
|
"kind": "Directory"
|
||||||
|
},
|
||||||
|
"applicationId": "com.example.app",
|
||||||
|
"variantName": "debug",
|
||||||
|
"elements": []
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
BIN
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user