update ci to commit fastlane

.build/release/.env.example

@@ -0,0 +1,3 @@
+KEYSTORE_PASSWORD=your_keystore_password_here
+KEY_ALIAS=your_key_alias_here
+KEY_PASSWORD=your_key_password_here

.build/release/.gitignore

@@ -0,0 +1,2 @@
+.env
+release/

.build/release/compose.yml

@@ -0,0 +1,11 @@
+services:
+   release:
+#      image: git.shihaam.dev/dockerfiles/android-builder
+      image: git.shihaam.dev/dockerfiles/runners/gradle
+      hostname: isodroid
+      network_mode: host
+      env_file: .env
+      volumes:
+        - ./release:/release
+        - ../../:/source
+        - /root/.cache/cache-runners/gradle:/root/.gradle

.gitea/workflows/auto-tag.yml

@@ -0,0 +1,70 @@
+name: Auto Tag on Version Change
+
+on:
+  push:
+    branches:
+      - main
+
+jobs:
+  check-version:
+    runs-on: docker-compose
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+          token: ${{ secrets.PAT_GITEA }}
+
+      - name: Check version and prepare release
+        id: version
+        run: |
+          VERSION=$(grep 'versionName = ' app/build.gradle.kts | sed 's/.*versionName = "\(.*\)".*/\1/')
+          VERSION_CODE=$(grep 'versionCode = ' app/build.gradle.kts | sed 's/.*versionCode = \([0-9]*\).*/\1/')
+          echo "version=$VERSION" >> $GITHUB_OUTPUT
+          echo "version_code=$VERSION_CODE" >> $GITHUB_OUTPUT
+
+          if git tag -l | grep -q "^v${VERSION}$"; then
+            echo "Tag v${VERSION} already exists, skipping"
+            echo "should_release=false" >> $GITHUB_OUTPUT
+          else
+            echo "New version detected: v${VERSION}"
+            echo "should_release=true" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Extract and commit fastlane changelog
+        if: steps.version.outputs.should_release == 'true'
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          VERSION_CODE="${{ steps.version.outputs.version_code }}"
+          FASTLANE_DIR="fastlane/metadata/android/en-US/changelogs"
+
+          mkdir -p "$FASTLANE_DIR"
+
+          awk -v ver="$VERSION" '
+            BEGIN { found=0 }
+            /^## \[/ {
+              if (found) exit
+              if ($0 ~ "\\[" ver "\\]") { found=1; next }
+            }
+            found { print }
+          ' CHANGELOG.md > "$FASTLANE_DIR/${VERSION_CODE}.txt"
+
+          git config user.name "Gitea Actions"
+          git config user.email "actions@gitea.local"
+
+          if git diff --quiet "$FASTLANE_DIR/${VERSION_CODE}.txt" 2>/dev/null; then
+            echo "No changelog changes to commit"
+          else
+            git add "$FASTLANE_DIR/${VERSION_CODE}.txt"
+            git commit -m "Add fastlane changelog for v${VERSION}"
+            git push origin main
+          fi
+
+      - name: Create and push tag
+        if: steps.version.outputs.should_release == 'true'
+        run: |
+          VERSION="${{ steps.version.outputs.version }}"
+          git tag "v${VERSION}"
+          git push origin "v${VERSION}"
+          echo "Created and pushed tag v${VERSION}"

.gitea/workflows/build-apk.yml

