feat: restructure project with modular CI, Android build, CLI separation, and GUI updates

- Add reusable GitHub Action (`.github/actions/setup`) for Go, OpenGL headers, and fyne CLI
- Update CI workflows: modularize desktop, CLI, and mobile builds; add Android support
- Separate CLI (`ethiocal-cli` with bahir/convert/server) from GUI to reduce dependencies
- Refactor Bahire-Hasab tab UI for responsive, mobile-friendly layout
- Enhance date picker usability with year navigation in calendar
- Update README with unified install and usage instructions for GUI/CLI/APK
- Increment app version to 1.3.0
- Add Makefile targets for GUI, CLI, and mobile APK builds

Author: yinebebt

.github/actions/setup/action.yml

@@ -0,0 +1,27 @@
+name: Setup
+description: Set up Go, with optional Linux OpenGL/X11 headers and the fyne CLI.
+
+inputs:
+  gl:
+    description: Install Linux OpenGL/X11 headers (needed for CGO desktop builds).
+    default: 'false'
+  fyne:
+    description: Install the fyne CLI.
+    default: 'false'
+
+runs:
+  using: composite
+  steps:
+    - uses: actions/setup-go@v5
+      with:
+        go-version: '1.26'
+
+    - if: inputs.gl == 'true' && runner.os == 'Linux'
+      shell: bash
+      run: |
+        sudo apt-get update
+        sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
+
+    - if: inputs.fyne == 'true'
+      shell: bash
+      run: go install fyne.io/tools/cmd/fyne@latest

.github/workflows/ci.yml

@@ -12,16 +12,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
+    - uses: ./.github/actions/setup
       with:
-        go-version: '1.26'
-
-    - name: Install system dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
+        gl: 'true'
 
     - name: golangci-lint
       uses: golangci/golangci-lint-action@v7
@@ -32,84 +25,96 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
+    - uses: ./.github/actions/setup
       with:
-        go-version: '1.26'
-
-    - name: Install system dependencies
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
+        gl: 'true'
 
     - name: Test
       run: go test -v -cover ./...
 
-  # Package platform-native app bundles on each OS runner (CGO requires native C compiler).
-  package:
+  # Desktop: GUI bundle + native CLI/server binary, built per OS then uploaded.
+  desktop:
     if: startsWith(github.ref, 'refs/tags/v')
     needs: [ lint, test ]
     strategy:
       fail-fast: false
       matrix:
         include:
-          - runner: ubuntu-latest
-            os: linux
-            artifact: ethiocal-linux-amd64.tar.xz
-          - runner: macos-latest
-            os: darwin
-            artifact: ethiocal-macos-arm64.app.zip
-          - runner: macos-15-intel
-            os: darwin
-            artifact: ethiocal-macos-amd64.app.zip
-          - runner: windows-latest
-            os: windows
-            artifact: ethiocal-windows-amd64.exe.zip
+          - { runner: ubuntu-latest,  os: linux,   artifact: ethiocal-linux-amd64.tar.xz,   cli: ethiocal-cli-linux-amd64 }
+          - { runner: macos-latest,   os: darwin,  artifact: ethiocal-macos-arm64.app.zip,  cli: ethiocal-cli-macos-arm64 }
+          - { runner: macos-15-intel, os: darwin,  artifact: ethiocal-macos-amd64.app.zip,  cli: ethiocal-cli-macos-amd64 }
+          - { runner: windows-latest, os: windows, artifact: ethiocal-windows-amd64.exe.zip, cli: ethiocal-cli-windows-amd64.exe }
 
     runs-on: ${{ matrix.runner }}
     steps:
     - uses: actions/checkout@v4
-
-    - name: Set up Go
-      uses: actions/setup-go@v5
+    - uses: ./.github/actions/setup
       with:
-        go-version: '1.26'
+        gl: 'true'
+        fyne: 'true'
 
-    - name: Install system dependencies (Linux)
-      if: matrix.os == 'linux'
-      run: |
-        sudo apt-get update
-        sudo apt-get install -y gcc libgl1-mesa-dev xorg-dev
-
-    - name: Install fyne CLI
-      run: go install fyne.io/tools/cmd/fyne@latest
-
-    - name: Package
+    # Build both: GUI bundle (CGO) and CLI (pure Go).
+    - name: Build GUI bundle
       run: fyne package -os ${{ matrix.os }} -release
 
