Skip to content

some fixes for packaging and other stuff #84

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 30 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
38999a2
fix cargo.toml of fix-path-env
wiiznokes Jun 20, 2025
115ef13
default to dark theme in linux because it looks better
wiiznokes Jun 20, 2025
e3ac689
add debug-embed
wiiznokes Jun 20, 2025
ab19cee
make usb a feature
wiiznokes Jun 20, 2025
f9803dd
disable adb option on flatpak + arm
wiiznokes Jun 20, 2025
0a6668e
rename namespace com.example.androidMic to io.github.teamclouday.andr…
wiiznokes Jun 20, 2025
8d962b2
Merge branch 'main' into packaging-fix
wiiznokes Jun 20, 2025
caffe0b
change appid
wiiznokes Jun 21, 2025
dbe9622
rename appid android side
wiiznokes Jun 21, 2025
3b16b30
Revert "disable adb option on flatpak + arm"
wiiznokes Jun 21, 2025
065940b
Merge branch 'main' into packaging-fix
wiiznokes Jun 23, 2025
91bb58f
improve padding with system bars using scafold
wiiznokes Jun 23, 2025
39f05c9
remove the use of constraint layout
wiiznokes Jun 23, 2025
f8ade43
fmt
wiiznokes Jun 23, 2025
3626dfd
fix some ui bugs in drawer
wiiznokes Jun 23, 2025
a8ef912
handle permissions better
wiiznokes Jun 23, 2025
43561f8
refractor start streaming to only start audio when streamer is connected
wiiznokes Jun 23, 2025
534f5c3
add an action on the notification to stop the service
wiiznokes Jun 23, 2025
7555293
add nightly variant
wiiznokes Jun 23, 2025
cad412c
fix padding for device with camera
wiiznokes Jun 23, 2025
76d4007
fix a bug in the service binding logic
wiiznokes Jun 23, 2025
d0118e8
include the nightly key
wiiznokes Jun 23, 2025
13ab8a9
add a CI workflow
wiiznokes Jun 23, 2025
313c0e0
add exe bit to gradlew
wiiznokes Jun 23, 2025
35034ae
fix: scroll to end on the rust app
wiiznokes Jun 24, 2025
0587ea1
add a context menu to clear logs
wiiznokes Jun 24, 2025
bd38a0a
fmt
wiiznokes Jun 24, 2025
487a3cf
update rust deps
wiiznokes Jun 24, 2025
1cd3496
add markdown for logs
wiiznokes Jun 24, 2025
3395b6d
pin version of my crates
wiiznokes Jun 24, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
name: CI

on:
pull_request:
types: [opened, synchronize, reopened, ready_for_review]
workflow_dispatch:

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}
cancel-in-progress: true

env:
CARGO_TERM_COLOR: always

jobs:
build-rust-app:
name: Build Rust App on ${{ matrix.os }}
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-22.04
platform: linux
- os: windows-2022
platform: windows
- os: macos-13
platform: macos

steps:
- name: Checkout code
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Install dependencies (Linux)
if: matrix.platform == 'linux'
run: |
sudo apt-get update
sudo apt-get install -y libasound2-dev libjack-jackd2-dev libxkbcommon-dev protobuf-compiler

- name: Install dependencies (Windows)
if: matrix.platform == 'windows'
run: choco install protoc -y

- name: Install dependencies (macOS)
if: matrix.platform == 'macos'
run: brew install protobuf --quiet

- name: Install Rust toolchain
run: rustup update

- name: Set up Rust cache
uses: Swatinem/rust-cache@v2
with:
workspaces: "./RustApp -> target"

- name: Build
working-directory: ./RustApp
run: cargo build

build-android-app:
name: Build Android App
runs-on: ubuntu-latest

steps:
- name: Checkout code
uses: actions/checkout@v4

- name: Set up JDK 21
uses: actions/setup-java@v4
with:
java-version: "21"
distribution: "temurin"
cache: gradle

- name: Build APK
working-directory: ./Android
run: ./gradlew assembleDebug
4 changes: 0 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,10 +137,6 @@ jobs:
distribution: "temurin"
cache: gradle

- name: Grant execute permission for gradlew
working-directory: ./Android
run: chmod +x gradlew

- name: Build Release APK
working-directory: ./Android
run: ./gradlew assembleRelease
Expand Down
3 changes: 2 additions & 1 deletion Android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,5 @@ google-services.json
# Android Profiling
*.hprof

.kotlin
.kotlin
!/app/nightly-signing-key.jks
26 changes: 19 additions & 7 deletions Android/app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import com.google.protobuf.gradle.*
import com.google.protobuf.gradle.id

plugins {
alias(libs.plugins.android.application)
Expand All @@ -8,11 +8,11 @@ plugins {
}

android {
namespace = "com.example.androidMic"
namespace = "io.github.teamclouday.AndroidMic"
compileSdk = 35

defaultConfig {
applicationId = "com.example.androidMic"
applicationId = "io.github.teamclouday.AndroidMic"
minSdk = 23
targetSdk = 35
versionCode = 10
Expand All @@ -26,6 +26,16 @@ android {

}

signingConfigs {
// need this because debug key is machine dependent
create("nightly") {
keyAlias = "key0"
keyPassword = "123456"
storeFile = file("nightly-signing-key.jks")
storePassword = "123456"
}
}

buildTypes {
release {
isMinifyEnabled = false
Expand All @@ -36,6 +46,12 @@ android {
signingConfig = signingConfigs.getByName("debug")
}

create("nightly") {
initWith(getByName("release"))
signingConfig = signingConfigs.getByName("nightly")
applicationIdSuffix = ".nightly"
}

debug {
applicationIdSuffix = ".debug"
}
Expand Down Expand Up @@ -100,10 +116,6 @@ dependencies {
implementation(libs.compose.material)
implementation(libs.compose.material3)
implementation(libs.compose.material.icons.extended)
implementation(libs.compose.constraintlayout)

// compose permission
implementation(libs.accompanist.permissions)

// Compose Debug
implementation(libs.compose.ui.preview)
Expand Down
Binary file added Android/app/nightly-signing-key.jks
Binary file not shown.
6 changes: 3 additions & 3 deletions Android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
<uses-permission android:name="android.permission.USB_PERMISSION" />

<application
android:name="com.example.androidMic.AndroidMicApp"
android:name="io.github.teamclouday.AndroidMic.AndroidMicApp"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
Expand All @@ -26,7 +26,7 @@
android:theme="@style/Theme.AndroidMic">

<activity
android:name="com.example.androidMic.ui.MainActivity"
android:name="io.github.teamclouday.AndroidMic.ui.MainActivity"
android:exported="true"
android:theme="@style/Theme.AndroidMic">
<intent-filter>
Expand All @@ -45,7 +45,7 @@
android:resource="@xml/accessory_filter" />
</activity>
<service
android:name="com.example.androidMic.domain.service.ForegroundService"
android:name="io.github.teamclouday.AndroidMic.domain.service.ForegroundService"
android:foregroundServiceType="microphone" />

</application>
Expand Down
Loading