@@ -29,7 +29,6 @@ import android.widget.*
29
29
import androidx.fragment.app.Fragment
30
30
import androidx.fragment.app.viewModels
31
31
import androidx.recyclerview.widget.RecyclerView
32
- import com.google.android.material.progressindicator.LinearProgressIndicator
33
32
import com.google.android.material.textfield.MaterialAutoCompleteTextView
34
33
import com.google.android.material.textfield.TextInputLayout
35
34
import kotlin.collections.ArrayList
@@ -68,7 +67,9 @@ class LettersTabFragment: Fragment() {
68
67
super .onViewCreated(view, savedInstanceState)
69
68
logDebug(logTag, " onViewCreated" )
70
69
71
- logDebug(logTag, " Letters category wise: ${viewModel.transliterator.languageData.lettersCategoryWise} " )
70
+ // Initialise the transliterator
71
+ viewModel.transliterator = Transliterator (requireContext())
72
+ logDebug(logTag, " Letters category wise: ${viewModel.transliterator!! .languageData.lettersCategoryWise} " )
72
73
letterCategoryListView = view.findViewById(R .id.letter_categories)!!
73
74
languageSelector = view.findViewById(R .id.language_selector)
74
75
convertToSelector = view.findViewById(R .id.convert_to_selector)
@@ -80,8 +81,9 @@ class LettersTabFragment: Fragment() {
80
81
view.findViewById<View >(R .id.lettersTabInfoButton).setOnClickListener { v: View ? ->
81
82
logDebug(logTag, " Info button clicked!" )
82
83
logDebug(logTag,
83
- " Fetching info for transliterating ${viewModel.transliterator.languageData.language} to ${viewModel.targetLanguage} " )
84
- val info: HashMap <String , Map <String , String >> = viewModel.transliterator.languageData.info
84
+ " Fetching info for transliterating ${viewModel.transliterator!! .languageData.language} " +
85
+ " to ${viewModel.targetLanguage} " )
86
+ val info: HashMap <String , Map <String , String >> = viewModel.transliterator!! .languageData.info
85
87
logDebug(logTag, " Data for info: $info " )
86
88
val lif = LanguageInfoFragment .newInstance(
87
89
info[" general" ]?.get(" en" ) + info[viewModel.targetLanguage.lowercase()]?.get(" en" ))
@@ -90,15 +92,14 @@ class LettersTabFragment: Fragment() {
90
92
91
93
val categoryListViewAdapter = LetterCategoryAdapter (
92
94
viewModel.getLanguageData().lettersCategoryWise,
93
- viewModel.transliterator,
95
+ viewModel.transliterator!! ,
94
96
viewModel.targetLanguage,
95
97
)
96
98
letterCategoryListView.adapter = categoryListViewAdapter
97
- categoryListViewAdapter.submitList(viewModel.transliterator.languageData.categories)
99
+ categoryListViewAdapter.submitList(viewModel.transliterator!! .languageData.categories)
98
100
99
101
logDebug(logTag, " Setting up observers for view model data" )
100
102
initObservers(view)
101
- view.findViewById<LinearProgressIndicator >(R .id.progress_indicator).visibility = View .GONE
102
103
}
103
104
104
105
// Return an empty array list if we could not find any
@@ -123,7 +124,7 @@ class LettersTabFragment: Fragment() {
123
124
languageListAdapter.setNotifyOnChange(true )
124
125
125
126
languageTextView?.setAdapter(languageListAdapter)
126
- val upperCasedLanguage = viewModel.transliterator.getLanguage().replaceFirstChar {
127
+ val upperCasedLanguage = viewModel.transliterator!! .getLanguage().replaceFirstChar {
127
128
if (it.isLowerCase())
128
129
it.titlecase()
129
130
else
@@ -215,7 +216,7 @@ class LettersTabFragment: Fragment() {
215
216
(letterCategoryListView.adapter as LetterCategoryAdapter ).apply {
216
217
setLettersCategoryWise(viewModel.getLanguageData().lettersCategoryWise)
217
218
updateTargetLanguage(viewModel.targetLanguage)
218
- updateTransliterator(viewModel.transliterator)
219
+ updateTransliterator(viewModel.transliterator!! )
219
220
logDebug(logTag, " LetterCategoryAdapter Inspection: \n " +
220
221
" Item count: ${itemCount} \n " +
221
222
" Current List: ${currentList} " )
@@ -240,7 +241,5 @@ class LettersTabFragment: Fragment() {
240
241
adapter.updateLetterGrids(letterCategoryListView)
241
242
}
242
243
}
243
-
244
-
245
244
}
246
245
}
0 commit comments