forked from Schanbro/WeekFocus
Compare commits
1
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bd3946a638 |
No files matched your search
@@ -1,10 +1,9 @@
|
|||||||
# .gitea/workflows/build-release.yml
|
|
||||||
name: Build & Release Android App
|
name: Build & Release Android App
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
tags:
|
tags:
|
||||||
- 'v*'
|
- 'v*' # Startet bei Tags wie v1.0.0, v1.0.1 etc.
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build:
|
build:
|
||||||
@@ -13,30 +12,18 @@ jobs:
|
|||||||
- name: Code auschecken
|
- name: Code auschecken
|
||||||
uses: actions/checkout@v4
|
uses: actions/checkout@v4
|
||||||
|
|
||||||
- name: Java/JDK 17 einrichten
|
# HIER IST DIE LÖSUNG: Java 25 statt 17 bereitstellen
|
||||||
|
- name: Java/JDK 25 einrichten
|
||||||
uses: actions/setup-java@v4
|
uses: actions/setup-java@v4
|
||||||
with:
|
with:
|
||||||
java-version: '17'
|
java-version: '25'
|
||||||
distribution: 'temurin'
|
distribution: 'temurin'
|
||||||
|
|
||||||
- name: Android SDK einrichten
|
|
||||||
uses: android-actions/setup-android@v3
|
|
||||||
with:
|
|
||||||
accept-android-sdk-licenses: false
|
|
||||||
|
|
||||||
- name: Android SDK Lizenzen manuell schreiben
|
|
||||||
run: |
|
|
||||||
mkdir -p $ANDROID_HOME/licenses
|
|
||||||
echo -e "\n24333f8a637b37ea6d1270c750f0160576065016" > $ANDROID_HOME/licenses/android-sdk-license
|
|
||||||
echo -e "\n84831b9409646a456e88576d19212d3582701724" >> $ANDROID_HOME/licenses/android-sdk-license
|
|
||||||
echo -e "\nd975f751698a7780098d5c6814341db27684b376" > $ANDROID_HOME/licenses/android-sdk-preview-license
|
|
||||||
echo -e "\n33b6a2b64607f11b759f320ef9dff4ae5e40007e" > $ANDROID_HOME/licenses/android-googletv-license
|
|
||||||
echo -e "\n6010077ebe6b4f930974d1266684e201b8723913" > $ANDROID_HOME/licenses/android-googlexr-license
|
|
||||||
|
|
||||||
- name: Gradle einrichten
|
- name: Gradle einrichten
|
||||||
uses: gradle/actions/setup-gradle@v3
|
uses: gradle/actions/setup-gradle@v3
|
||||||
|
|
||||||
- name: Android Release APK bauen
|
- name: Android Release APK bauen
|
||||||
|
# Keine fehleranfälligen Flags mehr nötig!
|
||||||
run: |
|
run: |
|
||||||
chmod +x gradlew
|
chmod +x gradlew
|
||||||
./gradlew assembleRelease
|
./gradlew assembleRelease
|
||||||
|
|||||||
@@ -27,14 +27,18 @@ android {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
compileOptions {
|
compileOptions {
|
||||||
sourceCompatibility = JavaVersion.VERSION_11
|
sourceCompatibility = JavaVersion.VERSION_25
|
||||||
targetCompatibility = JavaVersion.VERSION_11
|
targetCompatibility = JavaVersion.VERSION_25
|
||||||
}
|
}
|
||||||
buildFeatures {
|
buildFeatures {
|
||||||
compose = true
|
compose = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
kotlin {
|
||||||
|
jvmToolchain(25)
|
||||||
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(platform(libs.androidx.compose.bom))
|
implementation(platform(libs.androidx.compose.bom))
|
||||||
implementation(libs.androidx.activity.compose)
|
implementation(libs.androidx.activity.compose)
|
||||||
|
|||||||
@@ -23,16 +23,6 @@
|
|||||||
<category android:name="android.intent.category.LAUNCHER" />
|
<category android:name="android.intent.category.LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
</activity>
|
</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>
|
</application>
|
||||||
|
|
||||||
</manifest>
|
</manifest>
|
||||||
@@ -1,20 +1,16 @@
|
|||||||
package de.schanbro.weekfocus
|
package de.schanbro.weekfocus
|
||||||
|
|
||||||
import android.content.Context
|
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import androidx.activity.ComponentActivity
|
import androidx.activity.ComponentActivity
|
||||||
import androidx.activity.compose.setContent
|
import androidx.activity.compose.setContent
|
||||||
import androidx.activity.enableEdgeToEdge
|
import androidx.activity.enableEdgeToEdge
|
||||||
import androidx.compose.foundation.layout.*
|
import androidx.compose.foundation.layout.fillMaxSize
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
import androidx.compose.foundation.layout.padding
|
||||||
import androidx.compose.foundation.lazy.items
|
import androidx.compose.material3.Scaffold
|
||||||
import androidx.compose.material3.*
|
import androidx.compose.material3.Text
|
||||||
import androidx.compose.runtime.*
|
import androidx.compose.runtime.Composable
|
||||||
import androidx.compose.ui.Modifier
|
import androidx.compose.ui.Modifier
|
||||||
import androidx.compose.ui.platform.LocalContext
|
import androidx.compose.ui.tooling.preview.Preview
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import android.appwidget.AppWidgetManager
|
|
||||||
import android.content.ComponentName
|
|
||||||
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
import de.schanbro.weekfocus.ui.theme.WeekFocusTheme
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
class MainActivity : ComponentActivity() {
|
||||||
@@ -24,7 +20,8 @@ class MainActivity : ComponentActivity() {
|
|||||||
setContent {
|
setContent {
|
||||||
WeekFocusTheme {
|
WeekFocusTheme {
|
||||||
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
|
Scaffold(modifier = Modifier.fillMaxSize()) { innerPadding ->
|
||||||
WordListScreen(
|
Greeting(
|
||||||
|
name = "Android",
|
||||||
modifier = Modifier.padding(innerPadding)
|
modifier = Modifier.padding(innerPadding)
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -34,94 +31,17 @@ class MainActivity : ComponentActivity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun WordListScreen(modifier: Modifier = Modifier) {
|
fun Greeting(name: String, modifier: Modifier = Modifier) {
|
||||||
val context = LocalContext.current
|
Text(
|
||||||
val sharedPrefs = remember {
|
text = "Hello $name!",
|
||||||
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
|
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)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Hilfsfunktion zum Aktualisieren des Widgets
|
@Preview(showBackground = true)
|
||||||
fun updateWidget(context: Context) {
|
@Composable
|
||||||
val appWidgetManager = AppWidgetManager.getInstance(context)
|
fun GreetingPreview() {
|
||||||
val componentName = ComponentName(context, SimpleWidget::class.java)
|
WeekFocusTheme {
|
||||||
val appWidgetIds = appWidgetManager.getAppWidgetIds(componentName)
|
Greeting("Android")
|
||||||
|
|
||||||
for (appWidgetId in appWidgetIds) {
|
|
||||||
SimpleWidget.updateAppWidget(context, appWidgetManager, appWidgetId)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,56 +0,0 @@
|
|||||||
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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,6 +0,0 @@
|
|||||||
<?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>
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
<?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.
@@ -1,11 +0,0 @@
|
|||||||
<?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>
|
|
||||||
Reference in new issue
Block a user