-    - name: Prepare artifact (macOS)
+    - name: Build CLI
+      env:
+        CGO_ENABLED: '0'
+      run: go build -trimpath -ldflags '-s -w' -o ${{ matrix.cli }} ./cmd/ethiocal-cli
+
+    # Pack the GUI bundle into one named file (fyne's output differs per OS).
+    - name: Pack GUI bundle (macOS)
       if: matrix.os == 'darwin'
       run: zip -r ${{ matrix.artifact }} Ethiocal.app
 
-    - name: Prepare artifact (Linux)
+    - name: Pack GUI bundle (Linux)
       if: matrix.os == 'linux'
       run: mv Ethiocal.tar.xz ${{ matrix.artifact }}
 
-    - name: Prepare artifact (Windows)
+    - name: Pack GUI bundle (Windows)
       if: matrix.os == 'windows'
       shell: pwsh
       run: Compress-Archive -Path Ethiocal.exe -DestinationPath ${{ matrix.artifact }}
 
-    - name: Upload artifact
+    - name: Upload GUI bundle
       uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.artifact }}
         path: ${{ matrix.artifact }}
 
+    - name: Upload CLI
+      uses: actions/upload-artifact@v4
+      with:
+        name: ${{ matrix.cli }}
+        path: ${{ matrix.cli }}
+
+  # Mobile: arm64-v8a APK. Debug-signed for sideloading; 
+  # NDK preinstalled on the runner; metadata from FyneApp.toml.
+  mobile:
+    if: startsWith(github.ref, 'refs/tags/v')
+    needs: [ lint, test ]
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - uses: ./.github/actions/setup
+      with:
+        fyne: 'true'
+
+    # Uses the runner's preinstalled NDK via its default ANDROID_NDK_HOME.
+    - name: Build APK
+      run: |
+        fyne package --os android/arm64
+        mv Ethiocal.apk ethiocal-android.apk
+
+    - name: Upload APK
+      uses: actions/upload-artifact@v4
+      with:
+        name: ethiocal-android.apk
+        path: ethiocal-android.apk
+
   release:
     if: startsWith(github.ref, 'refs/tags/v')
-    needs: package
+    needs: [ desktop, mobile ]
     runs-on: ubuntu-latest
     permissions:
       contents: write

.gitignore

@@ -1,3 +1,4 @@
 .vscode/
 .idea
-ethiocal
+ethiocal
+*.apk

FyneApp.toml

@@ -4,5 +4,5 @@ Website = "https://github.com/yinebebt/ethiocal"
   Icon = "logo.png"
   Name = "Ethiocal"
   ID = "com.github.yinebebt.ethiocal"
-  Version = "1.2.1"
-  Build = 2
+  Version = "1.3.0"
+  Build = 3

Makefile

@@ -1,21 +1,34 @@
 all: build
 
+# Build both binaries: GUI app and CLI/server tool.
+build:
+	go build -o ethiocal .
+	CGO_ENABLED=0 go build -o ethiocal-cli ./cmd/ethiocal-cli
+
 test:
 	go test -v -cover ./...
 
 lint:
 	golangci-lint run ./...
 
+# Run the GUI app.
 run:
 	go run .
 
-build:
-	go build -o ethiocal .
+# Run the CLI tool, e.g. make run-cli ARGS="convert gtoe 2024 9 11".
+run-cli:
+	go run ./cmd/ethiocal-cli $(ARGS)
 
 clean:
-	rm -f ethiocal
+	rm -f ethiocal ethiocal-cli
 
 package:
 	fyne package -release
 
-.PHONY: all test lint run build clean package
+# Slim arm64 APK. Resolves the NDK from ANDROID_NDK_HOME or the newest under $ANDROID_HOME/ndk.
+package-android:
+	@ndk="$${ANDROID_NDK_HOME:-$$(ls -d $$ANDROID_HOME/ndk/* 2>/dev/null | sort -V | tail -1)}"; \
+	[ -n "$$ndk" ] || { echo "No NDK: set ANDROID_NDK_HOME or install one under $$ANDROID_HOME/ndk"; exit 1; }; \
+	ANDROID_NDK_HOME="$$ndk" fyne package --os android/arm64
+
+.PHONY: all build test lint run run-cli clean package package-android

README.md

@@ -16,9 +16,9 @@ plus a 5- or 6-day 13th month).
 
 ### Features
 
-* **GUI desktop app** — launch with no arguments for a graphical interface.
-* **CLI** — subcommands for scripting and terminal use.
-* **HTTP API** — run as a server for integration with other services.
+* **GUI app** — graphical interface for desktop (macOS/Linux/Windows) and Android.
+* **CLI** — `ethiocal-cli` subcommands for scripting and terminal use.
+* **HTTP API** — run `ethiocal-cli --server` for integration with other services.
 * Get Ethiopian fasting and religious festival dates for a specific year.
 * Convert Ethiopian dates to Gregorian dates and vice versa.
 
