-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #55 from emreesen27/v1.0.0-beta8
V1.0.0 beta8
Showing
24 changed files
with
453 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 6 additions & 0 deletions
6
app/src/main/java/com/sn/snfilemanager/core/util/SortCriterion.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.sn.snfilemanager.core.util | ||
|
|
||
| enum class SortCriterion { | ||
| NAME, | ||
| LAST_MODIFIED, | ||
| } |
6 changes: 6 additions & 0 deletions
6
app/src/main/java/com/sn/snfilemanager/core/util/SortOrder.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| package com.sn.snfilemanager.core.util | ||
|
|
||
| enum class SortOrder { | ||
| ASCENDING, | ||
| DESCENDING, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
85 changes: 85 additions & 0 deletions
85
app/src/main/java/com/sn/snfilemanager/view/dialog/sort/SortDialog.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| package com.sn.snfilemanager.view.dialog.sort | ||
|
|
||
| import androidx.fragment.app.viewModels | ||
| import com.sn.snfilemanager.R | ||
| import com.sn.snfilemanager.core.base.BaseDialog | ||
| import com.sn.snfilemanager.core.extensions.click | ||
| import com.sn.snfilemanager.core.util.SortCriterion | ||
| import com.sn.snfilemanager.core.util.SortOrder | ||
| import com.sn.snfilemanager.databinding.DialogSortBinding | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class SortDialog( | ||
| private var isMedia: Boolean = false, | ||
| private val onConfirm: ((Pair<SortCriterion, SortOrder>) -> Unit)? = null, | ||
| ) : BaseDialog<DialogSortBinding>() { | ||
| override fun getViewBinding() = DialogSortBinding.inflate(layoutInflater) | ||
|
|
||
| override val dialogTag: String | ||
| get() = "SORT_DIALOG" | ||
|
|
||
| private val vm: SortDialogViewModel by viewModels() | ||
| private var criterion = SortCriterion.NAME | ||
| private var sortOrder = SortOrder.ASCENDING | ||
|
|
||
| override fun setupViews() { | ||
| setPrefsTag() | ||
| initFirstValues() | ||
| initRadioGroupListener() | ||
| initButtonListener() | ||
| } | ||
|
|
||
| private fun setPrefsTag() { | ||
| vm.setPrefsTag(isMedia) | ||
| } | ||
|
|
||
| private fun initFirstValues() { | ||
| val (loadedCriterion, loadedSortOrder) = vm.getSortData() | ||
| criterion = loadedCriterion | ||
| sortOrder = loadedSortOrder | ||
|
|
||
| with(binding) { | ||
| when (criterion) { | ||
| SortCriterion.NAME -> rbName.isChecked = true | ||
| SortCriterion.LAST_MODIFIED -> rbModified.isChecked = true | ||
| } | ||
| when (sortOrder) { | ||
| SortOrder.ASCENDING -> rbAscending.isChecked = true | ||
| SortOrder.DESCENDING -> rbDescending.isChecked = true | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun initRadioGroupListener() { | ||
| with(binding) { | ||
| rgCriteria.setOnCheckedChangeListener { _, checkedId -> | ||
| criterion = | ||
| when (checkedId) { | ||
| R.id.rb_name -> SortCriterion.NAME | ||
| R.id.rb_modified -> SortCriterion.LAST_MODIFIED | ||
| else -> criterion | ||
| } | ||
| } | ||
| rgSortOrder.setOnCheckedChangeListener { _, checkedId -> | ||
| sortOrder = | ||
| when (checkedId) { | ||
| R.id.rb_ascending -> SortOrder.ASCENDING | ||
| R.id.rb_descending -> SortOrder.DESCENDING | ||
| else -> sortOrder | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| private fun initButtonListener() { | ||
| with(binding) { | ||
| btnCancel.click { dismiss() } | ||
| btnConfirm.click { | ||
| vm.putSortData(criterion, sortOrder) | ||
| onConfirm?.invoke(Pair(criterion, sortOrder)) | ||
| dismiss() | ||
| } | ||
| } | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
app/src/main/java/com/sn/snfilemanager/view/dialog/sort/SortDialogViewModel.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| package com.sn.snfilemanager.view.dialog.sort | ||
|
|
||
| import androidx.lifecycle.ViewModel | ||
| import com.sn.snfilemanager.core.util.SortCriterion | ||
| import com.sn.snfilemanager.core.util.SortOrder | ||
| import com.sn.snfilemanager.providers.preferences.MySharedPreferences | ||
| import com.sn.snfilemanager.providers.preferences.PrefsTag | ||
| import dagger.hilt.android.lifecycle.HiltViewModel | ||
| import javax.inject.Inject | ||
|
|
||
| @HiltViewModel | ||
| class SortDialogViewModel | ||
| @Inject | ||
| constructor( | ||
| private val sharedPreferences: MySharedPreferences, | ||
| ) : ViewModel() { | ||
| private lateinit var tags: Pair<PrefsTag, PrefsTag> | ||
|
|
||
| fun setPrefsTag(isMedia: Boolean) { | ||
| tags = | ||
| if (isMedia) { | ||
| PrefsTag.MEDIA_SORT_CRITERION to PrefsTag.MEDIA_SORT_ORDER | ||
| } else { | ||
| PrefsTag.SORT_CRITERION to PrefsTag.SORT_ORDER | ||
| } | ||
| } | ||
|
|
||
| fun putSortData( | ||
| criterion: SortCriterion, | ||
| sortOrder: SortOrder, | ||
| ) { | ||
| sharedPreferences.putString(tags.first, criterion.name) | ||
| sharedPreferences.putString(tags.second, sortOrder.name) | ||
| } | ||
|
|
||
| fun getSortData(): Pair<SortCriterion, SortOrder> { | ||
| val criterionString = sharedPreferences.getString(tags.first) | ||
| val sortOrderString = sharedPreferences.getString(tags.second) | ||
|
|
||
| val criterion = SortCriterion.valueOf(criterionString ?: SortCriterion.NAME.name) | ||
| val sortOrder = SortOrder.valueOf(sortOrderString ?: SortOrder.ASCENDING.name) | ||
|
|
||
| return Pair(criterion, sortOrder) | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:autoMirrored="true" | ||
| android:tint="@color/first_text_color" | ||
| android:viewportWidth="24" | ||
| android:viewportHeight="24"> | ||
| <path | ||
| android:fillColor="@color/first_text_color" | ||
| android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" /> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,115 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:app="http://schemas.android.com/apk/res-auto" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/title" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:fontFamily="@font/adamina" | ||
| android:padding="@dimen/_10sdp" | ||
| android:text="@string/sort_by" | ||
| android:textColor="@color/first_text_color" | ||
| android:textSize="@dimen/_13ssp" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toTopOf="parent" /> | ||
|
|
||
| <RadioGroup | ||
| android:id="@+id/rg_criteria" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:padding="@dimen/_8sdp" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/title"> | ||
|
|
||
| <com.google.android.material.radiobutton.MaterialRadioButton | ||
| android:id="@+id/rb_name" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/name" /> | ||
|
|
||
| <com.google.android.material.radiobutton.MaterialRadioButton | ||
| android:id="@+id/rb_modified" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/last_modified" /> | ||
| </RadioGroup> | ||
|
|
||
|
|
||
| <View | ||
| android:id="@+id/divider" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="1dp" | ||
| android:layout_marginHorizontal="@dimen/_10sdp" | ||
| android:background="@color/divider_color" | ||
| app:layout_constraintTop_toBottomOf="@id/rg_criteria" /> | ||
|
|
||
| <RadioGroup | ||
| android:id="@+id/rg_sort_order" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:padding="@dimen/_8sdp" | ||
| app:layout_constraintBottom_toTopOf="@+id/center_view" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent" | ||
| app:layout_constraintTop_toBottomOf="@+id/divider"> | ||
|
|
||
| <com.google.android.material.radiobutton.MaterialRadioButton | ||
| android:id="@+id/rb_ascending" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/ascending" /> | ||
|
|
||
| <com.google.android.material.radiobutton.MaterialRadioButton | ||
| android:id="@+id/rb_descending" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/descending" /> | ||
|
|
||
| </RadioGroup> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/center_view" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="@dimen/_10sdp" | ||
| android:gravity="center" | ||
| android:orientation="horizontal" | ||
| app:layout_constraintBottom_toBottomOf="parent" | ||
| app:layout_constraintEnd_toEndOf="parent" | ||
| app:layout_constraintStart_toStartOf="parent"> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/btn_cancel" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_margin="@dimen/_10sdp" | ||
| android:fontFamily="@font/adamina" | ||
| android:padding="@dimen/_5sdp" | ||
| android:text="@string/cancel" | ||
| android:textColor="@color/app_buton_state_list" | ||
| android:textSize="@dimen/_13ssp" /> | ||
|
|
||
| <View | ||
| android:layout_width="1dp" | ||
| android:layout_height="@dimen/_40sdp" | ||
| android:background="@color/divider_color" /> | ||
|
|
||
| <com.google.android.material.textview.MaterialTextView | ||
| android:id="@+id/btn_confirm" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_margin="@dimen/_10sdp" | ||
| android:fontFamily="@font/adamina" | ||
| android:padding="@dimen/_5sdp" | ||
| android:text="@string/confirm" | ||
| android:textColor="@color/app_buton_state_list" | ||
| android:textSize="@dimen/_13ssp" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </androidx.constraintlayout.widget.ConstraintLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Submodule mediastorepv
updated
3 files
| +2 −0 | README.md | |
| +1 −3 | src/main/java/com/sn/mediastorepv/data/MediaSelectionData.kt | |
| +11 −0 | src/main/java/com/sn/mediastorepv/data/OrderStrategy.kt |