Skip to content

Commit

Permalink
Merge pull request #66 from boostcampwm2023/dev/and
Browse files Browse the repository at this point in the history
์•ˆ๋“œ๋กœ์ด๋“œ ์›Œํฌํ”Œ๋กœ์šฐ ๊ตฌ์ถ•
  • Loading branch information
EunhoKang authored Nov 14, 2023
2 parents a040523 + ae4a630 commit 12e81fe
Show file tree
Hide file tree
Showing 50 changed files with 587 additions and 267 deletions.
39 changes: 39 additions & 0 deletions .github/workflows/firebase-deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
name: ๐Ÿ”ฅ Deploy to Firebase App Distribution

on:
push:
branches:
- release # Only in release branch

jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
path: android
- name: Setup JDK
uses: actions/setup-java@v3
with:
distribution: 'oracle'
java-version: '17'
- name: Generate Keystore
env:
KEYSTORE_B64: ${{ secrets.APP_KEYSTORE }}
run: |
echo $KEYSTORE_B64 > keystore_b64.txt
base64 -d keystore_b64.txt > keystore.jks
- name: Build Release APK
env:
SIGNING_KEY_ALIAS: ${{ secrets.KEY_ALIAS }}
SIGNING_PASSWORD: ${{ secrets.KEY_PASSWORD }}
run: ./gradlew assembleRelease

- name: Upload to Firebase App Distribution
uses: wzieba/Firebase-Distribution-Github-Action@v1
with:
appId: ${{ secrets.FIREBASE_APP_ID }}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: testers
file: app/release/app-release.apk
19 changes: 19 additions & 0 deletions .github/workflows/ktlint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: reviewdog_kotlin
on:
pull_request:
paths:
- android/**

jobs:
ktlint:
name: Check Kotlin Format
runs-on: ubuntu-latest

steps:
- name: Clone repo
uses: actions/checkout@v4
- name: ktlint
uses: ScaCap/action-ktlint@master
with:
github_token: ${{ secrets.github_token }}
reporter: github-pr-review
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# MacOS
.DS_Store
18 changes: 18 additions & 0 deletions android/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[*.{kt,kts}]
end_of_line = lf
ij_kotlin_allow_trailing_comma = false
ij_kotlin_allow_trailing_comma_on_call_site = false
ij_kotlin_imports_layout = *
ij_kotlin_packages_to_use_import_on_demand = java.util.*,kotlinx.android.synthetic.**
indent_size = 4
indent_style = space
insert_final_newline = true
ktlint_chain_method_rule_force_multiline_when_chain_operator_count_greater_or_equal_than = unset
ktlint_class_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = unset
ktlint_code_style = android_studio
ktlint_function_naming_ignore_when_annotated_with = [unset]
ktlint_function_signature_body_expression_wrapping = default
ktlint_function_signature_rule_force_multiline_when_parameter_count_greater_or_equal_than = unset
ktlint_ignore_back_ticked_identifier = false
max_line_length = off

6 changes: 6 additions & 0 deletions android/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,9 @@
.externalNativeBuild
.cxx
local.properties

# Keystore
*.jks

# Release
/app/release
1 change: 1 addition & 0 deletions android/.idea/.name

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions android/.idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions android/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 10 additions & 0 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,16 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}

signingConfigs {
release {
storeFile file("keystore.jks")
storePassword System.getenv("SIGNING_PASSWORD")
keyAlias System.getenv("SIGNING_KEY_ALIAS")
keyPassword System.getenv("SIGNING_PASSWORD")
}
}

compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down

This file was deleted.

4 changes: 2 additions & 2 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:icon="@mipmap/ic_priceguard"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:roundIcon="@mipmap/ic_priceguard_round"
android:supportsRtl="true"
android:theme="@style/Theme.PriceGuard"
tools:targetApi="31">
Expand Down
Binary file added android/app/src/main/ic_priceguard-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
30 changes: 0 additions & 30 deletions android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

This file was deleted.

5 changes: 5 additions & 0 deletions android/app/src/main/res/drawable/ic_back.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:autoMirrored="true" android:height="24dp"
android:tint="#000000" android:viewportHeight="24"
android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>
170 changes: 0 additions & 170 deletions android/app/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

Loading

0 comments on commit 12e81fe

Please sign in to comment.