Skip to content

Commit 1ff1065

Browse files
authored
Merge pull request #159 from hellokitty-coding-club/feat/product-flavor
[FEAT] flavorDimension 활용해서 dev, prod 분리 (#158)
2 parents 271f4c2 + 217b83e commit 1ff1065

File tree

6 files changed

+25
-6
lines changed

6 files changed

+25
-6
lines changed

.github/workflows/prBuilder.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
appId: ${{ secrets.FIREBASE_APP_ID }}
6161
token: ${{ secrets.FIREBASE_TOKEN }}
6262
groups: hello-kitty-coding-club
63-
file: app/build/outputs/apk/debug/app-debug.apk
63+
file: app/build/outputs/apk/dev/debug/app-dev-debug.apk
6464
releaseNotes: |
6565
${{ github.event.pull_request.title }}
6666
${{ github.event.pull_request.html_url }}

app/build.gradle.kts

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
@file:Suppress("UnstableApiUsage")
2+
13
import org.jetbrains.kotlin.konan.properties.Properties
24

35
val lgtmPropertiesFile = rootProject.file("lgtm.properties")
@@ -45,6 +47,23 @@ android {
4547
}
4648
}
4749

50+
flavorDimensions += "version"
51+
productFlavors {
52+
create("prod") {
53+
dimension = "version"
54+
manifestPlaceholders["appLabel"] = "LGTM"
55+
buildConfigField("boolean", "IS_PROD", "true")
56+
buildConfigField("boolean", "IS_DEV", "false")
57+
}
58+
create("dev") {
59+
dimension = "version"
60+
applicationIdSuffix = ".dev"
61+
manifestPlaceholders["appLabel"] = "(Dev)LGTM"
62+
buildConfigField("boolean", "IS_PROD", "false")
63+
buildConfigField("boolean", "IS_DEV", "true")
64+
}
65+
}
66+
4867
buildFeatures {
4968
buildConfig = true
5069
}

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:name=".LGTMApplication"
99
android:allowBackup="false"
1010
android:icon="@mipmap/ic_launcher"
11-
android:label="@string/app_name"
11+
android:label="${appLabel}"
1212
android:roundIcon="@mipmap/ic_launcher_round"
1313
android:supportsRtl="true"
1414
android:theme="@style/Theme.LGTMAndroid"

common-ui/src/main/java/com/lgtm/android/common_ui/constant/InfoType.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ enum class InfoType(
2121
R.drawable.ic_info_red
2222
),
2323
VALID_REAL_NAME(R.color.red, R.string.write_correct_name, true, R.drawable.ic_info_red),
24-
OVER_12_MONTHS_EXPERIENCE_REQUIRED(
25-
R.color.red, R.string.over_12_month_experience_required,
24+
EXPERIENCE_REQUIRED(
25+
R.color.red, R.string.career_experience_required,
2626
true, R.drawable.ic_info_red
2727
),
2828
GITHUB_URL_ONLY(R.color.red, R.string.github_url_only, true, R.drawable.ic_info_red),

common-ui/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
<string name="cannot_use_space">띄어쓰기는 사용할 수 없습니다.</string>
4545
<string name="cannot_only_use_space">띄어쓰기만 입력할 수 없습니다.</string>
4646
<string name="write_correct_name">올바른 실명을 입력해 주세요.</string>
47-
<string name="over_12_month_experience_required">경력 12개월 이상만 가입할 수 있습니다.</string>
47+
<string name="career_experience_required">현업 개발자만 리뷰어 활동이 가능해요</string>
4848
<string name="duplicate_nickname">중복된 닉네임입니다.</string>
4949
<string name="can_use">사용 가능합니다.</string>
5050
<string name="empty_value"></string>

feature/auth/src/main/java/com/lgtm/android/auth/ui/signup/SignUpViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ class SignUpViewModel @Inject constructor(
275275
val careerPeriod = careerPeriod.value
276276
careerPeriodInfoStatus.value = when {
277277
careerPeriod == null -> InfoType.NONE
278-
careerPeriod < 12 -> InfoType.OVER_12_MONTHS_EXPERIENCE_REQUIRED
278+
careerPeriod < 1 -> InfoType.EXPERIENCE_REQUIRED
279279
else -> InfoType.NONE
280280
}
281281
}

0 commit comments

Comments
 (0)