Skip to content

Commit e71f9c8

Browse files
committed
feat: add security.md
1 parent 8ff1c94 commit e71f9c8

File tree

24 files changed

+310
-294
lines changed

24 files changed

+310
-294
lines changed

.github/workflows/app-build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424

2525
build:
2626
name: Build
27-
runs-on: ubuntu-20.04
27+
runs-on: ubuntu-latest
2828

2929
steps:
3030
- uses: actions/checkout@v1

.github/workflows/deploy-apk.yml

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
name: Deploy APK on GitHub
2+
3+
on:
4+
release:
5+
types:
6+
- created
7+
8+
permissions:
9+
contents: write
10+
11+
jobs:
12+
build:
13+
runs-on: ubuntu-latest
14+
15+
steps:
16+
- uses: actions/checkout@v1
17+
- name: set up JDK 17
18+
uses: actions/setup-java@v1
19+
with:
20+
java-version: 17
21+
22+
- name: Build APK
23+
run: bash gradlew app:assembleRelease
24+
25+
- uses: r0adkll/[email protected]
26+
name: Sign APK
27+
id: sign_app
28+
with:
29+
releaseDirectory: app/build/outputs/apk/release
30+
signingKeyBase64: ${{ secrets.SIGNING_KEY }}
31+
alias: ${{ secrets.KEY_ALIAS }}
32+
keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
33+
keyPassword: ${{ secrets.KEY_PASSWORD }}
34+
35+
- uses: svenstaro/upload-release-action@v2
36+
name: Upload APK
37+
with:
38+
file: ${{steps.sign_app.outputs.signedReleaseFile}}
39+
asset_name: embedded_server.apk
40+
tag: ${{ github.ref }}
41+
repo_token: ${{ secrets.GITHUB_TOKEN }}

.idea/deploymentTargetSelector.xml

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/inspectionProfiles/Project_Default.xml

Lines changed: 32 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

