Skip to content

Commit

Permalink
1. add stitch mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@ekibun
ekibun committed Aug 13, 2022
1 parent 4c34d7e commit 986dc9f
Show file tree
Hide file tree
Showing 4 changed files with 139 additions and 10 deletions.
4 changes: 3 additions & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

111 changes: 106 additions & 5 deletions app/src/main/java/soko/ekibun/stitch/EditActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import android.util.Log
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.*
import androidx.core.view.setPadding
import androidx.core.widget.doAfterTextChanged
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.MainScope
Expand Down Expand Up @@ -52,6 +53,56 @@ class EditActivity : Activity() {
private val numberB by lazy { findViewById<EditText>(R.id.menu_edit_b) }
private val numberDiv by lazy { findViewById<View>(R.id.menu_edit_divider) }
private val dropdown by lazy { findViewById<TextView>(R.id.menu_dropdown) }
private val panelAuto by lazy { findViewById<View>(R.id.panel_auto) }
private val panelSeekbar by lazy { findViewById<View>(R.id.panel_seekbar) }
private val switchHorizon by lazy { findViewById<CheckBox>(R.id.switch_horizon) }

private val tabviews by lazy {
findViewById<LinearLayout>(R.id.panel_tab).let { layout ->
val padding = (resources.displayMetrics.density * 16).roundToInt()
StitchType.values().mapIndexed { i, it ->
TextView(this).apply {
text = it.label
tag = it
textAlignment = TextView.TEXT_ALIGNMENT_CENTER
setPadding(padding)
setOnClickListener { _ ->
stitchType = it
updateSelectInfo()
}
layout.addView(
this, i, LinearLayout.LayoutParams(
0, LinearLayout.LayoutParams.WRAP_CONTENT, 1f
)
)
}
}
}
}

fun updateTab() {
tabviews.forEach {
it.setBackgroundResource(if (it.tag == stitchType) R.color.opaque else 0)
}
when (stitchType) {
StitchType.AUTO -> {
panelSeekbar.visibility = View.GONE
panelAuto.visibility = View.VISIBLE
}
StitchType.TILE -> {
panelSeekbar.visibility = View.VISIBLE
panelAuto.visibility = View.GONE
switchHorizon.visibility = View.VISIBLE
dropdown.visibility = View.GONE
}
StitchType.MAN -> {
panelSeekbar.visibility = View.VISIBLE
panelAuto.visibility = View.GONE
switchHorizon.visibility = View.GONE
dropdown.visibility = View.VISIBLE
}
}
}

data class SelectItemInfo(
val roundOf: Int,
Expand All @@ -69,6 +120,12 @@ class EditActivity : Activity() {
)
private var selectIndex = R.string.label_dy

enum class StitchType(var label: String) {
AUTO("自动"), TILE("平铺"), MAN("手动")
}

private var stitchType = StitchType.AUTO

private val projectKey by lazy { intent.extras!!.getString("project")!! }
val project by lazy { App.getProject(projectKey) }

Expand All @@ -79,7 +136,9 @@ class EditActivity : Activity() {
}

private fun updateNumberView(a: Float? = null, b: Float? = null) {
val (roundOf, showB) = selectItems[selectIndex] ?: (0 to false)
val (roundOf, showB) = if (stitchType == StitchType.MAN)
selectItems[selectIndex] ?: (0 to false)
else (2 to true)
numberB.visibility = if (showB) View.VISIBLE else View.GONE
numberDiv.visibility = if (showB) View.VISIBLE else View.GONE
numberDec.visibility = if (showB) View.GONE else View.VISIBLE
Expand Down Expand Up @@ -109,7 +168,20 @@ class EditActivity : Activity() {
fun setNumber(a: Float? = null, b: Float? = null, relative: Boolean = false) {
val selected = selectedStitchInfo
if (selected.isNotEmpty()) selected.forEach {
when (selectIndex) {
if (stitchType == StitchType.TILE) {
val aa = a ?: seekbar.a
val bb = b ?: seekbar.b
val rest = 1 - bb + aa
it.a = if (rest > 0) aa / rest else 0f
it.b = it.a
if (switchHorizon.isChecked) {
it.dx = (bb - aa) * it.width
it.dy = 0f
} else {
it.dy = (bb - aa) * it.height
it.dx = 0f
}
} else when (selectIndex) {
R.string.label_dx -> if (a != null) it.dx = if (relative) (a * 2 - 1) * it.width else a
R.string.label_dy -> if (a != null) it.dy = if (relative) (a * 2 - 1) * it.height else a
R.string.label_trim -> {
Expand All @@ -131,7 +203,7 @@ class EditActivity : Activity() {
}

private val selectedStitchInfo
get() = when (selectIndex) {
get() = when (if (stitchType == StitchType.MAN) selectIndex else 0) {
R.string.label_dx,
R.string.label_dy,
R.string.label_trim -> project.stitchInfo.filterIndexed { i, v ->
Expand All @@ -144,7 +216,19 @@ class EditActivity : Activity() {
val selected = selectedStitchInfo
if (selected.isNotEmpty()) {
numberView.visibility = View.VISIBLE
when (selectIndex) {
if (stitchType == StitchType.TILE) {
if (switchHorizon.isChecked) {
updateNumberView(
selected.map { (1 - it.dx / it.width) * it.a }.average().toFloat(),
selected.map { it.a + (1 - it.a) * (it.dx / it.width) }.average().toFloat()
)
} else {
updateNumberView(
selected.map { (1 - it.dy / it.height) * it.a }.average().toFloat(),
selected.map { it.a + (1 - it.a) * (it.dy / it.height) }.average().toFloat()
)
}
} else when (selectIndex) {
R.string.label_dx -> {
updateNumberView(selected.map { it.dx }.average().toFloat())
}
Expand Down Expand Up @@ -185,7 +269,16 @@ class EditActivity : Activity() {
val selected = selectedStitchInfo
if (selected.isNotEmpty()) {
seekbar.isEnabled = true
when (selectIndex) {
if (stitchType == StitchType.TILE) {
seekbar.type = RangeSeekbar.TYPE_RANGE
if (switchHorizon.isChecked) {
seekbar.a = selected.map { (1 - it.dx / it.width) * it.a }.average().toFloat()
seekbar.b = selected.map { it.a + (1 - it.a) * (it.dx / it.width) }.average().toFloat()
} else {
seekbar.a = selected.map { (1 - it.dy / it.height) * it.a }.average().toFloat()
seekbar.b = selected.map { it.a + (1 - it.a) * (it.dy / it.height) }.average().toFloat()
}
} else when (selectIndex) {
R.string.label_dx -> {
seekbar.type = RangeSeekbar.TYPE_CENTER
seekbar.a = selected.map { (it.dx / it.width + 1) / 2 }.average().toFloat()
Expand Down Expand Up @@ -232,6 +325,7 @@ class EditActivity : Activity() {
invalidateView()
selectInfo.text =
getString(R.string.label_select, project.selected.size, project.stitchInfo.size)
updateTab()
updateSeekbar()
updateNumber()
}
Expand Down Expand Up @@ -479,6 +573,13 @@ class EditActivity : Activity() {
findViewById<CheckBox>(R.id.switch_diff).isChecked
)
}
switchHorizon.setOnCheckedChangeListener { _, _ ->
project.updateUndo(switchHorizon) {
setNumber()
}
updateSeekbar()
invalidateView()
}
numberA.doAfterTextChanged {
if (!numberA.isFocused) return@doAfterTextChanged
val newNum = it?.toString()?.toFloatOrNull() ?: return@doAfterTextChanged
Expand Down
10 changes: 10 additions & 0 deletions app/src/main/java/soko/ekibun/stitch/RangeSeekbar.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import android.graphics.Shader
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
import android.widget.LinearLayout
import kotlin.math.abs
import kotlin.math.max
import kotlin.math.min
Expand Down Expand Up @@ -168,6 +169,10 @@ class RangeSeekbar(context: Context?, attrs: AttributeSet?) : View(context, attr
when (event.action) {
MotionEvent.ACTION_DOWN -> {
parent.requestDisallowInterceptTouchEvent(true)
(layoutParams as? LinearLayout.LayoutParams)?.let { lp ->
lp.width = width
lp.weight = 0f
}
downX = event.x
downY = event.y
val ar = abs(downX - radius - (width - 2 * radius) * a)
Expand All @@ -179,6 +184,11 @@ class RangeSeekbar(context: Context?, attrs: AttributeSet?) : View(context, attr
}
}
MotionEvent.ACTION_UP, MotionEvent.ACTION_CANCEL -> {
(layoutParams as? LinearLayout.LayoutParams)?.let { lp ->
lp.width = 0
lp.weight = 1f
}
requestLayout()
downObj = 0
onTouchUp?.invoke()
}
Expand Down
24 changes: 20 additions & 4 deletions app/src/main/res/layout/activity_edit.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -87,10 +87,10 @@


<LinearLayout
android:id="@+id/panel_auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/bg_rect"
android:backgroundTint="@color/opaque"
android:layout_height="56dp"
android:background="@color/opaque"
android:gravity="center_vertical"
android:padding="8dp">

Expand Down Expand Up @@ -137,11 +137,21 @@
</LinearLayout>

<LinearLayout
android:id="@+id/panel_seekbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="56dp"
android:gravity="center_vertical"
android:background="@color/opaque"
android:padding="8dp">

<CheckBox
android:id="@+id/switch_horizon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:padding="8dp"
android:text="横向" />

<TextView
android:id="@+id/menu_dropdown"
android:layout_width="wrap_content"
Expand Down Expand Up @@ -217,6 +227,12 @@
</LinearLayout>
</LinearLayout>

<LinearLayout
android:id="@+id/panel_tab"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down

0 comments on commit 986dc9f

Please sign in to comment.