Skip to content

Commit

Permalink
Merge pull request #6 from lokified/ft/camera
Browse files Browse the repository at this point in the history
Ft/camera
  • Loading branch information
lokified authored Sep 19, 2023
2 parents 643a7cc + dcbc1e2 commit e1286e1
Show file tree
Hide file tree
Showing 73 changed files with 2,644 additions and 485 deletions.
13 changes: 8 additions & 5 deletions .github/workflows/build_release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ on:
- 'master'
tags:
- 'v*'
pull_request:
types:
- closed

jobs:
apk:
Expand Down Expand Up @@ -34,7 +37,7 @@ jobs:
run: bash ./gradlew assembleDebug --stacktrace

- name: Upload APK
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v2
with:
name: apk
path: app/build/outputs/apk/debug/app-debug.apk
Expand All @@ -46,7 +49,7 @@ jobs:

steps:
- name: Download APK from build
uses: actions/download-artifact@v1
uses: actions/download-artifact@v2
with:
name: apk

Expand All @@ -56,12 +59,12 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: v2.0.0
release_name: ${{ github.event.repository.name }} v2.0.0
tag_name: v0.3.0-beta
release_name: ${{ github.event.repository.name }} v0.3.0-beta

- name: Upload Release APK
id: upload_release_asset
uses: actions/upload-release-asset@v1.0.1
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
1 change: 1 addition & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ dependencies {
implementation(project(":feature:profile"))
implementation(project(":feature:report"))
implementation(project(":feature:settings"))
implementation(project(":feature:camera"))

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.activity.compose)
Expand Down
9 changes: 7 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,14 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">

<uses-feature android:name="android.hardware.camera"/>
<uses-feature android:name="android.hardware.telephony"/>

<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.CALL_PHONE"/>

<application
android:name=".ReetApp"
Expand Down
1 change: 1 addition & 0 deletions core/navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -65,4 +65,5 @@ dependencies {
implementation(project(":feature:profile"))
implementation(project(":feature:report"))
implementation(project(":feature:settings"))
implementation(project(":feature:camera"))
}
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fun BottomNavigation(
AnimatedVisibility(
visible = isVisible,
enter = slideInVertically(initialOffsetY = { it }),
exit = slideOutVertically(targetOffsetY = { it })
exit = slideOutVertically(targetOffsetY = { it / 10 })
) {

AppBottomBar(
Expand Down
Loading

0 comments on commit e1286e1

Please sign in to comment.