Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 81792b36 by Paktalin
Options

Refactoring in FirestoreManager

parent f3574940
Inline Side-by-side
Showing with 71 additions and 55 deletions
.idea/dictionaries/Paktalin.xml 0 → 100644
<component name="ProjectDictionaryState">
<dictionary name="Paktalin">
<words>
<w>firebase</w>
<w>firestore</w>
</words>
</dictionary>
</component>
\ No newline at end of file
app/src/main/java/com/paktalin/vocabularynotebook/firestoreitems/Vocabulary.kt
...@@ -7,9 +7,6 @@ class Vocabulary(words: MutableList<WordItem>) { ...@@ -7,9 +7,6 @@ class Vocabulary(words: MutableList<WordItem>) {
private const val SORT_BY_TIME = 0 private const val SORT_BY_TIME = 0
private const val SORT_BY_WORD = 1 private const val SORT_BY_WORD = 1
private const val SORT_BY_TRANSLATION = 2 private const val SORT_BY_TRANSLATION = 2
const val WORDS = "words"
const val VOCABULARIES = "vocabularies"
} }
var pojo:Pojo var pojo:Pojo
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/LogInActivity.kt
...@@ -67,7 +67,7 @@ class LogInActivity : AppCompatActivity() { ...@@ -67,7 +67,7 @@ class LogInActivity : AppCompatActivity() {
private fun createRandomUser() { private fun createRandomUser() {
etEmail.setText("random@gmail.com") etEmail.setText("random@gmail.com")
etPassword.setText("123456") etPassword.setText("123456")
processUser { com.paktalin.vocabularynotebook.utils.signUp(this@LogInActivity, email!!, password!!) } processUser { signUp(this@LogInActivity, email!!, password!!) }
} }
companion object { private val TAG = "VN/" + LogInActivity::class.simpleName } companion object { private val TAG = "VN/" + LogInActivity::class.simpleName }
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
...@@ -2,10 +2,8 @@ package com.paktalin.vocabularynotebook.ui.activities ...@@ -2,10 +2,8 @@ package com.paktalin.vocabularynotebook.ui.activities
import android.os.Bundle import android.os.Bundle
import android.support.v7.app.AppCompatActivity import android.support.v7.app.AppCompatActivity
import android.util.Log
import kotlinx.android.synthetic.main.activity_main.* import kotlinx.android.synthetic.main.activity_main.*
import android.view.WindowManager
import android.app.Activity import android.app.Activity
import android.view.Menu import android.view.Menu
import android.view.MenuItem import android.view.MenuItem
...@@ -13,12 +11,10 @@ import android.view.View ...@@ -13,12 +11,10 @@ import android.view.View
import android.view.inputmethod.InputMethodManager import android.view.inputmethod.InputMethodManager
import kotlinx.android.synthetic.main.fragment_vocabulary.* import kotlinx.android.synthetic.main.fragment_vocabulary.*
import android.support.v7.widget.SearchView import android.support.v7.widget.SearchView
import android.view.WindowManager
import com.paktalin.vocabularynotebook.* import com.paktalin.vocabularynotebook.*
import com.paktalin.vocabularynotebook.ui.fragments.VocabularyFragment import com.paktalin.vocabularynotebook.ui.fragments.VocabularyFragment
import com.paktalin.vocabularynotebook.utils.addFragment import com.paktalin.vocabularynotebook.utils.*
import com.paktalin.vocabularynotebook.utils.extractVocabularyData
import com.paktalin.vocabularynotebook.utils.shortToast
import com.paktalin.vocabularynotebook.utils.startActivity
class MainActivity : AppCompatActivity() { class MainActivity : AppCompatActivity() {
...@@ -64,7 +60,7 @@ class MainActivity : AppCompatActivity() { ...@@ -64,7 +60,7 @@ class MainActivity : AppCompatActivity() {
private fun extractVocabularyData() { private fun extractVocabularyData() {
addProgressBar() addProgressBar()
extractVocabularyData( FirestoreManager().extractVocabularyData(
{ id-> addVocabularyFragment(id) }, { id-> addVocabularyFragment(id) },
{ showToastNoWords() }, { showToastNoWords() },
{ removeProgressBar() }) { removeProgressBar() })
......
app/src/main/java/com/paktalin/vocabularynotebook/utils/FirestoreManager.kt
...@@ -12,53 +12,66 @@ import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary ...@@ -12,53 +12,66 @@ import com.paktalin.vocabularynotebook.firestoreitems.Vocabulary
import com.paktalin.vocabularynotebook.ui.activities.LogInActivity import com.paktalin.vocabularynotebook.ui.activities.LogInActivity
import java.util.* import java.util.*
private const val USERS = "users" class FirestoreManager {
private const val TAG = "VN/FirestoreManager"
fun extractVocabularyData(onSuccess: (vocabularyId: String) -> Unit, private val db: FirebaseFirestore = ConfiguredFirestore.instance
showToastNoWords: () -> Unit, removeProgressBar: () -> Unit) {
val userId = FirebaseAuth.getInstance()!!.currentUser!!.uid
val db = ConfiguredFirestore.instance
val userDocument = db.collection(USERS).document(userId) fun extractVocabularyData(onSuccess: (vocabularyId: String) -> Unit,
userDocument.get() showToastNoWords: () -> Unit, removeProgressBar: () -> Unit) {
.addOnSuccessListener { task -> val userId = FirebaseAuth.getInstance()!!.currentUser!!.uid
removeProgressBar() userDocument(userId).get()
if (task.get(Vocabulary.VOCABULARIES) != null) { .addOnSuccessListener { task ->
val vocabularyId = retrieveVocabularyID(task, db) removeProgressBar()
onSuccess(vocabularyId) if (task.get(VOCABULARIES) != null) {
} else { val vocabularyId = retrieveVocabularyID(task, db)
Log.w(TAG, "There's no collection \"vocabularies\"") onSuccess(vocabularyId)
showToastNoWords() } } } else {
} Log.w(TAG, "There's no collection \"vocabularies\"")
showToastNoWords() } }
}
private fun retrieveVocabularyID(task: DocumentSnapshot, db: FirebaseFirestore): String { fun addNewUserToDb(firebaseUser: FirebaseUser, logInActivity: LogInActivity) {
val vocabularies: List<DocumentReference> = task.get(Vocabulary.VOCABULARIES) as List<DocumentReference> //todo add condition to writing to the db in Firebase Console (request.auth.uid)
val vocabulary = db.collection(Vocabulary.VOCABULARIES).document(vocabularies[0].id) db.collection(VOCABULARIES).add(Vocabulary.Pojo(null))
return vocabulary.id .addOnSuccessListener { firstVocabularyRef ->
} Log.d(TAG, "VocabularyPojo successfully created: " + firstVocabularyRef.path)
setNewUserWithVocabularyData(firebaseUser, firstVocabularyRef, logInActivity)
}
.addOnFailureListener {
Log.w(TAG, "Couldn't add user to the database", it.cause)
deleteUser(firebaseUser)
}
}
fun addNewUserToDb(newUser: FirebaseUser, logInActivity: LogInActivity) { private fun userDocument(userId: String): DocumentReference {
//todo add condition to writing to the db in Firebase Console (request.auth.uid) return db.collection(USERS).document(userId)
val db = ConfiguredFirestore.instance }
val user = UserPojo(newUser.email)
db.collection(Vocabulary.VOCABULARIES).add(Vocabulary.Pojo(null)) private fun setNewUserWithVocabularyData(firebaseUser: FirebaseUser,
.addOnSuccessListener { firstVocabularyRef -> firstVocabularyRef: DocumentReference,
Log.d(TAG, "VocabularyPojo successfully created: " + firstVocabularyRef.path) logInActivity: LogInActivity) {
user.vocabularies = Collections.singletonList(firstVocabularyRef) val user = UserPojo(firebaseUser.email)
user.vocabularies = Collections.singletonList(firstVocabularyRef)
userDocument(firebaseUser.uid).set(user)
.addOnSuccessListener {
Log.i(TAG, "Successfully added user to the collection")
logInActivity.startUserActivity()
}
.addOnFailureListener { exception ->
Log.w(TAG, "addUser:failure", exception)
}
}
db.collection("users").document(newUser.uid).set(user) private fun retrieveVocabularyID(task: DocumentSnapshot, db: FirebaseFirestore): String {
.addOnCompleteListener { task -> val vocabularies: List<DocumentReference> = task.get(VOCABULARIES) as List<DocumentReference>
if (task.isSuccessful) { val vocabulary = db.collection(VOCABULARIES).document(vocabularies[0].id)
Log.i(TAG, "Successfully added user to the collection") return vocabulary.id
logInActivity.startUserActivity() }
} else Log.w(TAG, "addUser:failure", task.exception)
}
}
.addOnFailureListener {
Log.w(TAG, "Couldn't add user to the database", it.cause)
deleteUser(newUser)
}
}
companion object {
private const val USERS = "users"
private const val WORDS = "words"
private const val VOCABULARIES = "vocabularies"
private const val TAG = "VN/FirestoreManager"
}
}
\ No newline at end of file
app/src/main/java/com/paktalin/vocabularynotebook/utils/UserManager.kt
...@@ -33,7 +33,7 @@ fun signUp(activity: LogInActivity, email: String, password: String) { ...@@ -33,7 +33,7 @@ fun signUp(activity: LogInActivity, email: String, password: String) {
.addOnCompleteListener { removeProgressBar(activity.supportFragmentManager) } .addOnCompleteListener { removeProgressBar(activity.supportFragmentManager) }
.addOnSuccessListener { .addOnSuccessListener {
Log.d(TAG, "Successfully signed up a new user") Log.d(TAG, "Successfully signed up a new user")
addNewUserToDb(mAuth!!.currentUser!!, activity) FirestoreManager().addNewUserToDb(mAuth!!.currentUser!!, activity)
activity.login() activity.login()
} }
.addOnFailureListener { .addOnFailureListener {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment