refactor : 리베이스 과정 충돌 해결

TeamDMU · Apr 2, 2024 · 92e61ba · 92e61ba
1 parent 00882d8
commit 92e61ba
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 57 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -22,10 +22,7 @@
         android:theme="@style/Theme.YouDongKnowMe"
         android:usesCleartextTraffic="true">
         <activity
-            android:name=".dialog_permission"
-            android:exported="false" />
-        <activity
-            android:name=".ui.view.permission.OnboardingPermissionActivity"
+            android:name=".ui.view.setting.OnboardingPermissionActivity"
             android:exported="false" />
         <activity
             android:name=".ui.view.license.LicenseActivity"

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/dialog_permission.kt b/app/src/main/java/com/dongyang/android/youdongknowme/dialog_permission.kt
diff --git a/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt b/...n/java/com/dongyang/android/youdongknowme/ui/view/setting/OnboardingPermissionActivity.kt
@@ -4,12 +4,10 @@ import android.Manifest
 import android.content.pm.PackageManager
 import android.content.res.ColorStateList
 import androidx.core.content.ContextCompat
-import com.dongyang.android.youdongknowme.DialogPermission
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.ActivityOnboardingPermissionBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseActivity
 import com.dongyang.android.youdongknowme.ui.view.main.MainActivity
-import com.dongyang.android.youdongknowme.ui.view.setting.SettingViewModel
 import org.koin.androidx.viewmodel.ext.android.viewModel
 
 

diff --git a/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt b/app/src/main/java/com/dongyang/android/youdongknowme/ui/view/setting/SettingFragment.kt
@@ -9,7 +9,6 @@ import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
 import android.os.Build
 import androidx.core.content.ContextCompat
-import com.dongyang.android.youdongknowme.DialogPermission
 import com.dongyang.android.youdongknowme.R
 import com.dongyang.android.youdongknowme.databinding.FragmentSettingBinding
 import com.dongyang.android.youdongknowme.standard.base.BaseFragment

diff --git a/app/src/main/res/layout/dialog_permission.xml b/app/src/main/res/layout/dialog_permission.xml
@@ -5,7 +5,8 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:layout_margin="20dp"
-    android:background="@drawable/bg_search_white_radius_10dp">
+    android:backgroundTint="@color/white"
+    android:background="@drawable/bg_stroke_gray300_radius_2dp">
 
     <TextView
         android:id="@+id/customTvTitle"