diff --git a/app/build.gradle b/app/build.gradle index 43856f74..df244a7d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -28,8 +28,8 @@ android { applicationId "com.hyeeyoung.wishboard" minSdkVersion 24 targetSdkVersion 33 - versionCode 34 - versionName "1.2.3" + versionCode 35 + versionName "1.2.4" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -40,6 +40,7 @@ android { buildTypes { debug { buildConfigField "String", "BASE_URL", properties["DEV_BASE_URL"] + versionNameSuffix = "-dev" } release { minifyEnabled true diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index c034fac2..533cfd5e 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -43,17 +43,6 @@ android:exported="true" android:screenOrientation="portrait" android:windowSoftInputMode="adjustResize"> - - - - - - - - (R.layout.fragment_my) { findNavController().navigateSafe(R.id.action_my_to_password_change) } binding.contactUs.setOnClickListener { - val email = Intent(Intent.ACTION_SEND) - email.type = "plain/text" - email.putExtra(Intent.EXTRA_EMAIL, arrayOf("wishboard2022@gmail.com")) - startActivity(email) + requireContext().sendMail( + getString(R.string.my_contact_us_email_title), + String.format( + getString(R.string.my_contact_us_email_content), + Build.BRAND, + Build.MODEL, + BuildConfig.VERSION_NAME, + Build.VERSION.SDK_INT, + ), + ) } binding.howToUse.setOnClickListener { moveWebViewActivity( diff --git a/app/src/main/java/com/hyeeyoung/wishboard/util/extension/ContextExt.kt b/app/src/main/java/com/hyeeyoung/wishboard/util/extension/ContextExt.kt index 2d4a6937..4f72764e 100644 --- a/app/src/main/java/com/hyeeyoung/wishboard/util/extension/ContextExt.kt +++ b/app/src/main/java/com/hyeeyoung/wishboard/util/extension/ContextExt.kt @@ -1,9 +1,20 @@ package com.hyeeyoung.wishboard.util.extension import android.content.Context +import android.content.Intent import android.widget.Toast +import com.hyeeyoung.wishboard.R fun Context.showToast(message: String, isShort: Boolean = true) { val duration = if (isShort) Toast.LENGTH_SHORT else Toast.LENGTH_LONG Toast.makeText(this, message, duration).show() } + +fun Context.sendMail(title: String, content: String) { + Intent(Intent.ACTION_SEND).apply { + type = "plain/text" + putExtra(Intent.EXTRA_EMAIL, arrayOf(getString(R.string.wishboard_email))) + putExtra(Intent.EXTRA_SUBJECT, title) + putExtra(Intent.EXTRA_TEXT, content) + }.also { startActivity(it) } +} \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8ea7389a..8e4f1b31 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,6 +1,7 @@ WishBoard Wish Board + wishboard2022@gmail.com 확인 @@ -209,6 +210,8 @@ 새 비밀번호 재입력 새 비밀번호를 다시 입력해 주세요. 비밀번호가 일치하지 않아요! + 위시보드에게 문의하기 + 안녕하세요. 위시보드 입니다. 🔫\n문의 내용을 하단에 작성해 주세요.\n답변은 전송주신 메일로 회신드리겠습니다. 💌\n감사합니다. 😉\n-------------\n\n\n\n\n\n-------------\nDevice: %s %s\nApp version: %s\nOS Version: %d 네! 알겠어요