@@ -0,0 +1,79 @@
+name: Build and Release APK
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build:
+    runs-on: docker-compose
+
+    steps:
+      - name: Checkout source code
+        uses: actions/checkout@v4
+
+      - name: Setup keystore and environment
+        run: |
+          echo "${{ secrets.KEYSTORE_BASE64 }}" | base64 -d > app/key.jks
+          echo "${{ secrets.DOTENV_BASE64 }}" | base64 -d > .build/release/.env
+
+      - name: Build APK
+        working-directory: .build/release
+        run: docker compose run --rm release
+
+      - name: Extract release notes
+        run: |
+          VERSION="${{ gitea.ref_name }}"
+          VERSION="${VERSION#v}"
+
+          awk -v ver="$VERSION" '
+            BEGIN { found=0 }
+            /^## \[/ {
+              if (found) exit
+              if ($0 ~ "\\[" ver "\\]") { found=1; next }
+            }
+            found { print }
+          ' CHANGELOG.md > release_notes.md
+
+      - name: Create Gitea Release
+        env:
+          GITEA_SERVER_URL: ${{ gitea.server_url }}
+          GITEA_REPOSITORY: ${{ gitea.repository }}
+          GITEA_TOKEN: ${{ secrets.PAT_GITEA }}
+        run: |
+          TAG="${{ gitea.ref_name }}"
+          TITLE="ISODroid ${{ gitea.ref_name }}"
+          NOTES_FILE="release_notes.md"
+          ASSET_PATH=".build/release/release/ISODroid-${{ gitea.ref_name }}.apk"
+
+          API_URL="${GITEA_SERVER_URL}/api/v1/repos/${GITEA_REPOSITORY}/releases"
+
+          RELEASE_RESPONSE=$(curl -s -X POST "$API_URL" \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/json" \
+            -d "{
+              \"tag_name\": \"${TAG}\",
+              \"name\": \"${TITLE}\",
+              \"body\": $(jq -Rs . < "$NOTES_FILE")
+            }")
+
+          RELEASE_ID=$(echo "$RELEASE_RESPONSE" | jq -r '.id')
+
+          if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
+            echo "Failed to create release:"
+            echo "$RELEASE_RESPONSE"
+            exit 1
+          fi
+
+          echo "Created release with ID: $RELEASE_ID"
+
+          ASSET_NAME=$(basename "$ASSET_PATH")
+          UPLOAD_URL="${API_URL}/${RELEASE_ID}/assets?name=${ASSET_NAME}"
+
+          curl -s -X POST "$UPLOAD_URL" \
+            -H "Authorization: token ${GITEA_TOKEN}" \
+            -H "Content-Type: application/octet-stream" \
+            --data-binary "@${ASSET_PATH}"
+
+          echo "Uploaded asset: $ASSET_NAME"

.gitignore

@@ -16,3 +16,5 @@ local.properties
 
 app/release/
 app/debug/
+app/key.jks
+.build/release/release/*.apk

.idea/deploymentTargetSelector.xml

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="deploymentTargetSelector">
-    <selectionStates>
-      <SelectionState runConfigName="app">
-        <option name="selectionMode" value="DROPDOWN" />
-      </SelectionState>
-    </selectionStates>
-  </component>
-</project>

app/build.gradle.kts

@@ -136,8 +136,18 @@ android {
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
 
+    signingConfigs {
+        create("release") {
+            storeFile = file("key.jks")
+            storePassword = System.getenv("KEYSTORE_PASSWORD")
+            keyAlias = System.getenv("KEY_ALIAS")
+            keyPassword = System.getenv("KEY_PASSWORD")
+        }
+    }
+
     buildTypes {
         release {
+            signingConfig = signingConfigs.getByName("release")
             isMinifyEnabled = false
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),

app/src/main/java/sh/sar/isodroid/ui/screens/DownloadsScreen.kt

@@ -12,8 +12,6 @@ import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -103,7 +101,6 @@ fun DownloadsScreen(
     }
 
     Scaffold(
-        contentWindowInsets = WindowInsets(0),
         topBar = {
             TopAppBar(
                 title = { Text("Download ISOs") },
@@ -127,7 +124,6 @@ fun DownloadsScreen(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
-                .navigationBarsPadding()
                 .verticalScroll(rememberScrollState())
         ) {
             groupedDownloads.forEach { (category, osList) ->

app/src/main/java/sh/sar/isodroid/ui/screens/MainScreen.kt

@@ -10,8 +10,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
@@ -143,7 +141,6 @@ fun MainScreen(
     }
 
     Scaffold(
-        contentWindowInsets = WindowInsets(0),
         topBar = {
             TopAppBar(
                 title = { Text("ISO Droid") },
@@ -207,7 +204,6 @@ fun MainScreen(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
-                .navigationBarsPadding()
                 .nestedScroll(pullToRefreshState.nestedScrollConnection)
         ) {
             if (uiState.isLoading && !pullToRefreshState.isRefreshing) {

app/src/main/java/sh/sar/isodroid/ui/screens/SettingsScreen.kt

@@ -22,8 +22,6 @@ import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.WindowInsets
-import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
@@ -153,7 +151,6 @@ fun SettingsScreen(
     }
 
     Scaffold(
-        contentWindowInsets = WindowInsets(0),
         topBar = {
             TopAppBar(
                 title = { Text("Settings") },
@@ -177,7 +174,6 @@ fun SettingsScreen(
             modifier = Modifier
                 .fillMaxSize()
                 .padding(paddingValues)
-                .navigationBarsPadding()
                 .verticalScroll(rememberScrollState())
         ) {
             // Storage section

app/src/main/java/sh/sar/isodroid/ui/theme/Theme.kt

@@ -5,6 +5,7 @@
 
 package sh.sar.isodroid.ui.theme
 
+import android.app.Activity
 import android.os.Build
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material3.MaterialTheme
@@ -13,7 +14,11 @@ import androidx.compose.material3.dynamicDarkColorScheme
 import androidx.compose.material3.dynamicLightColorScheme
 import androidx.compose.material3.lightColorScheme
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.SideEffect
+import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalView
+import androidx.core.view.WindowCompat
 
 private val DarkColorScheme = darkColorScheme(
     primary = Purple80,
@@ -42,6 +47,15 @@ fun ISODroidTheme(
         else -> LightColorScheme
     }
 
+    val view = LocalView.current
+    if (!view.isInEditMode) {
+        SideEffect {
+            val window = (view.context as Activity).window
+            WindowCompat.setDecorFitsSystemWindows(window, false)
+            WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = !darkTheme
+        }
+    }
+
     MaterialTheme(
         colorScheme = colorScheme,
         typography = Typography,