Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 2027d343 by Paktalin
Options

package refactoring

parent 38842264
Inline Side-by-side
Showing with 36 additions and 25 deletions
app/src/main/java/com/paktalin/vocabularynotebook/firestoreitems/UserPojo.kt → app/src/main/java/com/paktalin/vocabularynotebook/entities/UserPojo.kt
package com.paktalin.vocabularynotebook.firestoreitems package com.paktalin.vocabularynotebook.entities
import com.google.firebase.firestore.DocumentReference import com.google.firebase.firestore.DocumentReference
......
app/src/main/java/com/paktalin/vocabularynotebook/firestoreitems/VocabularyPojo.kt → app/src/main/java/com/paktalin/vocabularynotebook/entities/VocabularyPojo.kt
package com.paktalin.vocabularynotebook.firestoreitems package com.paktalin.vocabularynotebook.entities
class VocabularyPojo(var title:String?) { class VocabularyPojo(var title:String?) {
init { init {
......
app/src/main/java/com/paktalin/vocabularynotebook/firestoreitems/WordPojo.kt → app/src/main/java/com/paktalin/vocabularynotebook/entities/WordPojo.kt
package com.paktalin.vocabularynotebook.firestoreitems package com.paktalin.vocabularynotebook.entities
import java.io.Serializable import java.io.Serializable
import java.util.* import java.util.*
......
app/src/main/java/com/paktalin/vocabularynotebook/utils/FirestoreManager.kt → app/src/main/java/com/paktalin/vocabularynotebook/firestore/FirestoreManager.kt
package com.paktalin.vocabularynotebook.utils package com.paktalin.vocabularynotebook.firestore
import android.content.Context import android.content.Context
import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.FirebaseUser
import com.google.firebase.firestore.* import com.google.firebase.firestore.*
import com.paktalin.vocabularynotebook.appsetup.ConfiguredFirestore import com.paktalin.vocabularynotebook.appsetup.ConfiguredFirestore
import com.paktalin.vocabularynotebook.firestoreitems.UserPojo import com.paktalin.vocabularynotebook.entities.UserPojo
import com.paktalin.vocabularynotebook.firestoreitems.VocabularyPojo import com.paktalin.vocabularynotebook.entities.VocabularyPojo
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.ui.activities.LogInActivity import com.paktalin.vocabularynotebook.ui.activities.LogInActivity
import com.paktalin.vocabularynotebook.utils.Log
import com.paktalin.vocabularynotebook.utils.saveVocabularyId
import com.paktalin.vocabularynotebook.vocabulary.ModifiedVocabulary.Label import com.paktalin.vocabularynotebook.vocabulary.ModifiedVocabulary.Label
import java.util.* import java.util.*
......
app/src/main/java/com/paktalin/vocabularynotebook/utils/UserManager.kt → app/src/main/java/com/paktalin/vocabularynotebook/firestore/UserManager.kt
package com.paktalin.vocabularynotebook.utils package com.paktalin.vocabularynotebook.firestore
import android.util.Patterns import android.util.Patterns
import com.google.firebase.auth.FirebaseAuth import com.google.firebase.auth.FirebaseAuth
import com.google.firebase.auth.FirebaseUser import com.google.firebase.auth.FirebaseUser
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
import com.paktalin.vocabularynotebook.ui.activities.LogInActivity import com.paktalin.vocabularynotebook.ui.activities.LogInActivity
import com.paktalin.vocabularynotebook.utils.Log
import com.paktalin.vocabularynotebook.utils.removeProgressBar
import com.paktalin.vocabularynotebook.utils.shortToast
private const val TAG = "VN/UserManager" private const val TAG = "VN/UserManager"
private var mAuth: FirebaseAuth? = FirebaseAuth.getInstance() private var mAuth: FirebaseAuth? = FirebaseAuth.getInstance()
...@@ -12,7 +15,7 @@ private var mAuth: FirebaseAuth? = FirebaseAuth.getInstance() ...@@ -12,7 +15,7 @@ private var mAuth: FirebaseAuth? = FirebaseAuth.getInstance()
fun mDeleteUser(user: FirebaseUser) { fun mDeleteUser(user: FirebaseUser) {
user.delete() user.delete()
.addOnSuccessListener { Log.i(TAG, "UserPojo was successfully deleted") } .addOnSuccessListener { Log.i(TAG, "UserPojo was successfully deleted") }
.addOnFailureListener { Log.i(TAG, "mDeleteUser:failure", it.cause)} .addOnFailureListener { Log.i(TAG, "mDeleteUser:failure", it.cause) }
} }
fun mLogIn(onComplete: () -> Unit, onSuccess: () -> Unit, onFailure: () -> Unit, fun mLogIn(onComplete: () -> Unit, onSuccess: () -> Unit, onFailure: () -> Unit,
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/LogInActivity.kt
package com.paktalin.vocabularynotebook.ui.activities package com.paktalin.vocabularynotebook.ui.activities
import androidx.appcompat.app.AppCompatActivity
import android.os.Bundle import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import com.paktalin.vocabularynotebook.* import com.paktalin.vocabularynotebook.R
import com.paktalin.vocabularynotebook.firestore.mLogIn
import com.paktalin.vocabularynotebook.firestore.mSignUp
import com.paktalin.vocabularynotebook.firestore.mUserLoggedIn
import com.paktalin.vocabularynotebook.utils.* import com.paktalin.vocabularynotebook.utils.*
import kotlinx.android.synthetic.main.activity_log_in.* import kotlinx.android.synthetic.main.activity_log_in.*
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/activities/MainActivity.kt
...@@ -11,6 +11,8 @@ import androidx.appcompat.app.AppCompatActivity ...@@ -11,6 +11,8 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.widget.SearchView import androidx.appcompat.widget.SearchView
import androidx.recyclerview.selection.Selection import androidx.recyclerview.selection.Selection
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
import com.paktalin.vocabularynotebook.firestore.FirestoreManager
import com.paktalin.vocabularynotebook.firestore.mLogOut
import com.paktalin.vocabularynotebook.ui.fragments.SubmitAddedFragment import com.paktalin.vocabularynotebook.ui.fragments.SubmitAddedFragment
import com.paktalin.vocabularynotebook.ui.fragments.TagFragment import com.paktalin.vocabularynotebook.ui.fragments.TagFragment
import com.paktalin.vocabularynotebook.ui.recycler_view.State import com.paktalin.vocabularynotebook.ui.recycler_view.State
...@@ -153,7 +155,7 @@ class MainActivity : AppCompatActivity() { ...@@ -153,7 +155,7 @@ class MainActivity : AppCompatActivity() {
super.onPause() super.onPause()
hideKeyboard() hideKeyboard()
try { try {
vocabularyAdapter?.getModifiedWords()?.let { FirestoreManager().saveWords(it) } FirestoreManager().saveWords(vocabularyAdapter?.getModifiedWords()!!)
} catch (ignored: Exception) { } catch (ignored: Exception) {
} }
} }
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/SubmitAddedFragment.kt
package com.paktalin.vocabularynotebook.ui.fragments package com.paktalin.vocabularynotebook.ui.fragments
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.ui.recycler_view.State import com.paktalin.vocabularynotebook.ui.recycler_view.State
import com.paktalin.vocabularynotebook.utils.removeFragment import com.paktalin.vocabularynotebook.utils.removeFragment
import kotlinx.android.synthetic.main.word_item.* import kotlinx.android.synthetic.main.word_item.*
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/fragments/SubmitEditedFragment.kt
...@@ -2,7 +2,7 @@ package com.paktalin.vocabularynotebook.ui.fragments ...@@ -2,7 +2,7 @@ package com.paktalin.vocabularynotebook.ui.fragments
import android.view.View import android.view.View
import android.widget.EditText import android.widget.EditText
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.ui.recycler_view.State import com.paktalin.vocabularynotebook.ui.recycler_view.State
import com.paktalin.vocabularynotebook.ui.views.LockableLayoutManager import com.paktalin.vocabularynotebook.ui.views.LockableLayoutManager
import com.paktalin.vocabularynotebook.utils.gone import com.paktalin.vocabularynotebook.utils.gone
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/recycler_view/ViewHolder.kt
...@@ -4,7 +4,7 @@ import android.view.View ...@@ -4,7 +4,7 @@ import android.view.View
import android.widget.EditText import android.widget.EditText
import androidx.recyclerview.selection.ItemDetailsLookup import androidx.recyclerview.selection.ItemDetailsLookup
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.utils.visible import com.paktalin.vocabularynotebook.utils.visible
import kotlinx.android.synthetic.main.word_item.view.* import kotlinx.android.synthetic.main.word_item.view.*
......
app/src/main/java/com/paktalin/vocabularynotebook/ui/recycler_view/VocabularyAdapter.kt
...@@ -6,13 +6,14 @@ import android.view.ViewGroup ...@@ -6,13 +6,14 @@ import android.view.ViewGroup
import androidx.appcompat.widget.PopupMenu import androidx.appcompat.widget.PopupMenu
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.ui.activities.MainActivity import com.paktalin.vocabularynotebook.ui.activities.MainActivity
import com.paktalin.vocabularynotebook.ui.fragments.SubmitEditedFragment import com.paktalin.vocabularynotebook.ui.fragments.SubmitEditedFragment
import com.paktalin.vocabularynotebook.ui.recycler_view.selection_tracker.MySelectionTracker import com.paktalin.vocabularynotebook.ui.recycler_view.selection_tracker.MySelectionTracker
import com.paktalin.vocabularynotebook.utils.addSubmitFragment import com.paktalin.vocabularynotebook.utils.addSubmitFragment
import com.paktalin.vocabularynotebook.utils.gone import com.paktalin.vocabularynotebook.utils.gone
import com.paktalin.vocabularynotebook.utils.visible import com.paktalin.vocabularynotebook.utils.visible
import com.paktalin.vocabularynotebook.vocabulary.ModifiedVocabulary
import com.paktalin.vocabularynotebook.vocabulary.Sort import com.paktalin.vocabularynotebook.vocabulary.Sort
import com.paktalin.vocabularynotebook.vocabulary.VocabSet import com.paktalin.vocabularynotebook.vocabulary.VocabSet
import kotlinx.android.synthetic.main.word_item.* import kotlinx.android.synthetic.main.word_item.*
...@@ -89,7 +90,7 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi ...@@ -89,7 +90,7 @@ class VocabularyAdapter(private val vocabulary: VocabSet, private val mainActivi
notifyDataSetChanged() notifyDataSetChanged()
} }
fun getModifiedWords(): MutableMap<WordPojo, Boolean> { fun getModifiedWords(): MutableMap<ModifiedVocabulary.Label, MutableList<WordPojo>> {
return vocabulary.getModified() return vocabulary.getModified()
} }
......
app/src/main/java/com/paktalin/vocabularynotebook/utils/ActivityUtil.kt
...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity ...@@ -10,6 +10,7 @@ import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentManager
import com.paktalin.vocabularynotebook.R import com.paktalin.vocabularynotebook.R
import com.paktalin.vocabularynotebook.firestore.isEmail
import com.paktalin.vocabularynotebook.ui.fragments.ProgressFragment import com.paktalin.vocabularynotebook.ui.fragments.ProgressFragment
import com.paktalin.vocabularynotebook.ui.fragments.SubmitFragment import com.paktalin.vocabularynotebook.ui.fragments.SubmitFragment
import org.apache.commons.lang3.StringUtils import org.apache.commons.lang3.StringUtils
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/BasicVocabulary.kt
package com.paktalin.vocabularynotebook.vocabulary package com.paktalin.vocabularynotebook.vocabulary
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
open class BasicVocabulary(var wordList: MutableList<WordPojo>): Vocabulary { open class BasicVocabulary(var wordList: MutableList<WordPojo>): Vocabulary {
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/DisplayedVocabulary.kt
package com.paktalin.vocabularynotebook.vocabulary package com.paktalin.vocabularynotebook.vocabulary
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
class DisplayedVocabulary(wordList: MutableList<WordPojo>): BasicVocabulary(wordList) { class DisplayedVocabulary(wordList: MutableList<WordPojo>): BasicVocabulary(wordList) {
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/ModifiedVocabulary.kt
package com.paktalin.vocabularynotebook.vocabulary package com.paktalin.vocabularynotebook.vocabulary
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import com.paktalin.vocabularynotebook.utils.FirestoreManager import com.paktalin.vocabularynotebook.firestore.FirestoreManager
class ModifiedVocabulary : Vocabulary { class ModifiedVocabulary : Vocabulary {
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/VocabSet.kt
...@@ -4,7 +4,7 @@ import android.graphics.Color ...@@ -4,7 +4,7 @@ import android.graphics.Color
import com.google.firebase.Timestamp import com.google.firebase.Timestamp
import com.google.firebase.firestore.QueryDocumentSnapshot import com.google.firebase.firestore.QueryDocumentSnapshot
import com.google.firebase.firestore.QuerySnapshot import com.google.firebase.firestore.QuerySnapshot
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
import java.util.* import java.util.*
class VocabSet(var wordList: MutableList<WordPojo>) : Vocabulary { class VocabSet(var wordList: MutableList<WordPojo>) : Vocabulary {
...@@ -82,7 +82,7 @@ class VocabSet(var wordList: MutableList<WordPojo>) : Vocabulary { ...@@ -82,7 +82,7 @@ class VocabSet(var wordList: MutableList<WordPojo>) : Vocabulary {
return displayedVocabulary.size() return displayedVocabulary.size()
} }
fun getModified(): MutableMap<WordPojo, Boolean> { fun getModified(): MutableMap<ModifiedVocabulary.Label, MutableList<WordPojo>> {
return modifiedVocabulary.get() return modifiedVocabulary.get()
} }
......
app/src/main/java/com/paktalin/vocabularynotebook/vocabulary/Vocabulary.kt
package com.paktalin.vocabularynotebook.vocabulary package com.paktalin.vocabularynotebook.vocabulary
import com.paktalin.vocabularynotebook.firestoreitems.WordPojo import com.paktalin.vocabularynotebook.entities.WordPojo
interface Vocabulary { interface Vocabulary {
......
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