Skip to content

Commit

Permalink
Merge pull request #2 from manimaran96/dev
Browse files Browse the repository at this point in the history 
dev reverse merge
  • Loading branch information
@KanagasabapathyR
KanagasabapathyR committed Mar 5, 2023
2 parents 227fa4d + 4ed2ea3 commit 172c2d3
Show file tree
Hide file tree
Showing 27 changed files with 501 additions and 294 deletions.
5 changes: 4 additions & 1 deletion app/src/main/java/com/manimarank/spell4wiki/data/apis/ApiClient.kt
View file
Expand Up @@ -49,6 +49,7 @@ object ApiClient {
.build()
}


val api: Retrofit
get() {
if (retrofitApi == null) {
Expand All @@ -61,9 +62,11 @@ object ApiClient {
}

private fun getWiktionaryApiUrl(langCode: String): String {
return String.format(Urls.WIKTIONARY, langCode.makeNullIfEmpty() ?: pref?.languageCodeSpell4Wiki)
return String.format(Urls.WIKTIONARY, langCode.makeNullIfEmpty()
?: pref?.languageCodeSpell4WikiAll)
}


private fun getOkHttpClient(context: Context): OkHttpClient {
pref = PrefManager(context)
val okHttpClient = OkHttpClient().newBuilder()
Expand Down
4 changes: 3 additions & 1 deletion app/src/main/java/com/manimarank/spell4wiki/data/model/WikiWordsWithoutAudio.kt
View file
Expand Up @@ -13,7 +13,9 @@ data class WikiWordsWithoutAudio(
@SerializedName("continue")
var offset: OffsetWords? = null,
@SerializedName("query")
var query: QueryWords? = null
var query: QueryWords? = null,
@SerializedName("error")
var error: WikiError? = null
)

/**
Expand Down
45 changes: 18 additions & 27 deletions app/src/main/java/com/manimarank/spell4wiki/data/prefs/PrefManager.kt
View file
Expand Up @@ -4,8 +4,8 @@ import android.app.Activity
import android.content.Context
import android.content.Intent
import android.content.SharedPreferences
import com.manimarank.spell4wiki.ui.login.LoginActivity
import com.manimarank.spell4wiki.data.auth.AccountUtils
import com.manimarank.spell4wiki.ui.login.LoginActivity
import com.manimarank.spell4wiki.utils.WikiLicense
import com.manimarank.spell4wiki.utils.constants.AppConstants

Expand Down Expand Up @@ -91,30 +91,13 @@ class PrefManager(private val mContext: Context?) {
editor.apply()
}

var languageCodeSpell4Wiki: String?
get() = pref.getString(LANGUAGE_CODE_SPELL_4_WIKI, "ta")
set(languageCode) {
editor.putString(LANGUAGE_CODE_SPELL_4_WIKI, languageCode)
editor.apply()
}
var languageCodeSpell4WordList: String?
get() = pref.getString(LANGUAGE_CODE_SPELL_4_WORD_LIST, "ta")
var languageCodeSpell4WikiAll: String?
get() = pref.getString(SPELL_4_WIKI_ALL, "ta")
set(languageCode) {
editor.putString(LANGUAGE_CODE_SPELL_4_WORD_LIST, languageCode)
editor.apply()
}
var languageCodeSpell4Word: String?
get() = pref.getString(LANGUAGE_CODE_SPELL_4_WORD, "ta")
set(languageCode) {
editor.putString(LANGUAGE_CODE_SPELL_4_WORD, languageCode)
editor.apply()
}
var languageCodeWiktionary: String?
get() = pref.getString(LANGUAGE_CODE_WIKTIONARY, "ta")
set(languageCode) {
editor.putString(LANGUAGE_CODE_WIKTIONARY, languageCode)
editor.putString(SPELL_4_WIKI_ALL, languageCode)
editor.apply()
}

var uploadAudioLicense: String?
get() = pref.getString(UPLOAD_AUDIO_LICENSE, WikiLicense.LicensePrefs.CC_0)
set(uploadAudioLicense) {
Expand All @@ -125,10 +108,20 @@ class PrefManager(private val mContext: Context?) {
var runFilterNumberOfWordsToCheck: Int?
get() = pref.getInt(RUN_FILTER_NO_OF_WORDS_TO_CHECK, AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT)
set(noOfWordCount) {
editor.putInt(RUN_FILTER_NO_OF_WORDS_TO_CHECK, noOfWordCount ?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT)
editor.putInt(RUN_FILTER_NO_OF_WORDS_TO_CHECK, noOfWordCount
?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT)
editor.apply()
}

fun getWordsCategoryList(langCode: String?): MutableList<String> {
return (pref.getStringSet(String.format(WORDS_CATEGORY_FOR_LANG, langCode ?: "ta"), null) ?: mutableSetOf()).toMutableList()
}

fun setWordsCategoryList(langCode: String?, categoryList: MutableSet<String>?) {
editor.putStringSet(String.format(WORDS_CATEGORY_FOR_LANG, langCode ?: "ta"), categoryList)
editor.apply()
}

companion object {
// shared pref
private const val PREF_NAME = "spell4wiki_pref"
Expand All @@ -138,12 +131,10 @@ class PrefManager(private val mContext: Context?) {
private const val IS_LOGGED_IN_USER = "is_logged_in_user"
private const val IS_ANONYMOUS_USER = "is_anonymous_user" // Only wiktionary use
private const val IS_FIRST_TIME_LAUNCH = "is_first_time_launch"
private const val LANGUAGE_CODE_SPELL_4_WIKI = "language_code_spell_4_wiki"
private const val LANGUAGE_CODE_SPELL_4_WORD_LIST = "language_code_spell_4_word_list"
private const val LANGUAGE_CODE_SPELL_4_WORD = "language_code_spell_4_word"
private const val LANGUAGE_CODE_WIKTIONARY = "language_code_wiktionary"
private const val SPELL_4_WIKI_ALL = "language_code_spell_4_wiki_all"
private const val UPLOAD_AUDIO_LICENSE = "upload_audio_license"
private const val RUN_FILTER_NO_OF_WORDS_TO_CHECK = "run_filter_no_of_words_to_check"
private const val WORDS_CATEGORY_FOR_LANG = "words_category_for_%s"
private const val CSRF_TOKEN = "csrf_token"
private const val COOKIE = "cookie"
}
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/java/com/manimarank/spell4wiki/ui/dialogs/CommonDialog.kt
View file
Expand Up @@ -22,4 +22,8 @@ object CommonDialog {
dialog.show()
}

fun Activity.openRunFilterInfoDialog() {
openInfoDialog(getString(R.string.run_filter_use) , getString(R.string.run_filter_info))
}

}
15 changes: 3 additions & 12 deletions app/src/main/java/com/manimarank/spell4wiki/ui/languageselector/LanguageSelectionFragment.kt
View file
Expand Up @@ -88,10 +88,7 @@ class LanguageSelectionFragment(private val mActivity: Activity) : BottomSheetDi
val languageSelectionListener = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
when (listMode) {
ListMode.SPELL_4_WIKI -> pref.languageCodeSpell4Wiki = langCode
ListMode.SPELL_4_WORD_LIST -> pref.languageCodeSpell4WordList = langCode
ListMode.SPELL_4_WORD -> pref.languageCodeSpell4Word = langCode
ListMode.WIKTIONARY -> pref.languageCodeWiktionary = langCode
ListMode.SPELL_4_WIKI_ALL -> pref.languageCodeSpell4WikiAll = langCode
ListMode.TEMP -> {
}
}
Expand Down Expand Up @@ -136,21 +133,15 @@ class LanguageSelectionFragment(private val mActivity: Activity) : BottomSheetDi

private val existingLanguageCode: String?
get() = when (listMode) {
ListMode.SPELL_4_WIKI -> pref.languageCodeSpell4Wiki
ListMode.SPELL_4_WORD_LIST -> pref.languageCodeSpell4WordList
ListMode.SPELL_4_WORD -> pref.languageCodeSpell4Word
ListMode.WIKTIONARY -> pref.languageCodeWiktionary
ListMode.SPELL_4_WIKI_ALL -> pref.languageCodeSpell4WikiAll
ListMode.TEMP -> null
else -> null
}
private val subTitleInfo: String?
get() {
var info: String? = null
when (listMode) {
ListMode.SPELL_4_WIKI -> info = getString(R.string.spell4wiktionary)
ListMode.SPELL_4_WORD_LIST -> info = getString(R.string.spell4wordlist)
ListMode.SPELL_4_WORD -> info = getString(R.string.spell4word)
ListMode.WIKTIONARY -> info = getString(R.string.wiktionary)
ListMode.SPELL_4_WIKI_ALL -> info = getString(R.string.spell_4_wiki_all)
ListMode.TEMP -> info = getString(R.string.temporary)
}
if (info != null) {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/manimarank/spell4wiki/ui/recordaudio/RecordAudioActivity.kt
View file
Expand Up @@ -125,7 +125,7 @@ class RecordAudioActivity : BaseActivity() {
wikiLangDao = DBHelper.getInstance(applicationContext).appDatabase.wikiLangDao
wordsHaveAudioDao = DBHelper.getInstance(applicationContext).appDatabase.wordsHaveAudioDao

langCode = intent?.extras?.getString(AppConstants.LANGUAGE_CODE, pref.languageCodeSpell4Wiki)
langCode = intent?.extras?.getString(AppConstants.LANGUAGE_CODE, pref.languageCodeSpell4WikiAll)
word = intent?.extras?.getString(AppConstants.WORD, "")

api = getCommonsApi(applicationContext).create(ApiInterface::class.java)
Expand Down
37 changes: 33 additions & 4 deletions app/src/main/java/com/manimarank/spell4wiki/ui/settings/LanguageSelectionActivity.kt
View file
Expand Up @@ -3,18 +3,23 @@ package com.manimarank.spell4wiki.ui.settings
import android.content.Intent
import android.os.Bundle
import com.manimarank.spell4wiki.R
import com.manimarank.spell4wiki.data.db.DBHelper
import com.manimarank.spell4wiki.data.db.dao.WikiLangDao
import com.manimarank.spell4wiki.data.prefs.PrefManager
import com.manimarank.spell4wiki.ui.appintro.AppIntroActivity
import com.manimarank.spell4wiki.ui.common.BaseActivity
import com.manimarank.spell4wiki.data.prefs.PrefManager
import com.manimarank.spell4wiki.ui.dialogs.AppLanguageDialog
import com.manimarank.spell4wiki.ui.languageselector.LanguageSelectionFragment
import com.manimarank.spell4wiki.ui.listerners.OnLanguageSelectionListener
import com.manimarank.spell4wiki.ui.spell4wiktionary.Spell4Wiktionary
import com.manimarank.spell4wiki.utils.constants.ListMode
import kotlinx.android.synthetic.main.activity_language_selection.*
import kotlinx.android.synthetic.main.bottom_sheet_language_selection.btnAddMyLanguage
import kotlinx.android.synthetic.main.bottom_sheet_language_selection.txtAddLangInfo

class LanguageSelectionActivity : BaseActivity() {

private lateinit var pref: PrefManager

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_language_selection)
Expand All @@ -25,11 +30,35 @@ class LanguageSelectionActivity : BaseActivity() {

btnAddMyLanguage.setOnClickListener { AppLanguageDialog.show(this) }

btnNext.setOnClickListener { openMainActivity() }
btnNext.setOnClickListener {
contributionLang()
}
}
var wikiLangDao: WikiLangDao? = null;
private fun contributionLang() {
wikiLangDao = DBHelper.getInstance(applicationContext).appDatabase.wikiLangDao
setContentView(R.layout.contribution_language_selection)
txtAddLangInfo.text = String.format(getString(R.string.choose_your_preferred_contribution_language), wikiLangDao?.getWikiLanguageWithCode(pref.languageCodeSpell4WikiAll)?.name ?: "")

btnAddMyLanguage.setOnClickListener { loadLanguages() }

btnNext.setOnClickListener {
openMainActivity()
}
}

private fun loadLanguages() {
val callback = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
txtAddLangInfo.text = String.format(getString(R.string.choose_your_preferred_contribution_language), wikiLangDao?.getWikiLanguageWithCode(pref.languageCodeSpell4WikiAll)?.name ?: "")
}
}
val languageSelectionFragment = LanguageSelectionFragment(this)
languageSelectionFragment.init(callback, ListMode.SPELL_4_WIKI_ALL)
languageSelectionFragment.show(supportFragmentManager)
}
private fun openMainActivity() {
startActivity(Intent(applicationContext, AppIntroActivity::class.java))
finish()
}
}
}
54 changes: 13 additions & 41 deletions app/src/main/java/com/manimarank/spell4wiki/ui/settings/SettingsActivity.kt
View file
Expand Up @@ -45,54 +45,22 @@ class SettingsActivity : BaseActivity() {
if (pref.isAnonymous == true) {
txtTitleLicense.makeGone()
layoutSpell4WikiLang.makeGone()
layoutSpell4WordListLang.makeGone()
layoutSpell4WordLang.makeGone()
layoutLicenseOfUploadAudio.makeGone()
layoutRunFilter.makeGone()
}
updateLanguageView(txtSpell4WikiLang, pref.languageCodeSpell4Wiki)
updateLanguageView(txtSpell4WordListLang, pref.languageCodeSpell4WordList)
updateLanguageView(txtSpell4WordLang, pref.languageCodeSpell4Word)
updateLanguageView(txtWiktionaryLang, pref.languageCodeWiktionary)
updateLanguageView(txtSpell4WikiLang, pref.languageCodeSpell4WikiAll)
layoutSpell4WikiLang.setOnClickListener {
val callback = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
updateLanguageView(txtSpell4WikiLang, pref.languageCodeSpell4Wiki)
updateLanguageView(txtSpell4WikiLang, pref.languageCodeSpell4WikiAll)
}
}
val languageSelectionFragment = LanguageSelectionFragment(this)
languageSelectionFragment.init(callback, ListMode.SPELL_4_WIKI)
languageSelectionFragment.show(supportFragmentManager)
}
layoutSpell4WordListLang.setOnClickListener {
val callback = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
updateLanguageView(txtSpell4WordListLang, pref.languageCodeSpell4WordList)
}
}
val languageSelectionFragment = LanguageSelectionFragment(this)
languageSelectionFragment.init(callback, ListMode.SPELL_4_WORD_LIST)
languageSelectionFragment.show(supportFragmentManager)
}
layoutSpell4WordLang.setOnClickListener {
val callback = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
updateLanguageView(txtSpell4WordLang, pref.languageCodeSpell4Word)
}
}
val languageSelectionFragment = LanguageSelectionFragment(this)
languageSelectionFragment.init(callback, ListMode.SPELL_4_WORD)
languageSelectionFragment.show(supportFragmentManager)
}
layoutWiktionaryLang.setOnClickListener {
val callback = object : OnLanguageSelectionListener {
override fun onCallBackListener(langCode: String?) {
updateLanguageView(txtWiktionaryLang, pref.languageCodeWiktionary)
}
}
val languageSelectionFragment = LanguageSelectionFragment(this)
languageSelectionFragment.init(callback, ListMode.WIKTIONARY)
languageSelectionFragment.init(callback, ListMode.SPELL_4_WIKI_ALL)
languageSelectionFragment.show(supportFragmentManager)
}


updateLicenseView(txtLicenseOfUploadAudio, txtLicenseOfUploadAudioLegalCode)


Expand All @@ -105,10 +73,14 @@ class SettingsActivity : BaseActivity() {
txtAppLanguage.text = getSelectedLanguage()
layoutLanguageOfApp.setOnClickListener { show(this@SettingsActivity) }

txtRfCount.text = getString(R.string.run_filter_settings_count, pref.runFilterNumberOfWordsToCheck ?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT)
seekBarRunFilterCount.progress = pref.runFilterNumberOfWordsToCheck ?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT
txtRfCount.text = getString(R.string.run_filter_settings_count, pref.runFilterNumberOfWordsToCheck
?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT)
seekBarRunFilterCount.progress = pref.runFilterNumberOfWordsToCheck
?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT
seekBarRunFilterCount.setOnSeekBarChangeListener(object : SeekBar.OnSeekBarChangeListener {
var finalProgress = pref.runFilterNumberOfWordsToCheck ?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT
var finalProgress = pref.runFilterNumberOfWordsToCheck
?: AppConstants.RUN_FILTER_NO_OF_WORDS_CHECK_COUNT

override fun onProgressChanged(p0: SeekBar?, progress: Int, p2: Boolean) {
finalProgress = if (progress <= 0) 1 else progress
txtRfCount.text = getString(R.string.run_filter_settings_count, finalProgress)
Expand Down
5 changes: 1 addition & 4 deletions app/src/main/java/com/manimarank/spell4wiki/ui/spell4wiktionary/EndlessRecyclerAdapter.kt
View file
Expand Up @@ -168,10 +168,7 @@ class EndlessRecyclerAdapter(

private val languageCode: String?
get() = when (mode) {
ListMode.SPELL_4_WIKI -> pref.languageCodeSpell4Wiki
ListMode.SPELL_4_WORD_LIST -> pref.languageCodeSpell4WordList
ListMode.SPELL_4_WORD -> pref.languageCodeSpell4Word
ListMode.WIKTIONARY -> pref.languageCodeWiktionary
ListMode.SPELL_4_WIKI_ALL -> pref.languageCodeSpell4WikiAll
ListMode.TEMP -> null
else -> null
}
Expand Down

0 comments on commit 172c2d3

Please sign in to comment.