@@ -34,6 +34,9 @@ Pre-built binaries are available on the [Releases](https://github.com/yinebebt/e
 | macOS (Intel) | `curl -Lo ethiocal.zip https://github.com/yinebebt/ethiocal/releases/latest/download/ethiocal-macos-amd64.app.zip && unzip ethiocal.zip` |
 | Linux (x86_64) | `curl -Lo ethiocal.tar.xz https://github.com/yinebebt/ethiocal/releases/latest/download/ethiocal-linux-amd64.tar.xz && tar xJf ethiocal.tar.xz` |
 | Windows (x86_64) | `curl -Lo ethiocal.zip https://github.com/yinebebt/ethiocal/releases/latest/download/ethiocal-windows-amd64.exe.zip && unzip ethiocal.zip` |
+| Android (arm64) | [`ethiocal-android.apk`](https://github.com/yinebebt/ethiocal/releases/latest) — sideload on a 64-bit device |
+
+The CLI/server tool ships per platform too, as `ethiocal-cli-<os>-<arch>` on the same Releases page.
 
 ### Install with Go
 
@@ -46,45 +49,49 @@ go install github.com/yinebebt/ethiocal@latest
 ```bash
 git clone https://github.com/yinebebt/ethiocal.git
 cd ethiocal
-go build -o ethiocal .
+make build    # builds both: ./ethiocal (GUI) and ./ethiocal-cli (CLI + server)
 ```
 
-> **Note:** Building requires a C compiler and OpenGL headers because Fyne uses
-> CGO. On Ubuntu/Debian: `sudo apt-get install libgl1-mesa-dev xorg-dev`.
-> macOS and Windows have these out of the box.
+> **Note:** Building the GUI app requires a C compiler and OpenGL headers because
+> Fyne uses CGO. On Ubuntu/Debian: `sudo apt-get install libgl1-mesa-dev xorg-dev`.
+> macOS and Windows have these out of the box. The CLI builds with pure Go (no CGO).
 
 ## Usage
 
-### GUI (default)
+### GUI
 
-Run `ethiocal` with no arguments to launch the desktop app:
+Run `ethiocal` (or launch the packaged app) to open the GUI:
 
 ```bash
 ethiocal
 ```
 
 The GUI provides two tabs:
 
-* **Date Converter** — pick a direction (Gregorian → Ethiopian or Ethiopian → Gregorian), enter a date, and convert.
+* **Date Converter** — pick a direction (Gregorian → Ethiopian or Ethiopian → Gregorian), pick a date from the calendar, and convert.
 * **Bahire-Hasab** — enter an Ethiopian year to view all fasting and festival dates.
 
 ### CLI
 
+The terminal/server tool is a separate binary (`ethiocal-cli`), so the GUI app
+carries no CLI dependencies. Install with
+`go install github.com/yinebebt/ethiocal/cmd/ethiocal-cli@latest`.
+
 ```bash
 # Get religious dates for Ethiopian year 2017
-ethiocal bahir 2017
+ethiocal-cli bahir 2017
 
 # Convert Gregorian date to Ethiopian (year month day as separate args)
-ethiocal convert gtoe 2025 2 2
+ethiocal-cli convert gtoe 2025 2 2
 
 # Convert Ethiopian date to Gregorian
-ethiocal convert etog 2017 5 25
+ethiocal-cli convert etog 2017 5 25
 ```
 
 ### HTTP Server
 
 ```bash
-ethiocal --server
+ethiocal-cli --server
 ```
 
 Starts the API on port `8080` (override with the `PORT` environment variable).

bahirehasab/bahirehasab.go

@@ -131,7 +131,7 @@ func getBasic(year int) Basic {
 			DateOfTheMonth: mebajaHamer,
 			MonthOfTheYear: 5,
 		}
-	} else if bealeMetq == 2 || (bealeMetq == 1 && mebajaHamer > 30) {
+	} else if bealeMetq == 2 || bealeMetq == 1 {
 		nenewie = Date{
 			DateOfTheMonth: mebajaHamer % 30,
 			MonthOfTheYear: 6,

cmd/bahir.go cmd/ethiocal-cli/bahir.gocmd/bahir.go renamed to cmd/ethiocal-cli/bahir.go

@@ -1,4 +1,4 @@
-package cmd
+package main
 
 import (
 	"fmt"