forked from Schanbro/WeekFocus
Compare commits
22
Commits
v0.0.1-null7
...
v1.0.5
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
658f6a9506 | ||
|
|
f9b666fe15 | ||
|
|
b1977d790d | ||
|
|
3d5cc10a1a | ||
|
|
52a758ff16 | ||
|
|
7dde81a715 | ||
|
|
e563b2e796 | ||
|
|
c27184551c | ||
|
|
f275ffe0ba | ||
|
|
9ef3cb1ee6 | ||
|
|
660dc8fd89 | ||
|
|
70f0e22e5e | ||
|
|
f5775cd5a1 | ||
|
|
0d189a69de | ||
|
|
19dffdc001 | ||
|
|
344963a4e5 | ||
|
|
10b0183945 | ||
|
|
c74e428bce | ||
|
|
137c8fee49 | ||
|
|
2e2c3a9382 | ||
|
|
16dc1626f7 | ||
|
|
73e4fd2957 |
No files matched your search
@@ -1,30 +1,75 @@
|
||||
# .gitea/workflows/build-release.yml
|
||||
name: Build & Release Android App
|
||||
|
||||
on:
|
||||
push:
|
||||
tags:
|
||||
- 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc.
|
||||
- 'v*'
|
||||
|
||||
jobs:
|
||||
build:
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Secrets prüfen
|
||||
run: |
|
||||
[ -n "$KEYSTORE_PASSWORD" ] && echo "KEYSTORE_PASSWORD gesetzt" || echo "KEYSTORE_PASSWORD LEER"
|
||||
[ -n "$KEY_ALIAS" ] && echo "KEY_ALIAS gesetzt" || echo "KEY_ALIAS LEER"
|
||||
[ -n "$KEY_PASSWORD" ] && echo "KEY_PASSWORD gesetzt" || echo "KEY_PASSWORD LEER"
|
||||
env:
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
||||
- name: Code auschecken
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Java/JDK 17 einrichten
|
||||
uses: actions/setup-java@v4
|
||||
uses: actions/setup-java@v5
|
||||
with:
|
||||
java-version: '17'
|
||||
distribution: 'temurin'
|
||||
cache: gradle
|
||||
|
||||
- name: Gradle einrichten
|
||||
uses: gradle/actions/setup-gradle@v3
|
||||
- name: Rechte für gradlew setzen
|
||||
run: chmod +x gradlew
|
||||
|
||||
- name: Android SDK einrichten
|
||||
run: |
|
||||
SDK_PATH="$HOME/android-sdk"
|
||||
SDKMANAGER="$SDK_PATH/cmdline-tools/latest/bin/sdkmanager"
|
||||
|
||||
if [ ! -x "$SDKMANAGER" ]; then
|
||||
echo "Installiere Android cmdline-tools..."
|
||||
mkdir -p "$SDK_PATH/cmdline-tools"
|
||||
curl -sSL -o /tmp/tools.zip https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip
|
||||
unzip -q /tmp/tools.zip -d "$SDK_PATH/cmdline-tools"
|
||||
mv "$SDK_PATH/cmdline-tools/cmdline-tools" "$SDK_PATH/cmdline-tools/latest"
|
||||
rm /tmp/tools.zip
|
||||
fi
|
||||
|
||||
# Lizenzen korrekt akzeptieren (kein "yes |", wegen pipefail/SIGPIPE)
|
||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" --licenses < <(yes) > /dev/null
|
||||
|
||||
# Benötigte Pakete direkt installieren
|
||||
"$SDKMANAGER" --sdk_root="$SDK_PATH" \
|
||||
"platform-tools" \
|
||||
"platforms;android-37.0" \
|
||||
"build-tools;36.0.0"
|
||||
|
||||
echo "ANDROID_HOME=$SDK_PATH" >> $GITHUB_ENV
|
||||
echo "ANDROID_SDK_ROOT=$SDK_PATH" >> $GITHUB_ENV
|
||||
echo "sdk.dir=$SDK_PATH" > "$GITHUB_WORKSPACE/local.properties"
|
||||
|
||||
- name: Keystore dekodieren
|
||||
run: |
|
||||
echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > "$RUNNER_TEMP/release.keystore"
|
||||
echo "KEYSTORE_PATH=$RUNNER_TEMP/release.keystore" >> $GITHUB_ENV
|
||||
|
||||
- name: Android Release APK bauen
|
||||
run: |
|
||||
chmod +x gradlew
|
||||
./gradlew assembleRelease -Porg.gradle.java.installations.auto-download=false
|
||||
run: ./gradlew assembleRelease --no-daemon
|
||||
env:
|
||||
KEYSTORE_PASSWORD: ${{ secrets.KEYSTORE_PASSWORD }}
|
||||
KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
|
||||
KEY_PASSWORD: ${{ secrets.KEY_PASSWORD }}
|
||||
|
||||
- name: Release in Gitea erstellen
|
||||
uses: softprops/action-gh-release@v2
|
||||
|
||||
+2
-1
@@ -1,13 +1,14 @@
|
||||
*.iml
|
||||
.gradle
|
||||
.idea
|
||||
/local.properties
|
||||
/.idea
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
/.idea/misc.xml
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
|
||||
Generated
+1
-1
@@ -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_1_7">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="jbr-25" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
# Changelog
|
||||
|
||||
## [1.0.1] - 2026-09-29
|
||||
### Neu
|
||||
- Erste stabile Version mit automatischen APK-Builds
|
||||
- CHANGELOG.md als Release-Body
|
||||
|
||||
### Behoben
|
||||
- VersionCode und -Name
|
||||
+15
-8
@@ -3,6 +3,17 @@ plugins {
|
||||
alias(libs.plugins.kotlin.compose)
|
||||
}
|
||||
|
||||
val tagVersion = (project.findProperty("versionNameOverride") as String?) ?: "0.0.0-dev"
|
||||
|
||||
// "1.2.3" oder "1.2.3-alpha9" -> Kern "1.2.3" für den versionCode
|
||||
val core = tagVersion
|
||||
.removePrefix("v")
|
||||
.substringBefore("-")
|
||||
val parts = core.split(".").map { it.toIntOrNull() ?: 0 }
|
||||
val major = parts.getOrElse(0) { 0 }
|
||||
val minor = parts.getOrElse(1) { 0 }
|
||||
val patch = parts.getOrElse(2) { 0 }
|
||||
|
||||
android {
|
||||
namespace = "de.schanbro.weekfocus"
|
||||
compileSdk {
|
||||
@@ -13,8 +24,8 @@ android {
|
||||
applicationId = "de.schanbro.weekfocus"
|
||||
minSdk = 29
|
||||
targetSdk = 37
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
versionCode = major * 10000 + minor * 100 + patch
|
||||
versionName = tagVersion
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -27,18 +38,14 @@ android {
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
sourceCompatibility = JavaVersion.VERSION_11
|
||||
targetCompatibility = JavaVersion.VERSION_11
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
}
|
||||
}
|
||||
|
||||
kotlin {
|
||||
jvmToolchain(17)
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation(platform(libs.androidx.compose.bom))
|
||||
implementation(libs.androidx.activity.compose)
|
||||
|
||||
@@ -23,6 +23,16 @@
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
<receiver
|
||||
android:name=".SimpleWidget"
|
||||
android:exported="true">
|
||||
<intent-filter>
|
||||
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
|
||||
</intent-filter>
|
||||
<meta-data
|
||||
android:name="android.appwidget.provider"
|
||||
android:resource="@xml/widget_info" />
|
||||
</receiver>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
@@ -1,16 +1,20 @@
|
||||
package de.schanbro.weekfocus
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.foundation.layout.*
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import android.appwidget.AppWidgetManager
|
||||
import android.content.ComponentName
|
||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
@@ -20,8 +24,7 @@ class MainActivity : ComponentActivity() {
|
||||
setContent {
|
||||
WeekFocusTheme {
|
||||
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
|
||||
Greeting(
|
||||
name = "Android",
|
||||
WordListScreen(
|
||||
modifier = Modifier.padding(innerPadding)
|
||||
)
|
||||
}
|
||||
@@ -31,17 +34,94 @@ class MainActivity : ComponentActivity() {
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun Greeting(name: String, modifier: Modifier = Modifier) {
|
||||
Text(
|
||||
text = "Hello $name!",
|
||||
fun WordListScreen(modifier: Modifier = Modifier) {
|
||||
val context = LocalContext.current
|
||||
val sharedPrefs = remember {
|
||||
context.getSharedPreferences("WeekFocusPrefs", Context.MODE_PRIVATE)
|
||||
}
|
||||
|
||||
// Wörter aus SharedPreferences laden und Zustand verwalten
|
||||
var textInput by remember { mutableStateOf("") }
|
||||
val wordList = remember {
|
||||
mutableStateListOf<String>().apply {
|
||||
val savedSet = sharedPrefs.getStringSet("words_key", emptySet()) ?: emptySet()
|
||||
addAll(savedSet)
|
||||
}
|
||||
}
|
||||
|
||||
// Funktion zum Speichern in SharedPreferences
|
||||
fun saveWords() {
|
||||
sharedPrefs.edit().putStringSet("words_key", wordList.toSet()).apply()
|
||||
}
|
||||
|
||||
Column(
|
||||
modifier = modifier
|
||||
)
|
||||
.fillMaxSize()
|
||||
.padding(16.dp)
|
||||
) {
|
||||
// Eingabefeld für ein neues Wort
|
||||
OutlinedTextField(
|
||||
value = textInput,
|
||||
onValueChange = { textInput = it },
|
||||
label = { Text("Neues Wort eingeben...") },
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
singleLine = true
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
// Button zum Hinzufügen
|
||||
Button(
|
||||
onClick = {
|
||||
val trimmed = textInput.trim()
|
||||
if (trimmed.isNotEmpty()) {
|
||||
wordList.add(trimmed)
|
||||
saveWords()
|
||||
updateWidget(context)
|
||||
textInput = ""
|
||||
}
|
||||
},
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text("Wort hinzufügen")
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.height(24.dp))
|
||||
|
||||
Text(
|
||||
text = "Gespeicherte Wörter:",
|
||||
style = MaterialTheme.typography.titleMedium
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
|
||||
// Liste der Wörter
|
||||
if (wordList.isEmpty()) {
|
||||
Text(
|
||||
text = "Noch keine Wörter vorhanden.",
|
||||
style = MaterialTheme.typography.bodyMedium
|
||||
)
|
||||
} else {
|
||||
LazyColumn {
|
||||
items(wordList) { word ->
|
||||
Text(
|
||||
text = "• $word",
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
modifier = Modifier.padding(vertical = 4.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(showBackground = true)
|
||||
@Composable
|
||||
fun GreetingPreview() {
|
||||
WeekFocusTheme {
|
||||
Greeting("Android")
|
||||
// Hilfsfunktion zum Aktualisieren des Widgets
|
||||
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)
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,56 @@
|
||||
package de.schanbro.weekfocus
|
||||
|
||||
import android.appwidget.AppWidgetManager
|
||||
import android.appwidget.AppWidgetProvider
|
||||
import android.content.Context
|
||||
import android.widget.RemoteViews
|
||||
import java.util.Calendar
|
||||
import java.util.Random
|
||||
|
||||
class SimpleWidget : AppWidgetProvider() {
|
||||
|
||||
override fun onUpdate(
|
||||
context: Context,
|
||||
appWidgetManager: AppWidgetManager,
|
||||
appWidgetIds: IntArray
|
||||
) {
|
||||
for (appWidgetId in appWidgetIds) {
|
||||
updateAppWidget(context, appWidgetManager, appWidgetId)
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
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()
|
||||
|
||||
// 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 {
|
||||
"Keine Wörter"
|
||||
}
|
||||
|
||||
// 4. RemoteViews aktualisieren
|
||||
val views = RemoteViews(context.packageName, R.layout.widget_main)
|
||||
views.setTextViewText(R.id.appwidget_text, displayText)
|
||||
|
||||
appWidgetManager.updateAppWidget(appWidgetId, views)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<corners android:radius="28dp" />
|
||||
<solid android:color="?android:attr/colorBackgroundFloating" />
|
||||
</shape>
|
||||
@@ -0,0 +1,32 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:theme="@android:style/Theme.DeviceDefault.DayNight"
|
||||
android:background="@drawable/widget_background"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp"
|
||||
android:gravity="center">
|
||||
|
||||
<TextView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="WOCHENFOKUS"
|
||||
android:textSize="11sp"
|
||||
android:letterSpacing="0.1"
|
||||
android:textAllCaps="true"
|
||||
android:textColor="?android:attr/textColorSecondary"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/appwidget_text"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:gravity="center"
|
||||
android:text="Hallo"
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:textSize="22sp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
||||
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,11 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:minWidth="130dp"
|
||||
android:minHeight="80dp"
|
||||
android:updatePeriodMillis="86400000"
|
||||
android:initialLayout="@layout/widget_main"
|
||||
android:resizeMode="horizontal|vertical"
|
||||
android:widgetCategory="home_screen"
|
||||
android:targetCellWidth="2"
|
||||
android:targetCellHeight="2">
|
||||
</appwidget-provider>
|
||||
@@ -1,5 +1,5 @@
|
||||
[versions]
|
||||
agp = "9.4.0"
|
||||
agp = "9.4.1"
|
||||
coreKtx = "1.10.1"
|
||||
junit = "4.13.2"
|
||||
junitVersion = "1.1.5"
|
||||
|
||||
Reference in new issue
Block a user