-
Notifications
You must be signed in to change notification settings - Fork 100
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
11ac1c2
commit 7f06620
Showing
15 changed files
with
233 additions
and
86 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
51 changes: 51 additions & 0 deletions
51
common-ui/src/main/kotlin/com/blacksquircle/ui/uikit/ColorPickerDialog.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,51 @@ | ||
| /* | ||
| * Copyright 2023 Squircle CE contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.blacksquircle.ui.uikit | ||
|
|
||
| import android.app.Dialog | ||
| import android.os.Bundle | ||
| import androidx.appcompat.app.AlertDialog | ||
| import androidx.fragment.app.DialogFragment | ||
| import com.blacksquircle.ui.uikit.databinding.DialogColorPickerBinding | ||
| import com.skydoves.colorpickerview.flag.BubbleFlag | ||
| import com.skydoves.colorpickerview.flag.FlagMode | ||
|
|
||
| abstract class ColorPickerDialog : DialogFragment() { | ||
|
|
||
| abstract val titleRes: Int | ||
| abstract val positiveRes: Int | ||
| abstract val negativeRes: Int | ||
| abstract val initialColor: Int | ||
|
|
||
| override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { | ||
| val binding = DialogColorPickerBinding.inflate(layoutInflater) | ||
| binding.colorPicker.setInitialColor(initialColor) | ||
| binding.colorPicker.attachAlphaSlider(binding.alphaSlideBar) | ||
| binding.colorPicker.attachBrightnessSlider(binding.brightnessSlideBar) | ||
| binding.colorPicker.flagView = BubbleFlag(requireContext()).apply { | ||
| flagMode = FlagMode.FADE | ||
| } | ||
| return AlertDialog.Builder(requireContext()) | ||
| .setTitle(titleRes) | ||
| .setView(binding.root) | ||
| .setPositiveButton(positiveRes) { _, _ -> onColorSelected(binding.colorPicker.color) } | ||
| .setNegativeButton(negativeRes, null) | ||
| .create() | ||
| } | ||
|
|
||
| abstract fun onColorSelected(color: Int) | ||
| } |
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,49 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <!-- | ||
| ~ Copyright 2023 Squircle CE contributors. | ||
| ~ | ||
| ~ Licensed under the Apache License, Version 2.0 (the "License"); | ||
| ~ you may not use this file except in compliance with the License. | ||
| ~ You may obtain a copy of the License at | ||
| ~ | ||
| ~ http://www.apache.org/licenses/LICENSE-2.0 | ||
| ~ | ||
| ~ Unless required by applicable law or agreed to in writing, software | ||
| ~ distributed under the License is distributed on an "AS IS" BASIS, | ||
| ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| ~ See the License for the specific language governing permissions and | ||
| ~ limitations under the License. | ||
| --> | ||
|
|
||
| <LinearLayout 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="match_parent" | ||
| android:orientation="vertical"> | ||
|
|
||
| <com.skydoves.colorpickerview.ColorPickerView | ||
| android:layout_width="236dp" | ||
| android:layout_height="236dp" | ||
| android:layout_gravity="center" | ||
| android:layout_marginTop="24dp" | ||
| android:id="@+id/colorPicker" /> | ||
|
|
||
| <com.skydoves.colorpickerview.sliders.AlphaSlideBar | ||
| android:id="@+id/alphaSlideBar" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="20dp" | ||
| android:layout_marginStart="24dp" | ||
| android:layout_marginEnd="24dp" | ||
| app:selector_AlphaSlideBar="@drawable/colorpickerview_wheel" /> | ||
|
|
||
| <com.skydoves.colorpickerview.sliders.BrightnessSlideBar | ||
| android:id="@+id/brightnessSlideBar" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop="20dp" | ||
| android:layout_marginStart="24dp" | ||
| android:layout_marginEnd="24dp" | ||
| app:selector_BrightnessSlider="@drawable/colorpickerview_wheel" /> | ||
|
|
||
| </LinearLayout> |
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
52 changes: 0 additions & 52 deletions
52
...r/impl/src/main/kotlin/com/blacksquircle/ui/feature/editor/ui/dialog/ColorPickerDialog.kt
This file was deleted.
Oops, something went wrong.
40 changes: 40 additions & 0 deletions
40
...r/impl/src/main/kotlin/com/blacksquircle/ui/feature/editor/ui/dialog/InsertColorDialog.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,40 @@ | ||
| /* | ||
| * Copyright 2023 Squircle CE contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.blacksquircle.ui.feature.editor.ui.dialog | ||
|
|
||
| import android.graphics.Color | ||
| import androidx.fragment.app.activityViewModels | ||
| import com.blacksquircle.ui.feature.editor.R | ||
| import com.blacksquircle.ui.feature.editor.ui.mvi.EditorIntent | ||
| import com.blacksquircle.ui.feature.editor.ui.viewmodel.EditorViewModel | ||
| import com.blacksquircle.ui.uikit.ColorPickerDialog | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class InsertColorDialog : ColorPickerDialog() { | ||
|
|
||
| override val titleRes = R.string.dialog_title_color_picker | ||
| override val positiveRes = R.string.action_insert | ||
| override val negativeRes = android.R.string.cancel | ||
| override val initialColor = Color.WHITE | ||
|
|
||
| private val viewModel by activityViewModels<EditorViewModel>() | ||
|
|
||
| override fun onColorSelected(color: Int) { | ||
| viewModel.obtainEvent(EditorIntent.InsertColor(color)) | ||
| } | ||
| } |
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
48 changes: 48 additions & 0 deletions
48
...s/impl/src/main/kotlin/com/blacksquircle/ui/feature/themes/ui/dialog/ChooseColorDialog.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,48 @@ | ||
| /* | ||
| * Copyright 2023 Squircle CE contributors. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.blacksquircle.ui.feature.themes.ui.dialog | ||
|
|
||
| import androidx.core.graphics.toColorInt | ||
| import androidx.hilt.navigation.fragment.hiltNavGraphViewModels | ||
| import androidx.navigation.fragment.navArgs | ||
| import com.blacksquircle.ui.core.extensions.toHexString | ||
| import com.blacksquircle.ui.feature.themes.R | ||
| import com.blacksquircle.ui.feature.themes.ui.mvi.ThemeIntent | ||
| import com.blacksquircle.ui.feature.themes.ui.viewmodel.ThemesViewModel | ||
| import com.blacksquircle.ui.uikit.ColorPickerDialog | ||
| import dagger.hilt.android.AndroidEntryPoint | ||
|
|
||
| @AndroidEntryPoint | ||
| class ChooseColorDialog : ColorPickerDialog() { | ||
|
|
||
| override val titleRes = R.string.dialog_title_color_picker | ||
| override val positiveRes = R.string.action_select | ||
| override val negativeRes = android.R.string.cancel | ||
| override val initialColor: Int | ||
| get() = navArgs.value.toColorInt() | ||
|
|
||
| private val viewModel by hiltNavGraphViewModels<ThemesViewModel>(R.id.themes_graph) | ||
| private val navArgs by navArgs<ChooseColorDialogArgs>() | ||
|
|
||
| override fun onColorSelected(color: Int) { | ||
| val event = ThemeIntent.ChangeColor( | ||
| key = navArgs.key, | ||
| value = color.toHexString() | ||
| ) | ||
| viewModel.obtainEvent(event) | ||
| } | ||
| } |
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
Oops, something went wrong.