Compare commits

...
19 Commits
Author SHA1 Message Date
robin 98ffa47fa4 Merge branch 'main' into test/widget-automation 2026-10-08 11:45:17 +00:00
robin dfd0b75521 Merge pull request 'Chore/reduce apk size' (#29) from chore/reduce-apk-size into main
Reviewed-on: #29
2026-10-07 14:50:17 +00:00
robin d9c1942f2a Merge branch 'main' into chore/reduce-apk-size 2026-10-07 14:50:08 +00:00
robin bc6edc4a04 chore: adjust workflow 2026-10-07 16:49:40 +02:00
robin d03f9eee67 chore: enable R8 (Code-Shrinking) 2026-10-07 16:48:13 +02:00
robin 7eff7300d0 chore: disable abi (apk-split) 2026-10-07 16:45:22 +02:00
robin 8458f0fce5 Merge pull request 'Chore/smaller apk' (#28) from chore/smaller-apk into main
Build & Release Android App / build (push) Successful in 19m5s
Reviewed-on: #28
2026-10-07 14:08:54 +00:00
robin e444abecae Merge branch 'main' into chore/smaller-apk 2026-10-07 14:08:43 +00:00
robin 3bac488893 chore: force to use JDK 17 2026-10-07 16:08:14 +02:00
robin b8195b74f1 chore: force to use JDK 17 2026-10-07 16:06:27 +02:00
robin f431fb272d chore: force to use JDK 17 2026-10-07 16:03:39 +02:00
robin 107f1c3955 Merge pull request 'chore: fix workflow 2' (#26) from chore/smaller-apk into main
Build & Release Android App / build (push) Failing after 1m16s
Reviewed-on: #26
2026-10-07 13:57:30 +00:00
robin ce1eba6b83 Merge branch 'main' into chore/smaller-apk 2026-10-07 13:57:20 +00:00
robin 4b8e2bc88d chore: fix workflow 2026-10-07 15:56:01 +02:00
robin c71851702f Merge pull request 'chore: fix workflow' (#25) from chore/smaller-apk into main
Reviewed-on: #25
2026-10-07 13:44:27 +00:00
robin 4c04a5260c Merge branch 'main' into chore/smaller-apk 2026-10-07 13:44:17 +00:00
robin 90e477cb04 chore: fix workflow
Build & Release Android App / build (push) Failing after 47s
2026-10-07 15:43:51 +02:00
robin 82d4fa331b Merge pull request 'chore: apk-splits' (#24) from chore/smaller-apk into main
Reviewed-on: #24
2026-10-07 13:27:42 +00:00
robin 7cc3245b97 refactor: implement better choosing of the word 2026-10-06 17:06:13 +02:00
7 changed files with 191 additions and 76 deletions

No files matched your search

+17 -25
View File
@@ -51,7 +51,7 @@ jobs:
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
"platform-tools" \
"platforms;android-37" \
"build-tools;37.0.0"
"build-tools;35.0.0"
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
@@ -64,7 +64,7 @@ jobs:
echo "$KEYSTORE_BASE64" | base64 -d > "$RUNNER_TEMP/release.keystore"
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
- name: Android Release APKs bauen
- name: Android Release APK bauen
run: |
set -euo pipefail
@@ -73,37 +73,29 @@ jobs:
./gradlew assembleRelease \
--no-daemon \
-Dorg.gradle.java.home="$JAVA_HOME" \
-Porg.gradle.java.installations.auto-download=false \
-PversionNameOverride="$VERSION"
APK_DIR="app/build/outputs/apk/release"
echo "Gefundene Original-APKs in $APK_DIR:"
echo "Gefundene APKs in $APK_DIR:"
ls -lh "$APK_DIR"
for APK in "$APK_DIR"/*.apk; do
[ -e "$APK" ] || continue
SRC="$APK_DIR/app-release.apk"
if [ ! -f "$SRC" ]; then
echo "app-release.apk nicht gefunden (evtl. unsigniert oder anderer Name)"
exit 1
fi
if [[ "$APK" == *"unsigned"* || "$APK" == *"WeekFocus-"* ]]; then
continue
fi
TARGET_PATH="$APK_DIR/WeekFocus-${VERSION}.apk"
mv "$SRC" "$TARGET_PATH"
FILENAME=$(basename "$APK")
VARIANT=$(echo "$FILENAME" | sed -E 's/^app-(.*)-release\.apk$/\1/')
if [ "$VARIANT" = "$FILENAME" ]; then
VARIANT="release"
fi
echo "Signatur prüfen für $(basename "$TARGET_PATH")..."
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
TARGET_NAME="WeekFocus-${VERSION}-${VARIANT}.apk"
TARGET_PATH="$APK_DIR/$TARGET_NAME"
mv "$APK" "$TARGET_PATH"
echo "Signatur prüfen für $TARGET_NAME..."
"$ANDROID_HOME/build-tools/35.0.0/apksigner" verify --verbose "$TARGET_PATH"
done
echo "Finale Release-APKs:"
ls -lh "$APK_DIR"/WeekFocus-*.apk
echo "Finale Release-APK:"
ls -lh "$TARGET_PATH"
env:
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
@@ -140,7 +132,7 @@ jobs:
echo "Release-Notes:"
cat "$NOTES_FILE"
- name: Release in Gitea erstellen und APKs hochladen
- name: Release in Gitea erstellen und APK hochladen
env:
TOKEN: ${{ secrets.GITHUB_TOKEN }}
API: ${{ github.server_url }}/api/v1/repos/${{ github.repository }}
+1 -1
View File
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" default="true" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/build/classes" />
</component>
<component name="ProjectType">
+9 -3
View File
@@ -27,14 +27,15 @@ android {
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
}
splits {
// not necessary
/*splits {
abi {
isEnable = true
reset()
include("arm64-v8a", "armeabi-v7a", "x86", "x86_64")
isUniversalApk = true
}
}
}*/
signingConfigs {
create("release") {
@@ -56,8 +57,13 @@ android {
release {
signingConfig = signingConfigs.getByName("release")
optimization {
enable = false
enable = true
}
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro"
)
}
}
compileOptions {
+8 -2
View File
@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools">
<!-- Nötig, damit der Wochenwechsel-Alarm nach einem Neustart neu geplant wird -->
<uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
<application
android:allowBackup="true"
@@ -28,6 +30,10 @@
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.intent.action.BOOT_COMPLETED" />
<action android:name="android.intent.action.DATE_CHANGED" />
<action android:name="android.intent.action.TIME_SET" />
<action android:name="android.intent.action.TIMEZONE_CHANGED" />
</intent-filter>
<meta-data
android:name="android.appwidget.provider"
@@ -1,7 +1,5 @@
package de.schanbro.weekfocus
import android.appwidget.AppWidgetManager
import android.content.ComponentName
import android.content.Context
import android.os.Bundle
import androidx.activity.ComponentActivity
@@ -35,6 +33,13 @@ class MainActivity : ComponentActivity() {
}
}
}
override fun onResume() {
super.onResume()
// Falls das Widget (z.B. durch Energiesparmodus) nicht rechtzeitig aktualisiert
// wurde, wird es beim Öffnen der App nachgezogen.
updateWidget(this)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@@ -133,12 +138,9 @@ fun PlaceholderScreen(title: String) {
}
}
/**
* Bleibt als Top-Level-Funktion erhalten, damit WordListScreen unverändert weiter funktioniert.
*/
fun updateWidget(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context)
val componentName = ComponentName(context, SimpleWidget::class.java)
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
for (appWidgetId in appWidgetIds) {
SimpleWidget.updateAppWidget(context, appWidgetManager, appWidgetId)
}
SimpleWidget.updateAllWidgets(context)
}
@@ -1,15 +1,35 @@
package de.schanbro.weekfocus
import android.app.AlarmManager
import android.app.PendingIntent
import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Context
import android.content.Intent
import android.widget.RemoteViews
import androidx.compose.ui.res.stringResource
import java.util.Calendar
import java.util.Random
import java.time.DayOfWeek
import java.time.LocalDate
import java.time.ZoneId
import java.time.temporal.ChronoUnit
import java.time.temporal.IsoFields
import java.time.temporal.TemporalAdjusters
class SimpleWidget : AppWidgetProvider() {
override fun onReceive(context: Context, intent: Intent) {
// Verarbeitet u.a. APPWIDGET_UPDATE / ENABLED / DISABLED und ruft die Callbacks unten auf
super.onReceive(context, intent)
when (intent.action) {
ACTION_WEEK_CHANGED,
Intent.ACTION_BOOT_COMPLETED, // Alarme überleben keinen Neustart
Intent.ACTION_DATE_CHANGED,
Intent.ACTION_TIME_CHANGED, // "android.intent.action.TIME_SET"
Intent.ACTION_TIMEZONE_CHANGED -> updateAllWidgets(context)
}
}
override fun onUpdate(
context: Context,
appWidgetManager: AppWidgetManager,
@@ -18,40 +38,141 @@ class SimpleWidget : AppWidgetProvider() {
for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId)
}
// Selbstheilung: stellt sicher, dass immer ein Wochenwechsel-Alarm existiert
scheduleNextWeekChange(context)
}
override fun onEnabled(context: Context) {
// Erstes Widget wurde platziert
scheduleNextWeekChange(context)
}
override fun onDisabled(context: Context) {
// Letztes Widget wurde entfernt
cancelWeekChange(context)
}
companion object {
const val ACTION_WEEK_CHANGED = "de.schanbro.weekfocus.ACTION_WEEK_CHANGED"
private const val PREFS_NAME = "WeekFocusPrefs"
private const val KEY_WORDS = "words_key"
private const val KEY_WEEK = "current_week_key"
private const val KEY_WORD = "current_word"
/**
* Aktualisiert alle Widget-Instanzen und plant den nächsten Wochenwechsel.
*/
fun updateAllWidgets(context: Context) {
val appWidgetManager = AppWidgetManager.getInstance(context)
val componentName = ComponentName(context, SimpleWidget::class.java)
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
if (appWidgetIds.isEmpty()) return
for (appWidgetId in appWidgetIds) {
updateAppWidget(context, appWidgetManager, appWidgetId)
}
scheduleNextWeekChange(context)
}
fun updateAppWidget(
context: Context,
appWidgetManager: AppWidgetManager,
appWidgetId: Int
) {
// 1. SharedPreferences auslesen
val sharedPrefs = context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
val wordList = savedSet.toList()
val displayText = resolveWordOfWeek(context)
?: context.getString(R.string.msg_no_words)
// 2. Aktuelle Kalenderwoche & Jahr bestimmen
val calendar = Calendar.getInstance()
val weekOfYear = calendar.get(Calendar.WEEK_OF_YEAR)
val year = calendar.get(Calendar.YEAR)
// 3. Wort für die aktuelle Kalenderwoche auswählen
val displayText = if (wordList.isNotEmpty()) {
// Kombinierter Seed aus Jahr und Kalenderwoche
val seed = (year * 100 + weekOfYear).toLong()
val random = Random(seed)
val randomIndex = random.nextInt(wordList.size)
wordList[randomIndex]
} else {
context.getString(R.string.msg_no_words)
}
// 4. RemoteViews aktualisieren
val views = RemoteViews(context.packageName, R.layout.widget_main)
views.setTextViewText(R.id.appwidget_text, displayText)
appWidgetManager.updateAppWidget(appWidgetId, views)
}
/**
* ISO-Kalenderwoche (Montag = Wochenbeginn, unabhängig von der Geräte-Locale)
* kombiniert mit dem zugehörigen Wochenjahr, z.B. 202641.
*
* Das Wochenjahr (nicht das Kalenderjahr!) verhindert, dass sich der Wert
* um Neujahr mitten in der Woche ändert.
*/
internal fun weekKeyFor(date: LocalDate): Int {
val weekBasedYear = date.get(IsoFields.WEEK_BASED_YEAR)
val week = date.get(IsoFields.WEEK_OF_WEEK_BASED_YEAR)
return weekBasedYear * 100 + week
}
/**
* Liefert das Wort der aktuellen Woche.
*
* - Die Liste wird sortiert, damit die Reihenfolge deterministisch ist
* (ein Set hat keine garantierte Reihenfolge).
* - Das gewählte Wort wird pro Woche gespeichert. Dadurch ändert sich das Wort
* nicht, wenn Wörter hinzugefügt oder gelöscht werden. Nur wenn das aktuelle
* Wort selbst gelöscht wird, wird neu gewählt.
*/
private fun resolveWordOfWeek(context: Context): String? {
val prefs = context.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
val words = (prefs.getStringSet(KEY_WORDS, emptySet()) ?: emptySet()).sorted()
if (words.isEmpty()) {
prefs.edit().remove(KEY_WEEK).remove(KEY_WORD).apply()
return null
}
val weekKey = weekKeyFor(LocalDate.now())
val storedWord = prefs.getString(KEY_WORD, null)
if (prefs.getInt(KEY_WEEK, -1) == weekKey && storedWord != null && storedWord in words) {
return storedWord
}
val currentMonday = LocalDate.now().with(DayOfWeek.MONDAY)
val weeksSinceEpoch = ChronoUnit.WEEKS.between(LocalDate.ofEpochDay(4), currentMonday) // 5.1.1970 war ein Montag
val word = words[(weeksSinceEpoch % words.size).toInt()]
prefs.edit()
.putInt(KEY_WEEK, weekKey)
.putString(KEY_WORD, word)
.apply()
return word
}
/**
* Plant einen Alarm für den nächsten Montag, 00:00 Uhr (lokale Zeit).
* Bewusst ohne Exact-Alarm-Berechtigung: Eine Verzögerung von wenigen Minuten
* ist für ein Wochenwort unkritisch.
*/
private fun scheduleNextWeekChange(context: Context) {
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
val triggerAtMillis = LocalDate.now()
.with(TemporalAdjusters.next(DayOfWeek.MONDAY)) // "next" schließt heute aus
.atStartOfDay(ZoneId.systemDefault())
.toInstant()
.toEpochMilli()
alarmManager.setAndAllowWhileIdle(
AlarmManager.RTC_WAKEUP,
triggerAtMillis,
weekChangePendingIntent(context)
)
}
private fun cancelWeekChange(context: Context) {
val alarmManager = context.getSystemService(AlarmManager::class.java) ?: return
alarmManager.cancel(weekChangePendingIntent(context))
}
private fun weekChangePendingIntent(context: Context): PendingIntent {
val intent = Intent(context, SimpleWidget::class.java).apply {
action = ACTION_WEEK_CHANGED
}
return PendingIntent.getBroadcast(
context,
0,
intent,
PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE
)
}
}
}
-12
View File
@@ -1,12 +0,0 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect
toolchainVersion=25