SECURITY.md

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
# Security Policy
2+
3+
## Supported Versions
4+
5+
Since this is an Android app, only the latest version is supported.
6+
7+
## Reporting a Vulnerability
8+
9+
Please open an issue on GitHub to report a vulnerability.

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ android {
5252
dependencies {
5353

5454
// Core
55-
implementation 'androidx.core:core-ktx:1.12.0'
55+
implementation 'androidx.core:core-ktx:1.13.1'
5656
implementation 'androidx.appcompat:appcompat:1.6.1'
57-
implementation 'com.google.android.material:material:1.11.0'
57+
implementation 'com.google.android.material:material:1.12.0'
5858
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
5959

6060
// Serialization

app/src/androidTest/java/com/imstudio/app/embeddedserver/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

app/src/main/java/com/nphausg/app/embeddedserver/activities/MainActivity.kt

Lines changed: 20 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,11 @@ import androidx.compose.foundation.layout.padding
3232
import androidx.compose.foundation.layout.size
3333
import androidx.compose.foundation.layout.width
3434
import androidx.compose.foundation.shape.CircleShape
35+
import androidx.compose.material.icons.Icons
36+
import androidx.compose.material.icons.filled.Lock
37+
import androidx.compose.material.icons.outlined.Lock
3538
import androidx.compose.material3.Card
36-
import androidx.compose.material3.CardDefaults
39+
import androidx.compose.material3.FilledIconToggleButton
3740
import androidx.compose.material3.Icon
3841
import androidx.compose.material3.LinearProgressIndicator
3942
import androidx.compose.material3.MaterialTheme
@@ -61,14 +64,12 @@ import androidx.compose.ui.unit.dp
6164
import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
6265
import com.nphausg.app.embeddedserver.EmbeddedServer
6366
import com.nphausg.app.embeddedserver.R
64-
import com.nphausg.app.embeddedserver.data.models.Cart
65-
import com.nphausg.app.embeddedserver.utils.FileUtils
66-
import com.nphausg.app.ui.ImsApp
67-
import com.nphausg.app.ui.components.theme.ImsTheme
68-
import com.nphausg.app.ui.components.ThemePreviews
69-
import com.nphausg.app.ui.components.button.ImsButton
70-
import com.nphausg.app.ui.components.button.ImsOutlinedButton
71-
import com.nphausg.app.ui.components.icon.ImsIcons
67+
import com.masewsg.app.ui.ComposeApp
68+
import com.masewsg.app.ui.components.theme.ComposeTheme
69+
import com.masewsg.app.ui.components.ThemePreviews
70+
import com.masewsg.app.ui.components.button.ComposeButton
71+
import com.masewsg.app.ui.components.button.ComposeOutlinedButton
72+
import com.masewsg.app.ui.components.icon.ComposeIcons
7273
import kotlinx.coroutines.delay
7374
import kotlinx.coroutines.launch
7475
import kotlin.time.Duration.Companion.seconds
@@ -90,8 +91,8 @@ class MainActivity : AppCompatActivity() {
9091
// enableEdgeToEdge()
9192
setContent {
9293
CompositionLocalProvider() {
93-
ImsTheme {
94-
ImsApp {
94+
ComposeTheme {
95+
ComposeApp {
9596
MainScreen()
9697
}
9798
}
@@ -205,7 +206,7 @@ private fun MainScreen() {
205206
)
206207
) {
207208
Row {
208-
Icon(imageVector = ImsIcons.PlayArrow, contentDescription = null)
209+
Icon(imageVector = ComposeIcons.PlayArrow, contentDescription = null)
209210
Text(
210211
color = Color.Black,
211212
textAlign = TextAlign.Start,
@@ -214,7 +215,7 @@ private fun MainScreen() {
214215
)
215216
}
216217
Row {
217-
Icon(imageVector = ImsIcons.PlayArrow, contentDescription = null)
218+
Icon(imageVector = ComposeIcons.PlayArrow, contentDescription = null)
218219
Text(
219220
color = Color.Black,
220221
textAlign = TextAlign.Start,
@@ -224,7 +225,7 @@ private fun MainScreen() {
224225
}
225226

226227
Row(modifier = Modifier) {
227-
Icon(imageVector = ImsIcons.PlayArrow, contentDescription = null)
228+
Icon(imageVector = ComposeIcons.PlayArrow, contentDescription = null)
228229
Text(
229230
color = Color.Black,
230231
textAlign = TextAlign.Start,
@@ -234,7 +235,7 @@ private fun MainScreen() {
234235
}
235236

236237
Row {
237-
Icon(imageVector = ImsIcons.PlayArrow, contentDescription = null)
238+
Icon(imageVector = ComposeIcons.PlayArrow, contentDescription = null)
238239
Text(
239240
color = Color.Black,
240241
textAlign = TextAlign.Start,
@@ -250,7 +251,7 @@ private fun MainScreen() {
250251
.fillMaxWidth()
251252
.padding(Dp(36f))
252253
) {
253-
ImsButton(
254+
ComposeButton(
254255
enabled = !hasStarted,
255256
modifier = Modifier.weight(1f),
256257
onClick = {
@@ -259,7 +260,7 @@ private fun MainScreen() {
259260
},
260261
text = { Text("Start") })
261262
Spacer(modifier = Modifier.weight(0.1f))
262-
ImsOutlinedButton(
263+
ComposeOutlinedButton(
263264
enabled = hasStarted,
264265
modifier = Modifier.weight(1f),
265266
onClick = {
@@ -302,8 +303,8 @@ private fun MainScreen() {
302303
@ThemePreviews
303304
@Composable
304305
fun MainScreenPreview() {
305-
ImsTheme {
306-
ImsApp {
306+
ComposeTheme {
307+
ComposeApp {
307308
MainScreen()
308309
}
309310
}

app/src/test/java/com/imstudio/app/embeddedserver/ExampleUnitTest.kt

Lines changed: 0 additions & 17 deletions
This file was deleted.

core/ui/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
}
55

66
android {
7-
namespace 'com.nphausg.app.ui'
7+
namespace 'com.masewsg.app.ui'
88
compileSdk 34
99

1010
defaultConfig {
@@ -35,19 +35,19 @@ android {
3535
}
3636

3737
dependencies {
38-
implementation 'androidx.core:core-ktx:1.12.0'
38+
implementation 'androidx.core:core-ktx:1.13.1'
3939
implementation 'androidx.appcompat:appcompat:1.6.1'
40-
implementation 'com.google.android.material:material:1.11.0'
40+
implementation 'com.google.android.material:material:1.12.0'
4141

4242
// Compose
43-
def composeBom = platform('androidx.compose:compose-bom:2024.04.00')
43+
def composeBom = platform('androidx.compose:compose-bom:2024.05.00')
4444
api composeBom
4545
androidTestImplementation composeBom
4646
// Android Studio Preview support
4747
api 'androidx.compose.ui:ui-tooling-preview'
4848
debugApi 'androidx.compose.ui:ui-tooling'
4949
// Optional - Integration with activities
50-
api 'androidx.activity:activity-compose:1.8.2'
50+
api 'androidx.activity:activity-compose:1.9.0'
5151
api 'androidx.compose.material3:material3'
5252
api 'androidx.compose.foundation:foundation'
5353
// or only import the main APIs for the underlying toolkit systems,

core/ui/src/androidTest/java/com/nphausg/app/theme/ExampleInstrumentedTest.kt

Lines changed: 0 additions & 24 deletions
This file was deleted.

core/ui/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
3-
4-
</manifest>
2+
<manifest/>

0 commit comments

Comments
 (0)