[go: nahoru, domu]
Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not merge - Only here to trigger CI on PR - https://github.com/wordpress-mobile/WordPress-Android/pull/20980 #20994

Merged
merged 6 commits into from
Jun 20, 2024
Merged

Do not merge - Only here to trigger CI on PR - https://github.com/wordpress-mobile/WordPress-Android/pull/20980 #20994

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4751a1c
Rename .java to .kt
neeldoshii Jun 13, 2024
31f4802
AddCategoryFragment converted to kotlin
neeldoshii Jun 13, 2024
0ebd5d5
Replaced !! to ? and Refactored : naming convention
neeldoshii Jun 13, 2024
2ac2694
Refactored hungarion notation to kotlin style, and replaced bang noti…
neeldoshii Jun 18, 2024
4cf519e
Remove !! from loadCategories() function
neeldoshii Jun 19, 2024
c430146
Merge branch 'wordpress-mobile:trunk' into UI-Enhancement-`AddCategor…
neeldoshii Jun 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Refactored hungarion notation to kotlin style, and replaced bang noti… 
…on to ?
  • Loading branch information
@neeldoshii
neeldoshii committed Jun 18, 2024
commit 2ac2694a74b8adc36c5383ade9002a0f12cee35b
35 changes: 19 additions & 16 deletions WordPress/src/main/java/org/wordpress/android/ui/posts/AddCategoryFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,16 @@ import org.wordpress.android.fluxc.model.TermModel
import org.wordpress.android.fluxc.store.TaxonomyStore
import org.wordpress.android.models.CategoryNode
import org.wordpress.android.util.ToastUtils
import org.wordpress.android.util.extensions.getSerializableCompat
import org.wordpress.android.util.extensions.getSerializableExtraCompat
import javax.inject.Inject

class AddCategoryFragment : AppCompatDialogFragment() {
private var site: SiteModel? = null
private var binding: AddCategoryBinding? = null

@set:Inject
var mTaxonomyStore: TaxonomyStore? = null
var taxonomyStore: TaxonomyStore? = null

override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
(requireActivity().application as WordPress).component().inject(this)
Expand All @@ -31,7 +33,7 @@ class AddCategoryFragment : AppCompatDialogFragment() {
MaterialAlertDialogBuilder(ContextThemeWrapper(activity, R.style.PostSettingsTheme))
binding = AddCategoryBinding.inflate(layoutInflater, null, false)
loadCategories()
builder.setView(binding!!.root)
builder.setView(binding?.root)
.setPositiveButton(android.R.string.ok, null)
.setNegativeButton(android.R.string.cancel, null)

Expand All @@ -48,16 +50,15 @@ class AddCategoryFragment : AppCompatDialogFragment() {
}
}

@Suppress("Deprecation")
private fun initSite(savedInstanceState: Bundle?) {
site = if (savedInstanceState == null) {
if (arguments != null) {
requireArguments().getSerializable(WordPress.SITE) as SiteModel?
requireArguments().getSerializableCompat(WordPress.SITE) as SiteModel?
} else {
requireActivity().intent.getSerializableExtra(WordPress.SITE) as SiteModel?
requireActivity().intent.getSerializableExtraCompat(WordPress.SITE) as SiteModel?
}
} else {
savedInstanceState.getSerializable(WordPress.SITE) as SiteModel?
savedInstanceState.getSerializableCompat(WordPress.SITE) as SiteModel?
}

if (site == null) {
Expand All @@ -72,26 +73,28 @@ class AddCategoryFragment : AppCompatDialogFragment() {

private fun addCategory(): Boolean {
val categoryName = binding?.categoryName?.text.toString()
val selectedCategory = binding?.parentCategory?.selectedItem as CategoryNode
val parentId = selectedCategory.categoryId
val selectedCategory = binding?.parentCategory?.selectedItem as? CategoryNode
val parentId = selectedCategory?.categoryId

if (categoryName.replace(" ".toRegex(), "") == "") {
binding!!.categoryName.error = getText(R.string.cat_name_required)
binding?.categoryName?.error = getText(R.string.cat_name_required)
return false
}

val newCategory = TermModel(
TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY,
categoryName,
parentId
)
val newCategory = parentId?.let {
TermModel(
TaxonomyStore.DEFAULT_TAXONOMY_CATEGORY,
categoryName,
it
)
}
(requireActivity() as SelectCategoriesActivity).categoryAdded(newCategory)
return true
}

private fun loadCategories() {
val rootCategory = CategoryNode.createCategoryTreeFromList(
mTaxonomyStore!!.getCategoriesForSite(
taxonomyStore!!.getCategoriesForSite(
site!!
)
)
Expand All @@ -104,7 +107,7 @@ class AddCategoryFragment : AppCompatDialogFragment() {
R.layout.categories_row_parent,
categoryLevels
)
binding!!.parentCategory.adapter = categoryAdapter
binding?.parentCategory?.adapter = categoryAdapter
}
}

Expand Down