[feat]

1. 하이픈 사용 설정 여부 제거(하이픈은 한국 번호의 경우, 기본으로 붙이도록 지정)

Author: Ernstjunger-1914

app/src/main/java/ch/lock/mobile/android/deviceinfo/data/local/datastore/setting/SettingDataStore.kt

@@ -16,11 +16,6 @@ val Context.dataStore by preferencesDataStore(
 )
 
 data class SettingPref(
-    /**
-     * 전화번호에 하이픈 표시 여부
-     */
-    val isUseHyphen: Boolean,
-
     /**
      * 화면 캡쳐 차단 여부
      */
@@ -36,7 +31,6 @@ class SettingPrefRepository(
     }
 
     object PrefKeys {
-        val IS_USE_HYPHEN = booleanPreferencesKey("IS_USE_HYPHEN")
         val IS_CAPTURE_BLOCK = booleanPreferencesKey("IS_CAPTURE_BLOCK")
     }
 
@@ -45,23 +39,16 @@ class SettingPrefRepository(
             mapSettingPreferences(pref)
         }
 
-    suspend fun updateIsUseHyphen(isUseHyphen: Boolean) = dataStore.edit { pref ->
-        pref[PrefKeys.IS_USE_HYPHEN] = isUseHyphen
-    }
-
     suspend fun updateIsCaptureBlock(isCaptureBlock: Boolean) = dataStore.edit { pref ->
         pref[PrefKeys.IS_CAPTURE_BLOCK] = isCaptureBlock
     }
 
     private fun mapSettingPreferences(preferences: Preferences): SettingPref {
-        // 하이픈 사용 여부
-        val isUseHyphen: Boolean = preferences[PrefKeys.IS_USE_HYPHEN] ?: false
 
         // 화면 캡쳐 차단 여부
         val isCaptureBlock: Boolean = preferences[PrefKeys.IS_CAPTURE_BLOCK] ?: true
 
         return SettingPref(
-            isUseHyphen = isUseHyphen,
             isCaptureBlock = isCaptureBlock
         )
     }

app/src/main/java/ch/lock/mobile/android/deviceinfo/ui/setting/SettingViewModel.kt

@@ -14,14 +14,6 @@ class SettingViewModel(
         const val TAG: String = "SettingViewModel"
     }
 
-    /**
-     * 하이픈 사용 여부 설정
-     */
-    val isUseHyphen: MutableLiveData<Boolean> =
-        (settingPrefRepository.settingPrefFlow.map {
-            it.isUseHyphen
-        }.asLiveData() as MutableLiveData<Boolean>)
-
     /**
      * 캡쳐 방지 여부 설정
      */
@@ -32,11 +24,6 @@ class SettingViewModel(
 
     init {
         viewModelScope.launch {
-            launch {
-                isUseHyphen.asFlow().collect {
-                    settingPrefRepository.updateIsUseHyphen(it)
-                }
-            }
             launch {
                 isCaptureBlock.asFlow().collect {
                     settingPrefRepository.updateIsCaptureBlock(it)

app/src/main/java/ch/lock/mobile/android/deviceinfo/utils/FormatUtils.kt

@@ -13,7 +13,7 @@ open class FormatUtils {
      */
     open fun toLocalPhoneNumber(
         internationalNumber: String?,
-        includeHyphen: Boolean
+        includeHyphen: Boolean = true
     ): String {
         if (internationalNumber.isNullOrEmpty()) return "유심을 장착 혹은 정상적으로 인식되지 않아 확인 불가"
 

app/src/main/java/ch/lock/mobile/android/deviceinfo/utils/SimUtils.kt

@@ -56,7 +56,7 @@ open class SimUtils(
      */
     open val phoneNumber: String
         get() = try {
-            formatUtils.toLocalPhoneNumber(globalPhoneNumber, true)
+            formatUtils.toLocalPhoneNumber(globalPhoneNumber)
         } catch (e: Exception) {
             ""
         }

app/src/main/res/layout/activity_setting.xml

@@ -26,44 +26,6 @@
                 app:header_type="2"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <!-- 전화번호 표시 시 하이픈 사용 여부 설정 레이아웃 -->
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/layout_hyphen_setting"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="1dp"
-                android:background="@color/white"
-                android:focusableInTouchMode="false">
-
-                <TextView
-                    android:id="@+id/TextView_is_use_hyphen"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="15dp"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginBottom="15dp"
-                    android:focusable="false"
-                    android:text="@string/is_use_hyphen"
-                    android:textColor="@color/black"
-                    android:textSize="16sp"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <androidx.appcompat.widget.SwitchCompat
-                    android:id="@+id/switch_is_use_hyphen_setting"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="15dp"
-                    android:layout_marginEnd="15dp"
-                    android:checked="@={viewModel.isUseHyphen()}"
-                    android:focusable="false"
-                    app:layout_constraintBottom_toBottomOf="@id/TextView_is_use_hyphen"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintTop_toTopOf="@id/TextView_is_use_hyphen" />
-
-            </androidx.constraintlayout.widget.ConstraintLayout>
-
             <!-- 화면 캡쳐 차단 여부 설정 레이아웃 -->
             <androidx.constraintlayout.widget.ConstraintLayout
                 android:id="@+id/layout_capture_block_setting"