Merge pull request #642 from TeamBeMe/release/1.1.1

Merge release to devleop
TeamBeMe · Apr 2, 2021 · eb0f1a6 · eb0f1a6
2 parents 3da9189 + 74ecf8e
commit eb0f1a6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,7 +2,9 @@ name: BeMe Android Builder
 
 on:
   push:
-    branches: [ develop ]
+    branches:
+      - develop
+      - 'release/**'
 
 defaults:
   run:

diff --git a/.idea/sonarIssues.xml b/.idea/sonarIssues.xml
diff --git a/app/src/main/java/com/teambeme/beme/answer/view/AnswerActivity.kt b/app/src/main/java/com/teambeme/beme/answer/view/AnswerActivity.kt
@@ -98,7 +98,7 @@ class AnswerActivity : BindingActivity<ActivityAnswerBinding>(R.layout.activity_
                 answerViewModel.registerAnswer(requestAnswerData)
                 delay(500)
                 val position = intent.getIntExtra("position", -1)
-                intent.putExtra("posittion", position)
+                intent.putExtra("position", position)
                 intent.putExtra("content", answerViewModel.answer.value)
                 setResult(RESULT_OK, intent)
                 finish()

diff --git a/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt b/app/src/main/java/com/teambeme/beme/signup/view/PermissionInfoFragment.kt
@@ -14,7 +14,9 @@ import com.google.firebase.ktx.Firebase
 import com.teambeme.beme.R
 import com.teambeme.beme.databinding.FragmentPermissionInfoBinding
 import com.teambeme.beme.util.recordClickEvent
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class PermissionInfoFragment : Fragment() {
     private var _binding: FragmentPermissionInfoBinding? = null
     private val binding get() = _binding!!

diff --git a/app/src/main/java/com/teambeme/beme/signup/view/SignUpActivity.kt b/app/src/main/java/com/teambeme/beme/signup/view/SignUpActivity.kt
@@ -5,7 +5,9 @@ import com.teambeme.beme.R
 import com.teambeme.beme.base.BindingActivity
 import com.teambeme.beme.databinding.ActivitySignUpBinding
 import com.teambeme.beme.util.StatusBarUtil
+import dagger.hilt.android.AndroidEntryPoint
 
+@AndroidEntryPoint
 class SignUpActivity : BindingActivity<ActivitySignUpBinding>(R.layout.activity_sign_up) {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)