Skip to content

Commit 449ca5d

Browse files
anton-knyazevanton-knyazev
authored
Merge pull request #39 from Omega-R/develop
New release 2.1.0
2 parents 600e11c + 6450208 commit 449ca5d

8 files changed

Lines changed: 384 additions & 106 deletions

File tree

‎app/src/main/java/omega_r/com/omegatypesexample/MainActivity.kt‎

Lines changed: 48 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,86 @@
11
package omega_r.com.omegatypesexample
22

3-
3+
import android.content.Intent
44
import android.graphics.Bitmap
55
import android.graphics.BitmapFactory
66
import android.graphics.drawable.BitmapDrawable
77
import android.os.Bundle
8+
import android.text.Html
89
import android.util.Log
910
import android.widget.ImageView
1011
import android.widget.TextView
1112
import androidx.core.content.res.ResourcesCompat
13+
import androidx.core.text.HtmlCompat
1214
import com.omega_r.libs.omegatypes.*
1315
import com.omega_r.libs.omegatypes.file.File
1416
import com.omega_r.libs.omegatypes.file.from
1517
import com.omega_r.libs.omegatypes.image.*
18+
import com.omega_r.libs.omegatypes.image.Image.Companion
1619
import kotlinx.coroutines.Dispatchers
1720
import kotlinx.coroutines.launch
1821
import kotlinx.coroutines.withContext
1922
import java.io.ByteArrayOutputStream
2023
import kotlin.concurrent.thread
2124

22-
2325
class MainActivity : BaseActivity() {
2426

27+
companion object {
28+
29+
var test = 0
30+
}
31+
2532
private val exampleTextView by bind<TextView>(R.id.textview)
2633
private val imageView by bind<ImageView>(R.id.imageview)
2734

2835
override fun onCreate(savedInstanceState: Bundle?) {
2936
super.onCreate(savedInstanceState)
3037

38+
val addText = if (test % 2 == 0) {
39+
test++
40+
val intent = Intent(this, this::class.java).putExtra("Text", Text.from(Html.fromHtml("<b>sdf</b>")))
41+
startActivity(intent)
42+
Text.from("")
43+
} else {
44+
test++
45+
46+
intent.getSerializableExtra("Text") as? Text ?: Text.from("No")
47+
}
48+
3149
setContentView(R.layout.activity_main)
3250
val text = TextBuilder()
33-
.append(Text.empty())
34-
.append(Text.from("test "))
35-
.append(Text.from(
36-
R.string.hello_world,
37-
Text.from(R.string.app_name),
38-
textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_regular)!!)
39-
))
40-
.append(Text.from(
41-
" SEMI BOLD",
42-
textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_semi_bold)!!)
43-
))
44-
.toText()
51+
.append(addText)
52+
.append(Text.empty())
53+
.append(Text.from(R.string.text_format_test, "1-9"))
54+
55+
.append(Text.from("test "))
56+
.append(Text.from(Image.from(R.drawable.ic_test)))
57+
.append(
58+
Text.from(
59+
R.string.hello_world,
60+
Text.from(R.string.app_name),
61+
textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_regular)!!)
62+
)
63+
)
64+
.append(
65+
Text.from(
66+
" SEMI BOLD",
67+
textStyle = TextStyle.font(ResourcesCompat.getFont(this, R.font.noto_sans_semi_bold)!!)
68+
)
69+
)
70+
.toText()
4571

4672
text.applyTo(exampleTextView) // or exampleTextView.setText(text)
4773

48-
val list = listOf(Text.from("1", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("2", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))), Text.from("3"))
74+
val list = listOf(
75+
Text.from("1", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))),
76+
Text.from("2", TextStyle.color(Color.fromAttribute(R.attr.colorAccent))),
77+
Text.from("3")
78+
)
4979

5080
title = list.join(",", postfix = ".").getCharSequence(this)
5181

52-
53-
val image = Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
54-
82+
val image =
83+
Image.from("https://dejagerart.com/wp-content/uploads/2018/09/Test-Logo-Circle-black-transparent.png")
5584

5685
// val image = intent.getSerializableExtra("test") as? Image ?: run {
5786
//
@@ -77,11 +106,9 @@ class MainActivity : BaseActivity() {
77106
// }
78107

79108
imageView.setImage(image, processor = GlideImagesProcessor(ImageProcessors.current), onImageApplied = {
80-
Log.d("TAG","onImageApplied")
109+
Log.d("TAG", "onImageApplied")
81110
})
82111

83-
84-
85112
// thread {
86113
// val stream = image.getStream(this, Bitmap.CompressFormat.PNG)
87114
// val bitmap = BitmapFactory.decodeStream(stream)
@@ -90,7 +117,5 @@ class MainActivity : BaseActivity() {
90117
// }
91118
//
92119
// }
93-
94120
}
95-
96121
}

‎app/src/main/res/drawable/ic_test.xml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
3+
4+
<solid android:color="@color/colorAccent"/>
5+
6+
<size android:width="16dp" android:height="16dp"/>
7+
8+
</shape>

‎app/src/main/res/layout/activity_main.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<Button
2828
android:layout_width="wrap_content"
2929
android:layout_height="wrap_content"
30+
android:layout_marginTop="80dp"
3031
android:text="Test"/>
3132

3233
</RelativeLayout>

‎app/src/main/res/values/strings.xml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
11
<resources>
22
<string name="app_name">OmegaTypesExample</string>
3+
4+
<string name="text_format_test">%s - Not bold</string>
5+
6+
<string name="text_fomat_test2">Test2</string>
7+
38
</resources>

‎omegatypes/src/main/java/com/omega_r/libs/omegatypes/ImageText.kt‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
package com.omega_r.libs.omegatypes
2+
3+
import android.app.Activity
4+
import android.content.Context
5+
import android.graphics.Color
6+
import android.graphics.drawable.BitmapDrawable
7+
import android.graphics.drawable.ColorDrawable
8+
import android.graphics.drawable.Drawable
9+
import android.text.Spannable
10+
import android.text.SpannableString
11+
import android.text.SpannableStringBuilder
12+
import android.text.style.DynamicDrawableSpan
13+
import android.text.style.ImageSpan
14+
import com.omega_r.libs.omegatypes.decoders.toBitmap
15+
import com.omega_r.libs.omegatypes.image.Image
16+
import com.omega_r.libs.omegatypes.image.ImageProcessors
17+
import com.omega_r.libs.omegatypes.image.ImageProcessors.Companion
18+
import com.omega_r.libs.omegatypes.image.getStream
19+
import kotlinx.coroutines.Dispatchers
20+
import kotlinx.coroutines.launch
21+
import kotlinx.coroutines.withContext
22+
23+
class ImageText(private val image: Image) : Text(null) {
24+
25+
override fun isEmpty(): Boolean = false
26+
27+
override fun getString(context: Context): String = ""
28+
29+
override fun getCharSequence(context: Context, textStyle: TextStyle?): CharSequence {
30+
val builder = SpannableStringBuilder(" ")
31+
32+
val drawable = image.getDrawable(context)
33+
val span = ImageSpan(drawable ?: ColorDrawable(Color.TRANSPARENT))
34+
builder.setSpan(span, 0, 1, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE)
35+
return builder
36+
}
37+
38+
override fun equals(other: Any?): Boolean {
39+
if (this === other) return true
40+
if (javaClass != other?.javaClass) return false
41+
42+
other as ImageText
43+
44+
return image == other.image
45+
}
46+
47+
override fun hashCode(): Int {
48+
var result = super.hashCode()
49+
result = 31 * result + image.hashCode()
50+
return result
51+
}
52+
53+
private class ImageSpan(private val imageDrawable: Drawable) : DynamicDrawableSpan(ALIGN_BASELINE) {
54+
55+
override fun getDrawable(): Drawable {
56+
imageDrawable.setBounds(0, 0, imageDrawable.intrinsicWidth, imageDrawable.intrinsicHeight)
57+
return imageDrawable
58+
}
59+
}
60+
}

‎omegatypes/src/main/java/com/omega_r/libs/omegatypes/Size.kt‎

Lines changed: 41 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import android.util.SparseArray
77
import android.util.SparseIntArray
88
import android.util.TypedValue
99
import android.util.TypedValue.*
10+
import android.view.ViewGroup.LayoutParams
1011
import android.widget.TextView
1112
import java.io.Serializable
1213
import java.util.*
@@ -21,12 +22,17 @@ abstract class Size : Serializable {
2122
@JvmStatic
2223
fun from(size: Float, unit: Unit): Size = SimpleSize(size, unit)
2324

25+
@JvmStatic
26+
fun from(size: Int, unit: Unit): Size = from(size.toFloat(), unit)
27+
28+
@JvmStatic
29+
fun from(size: Double, unit: Unit): Size = from(size.toFloat(), unit)
30+
2431
@JvmStatic
2532
fun from(dimensionRes: Int): Size = DimensionResourceSize(dimensionRes)
2633

2734
@JvmStatic
2835
fun fromAttribute(dimensionAttr: Int): Size = AttrThemeSize(dimensionAttr)
29-
3036
}
3137

3238
abstract fun getSize(context: Context, unit: Unit): Float
@@ -50,7 +56,7 @@ abstract class Size : Serializable {
5056
return -1
5157
}
5258

53-
protected fun getFactor(displayMetrics: DisplayMetrics, unit: Unit): Float {
59+
private fun getFactor(displayMetrics: DisplayMetrics, unit: Unit): Float {
5460
return displayMetrics.run {
5561
when (unit) {
5662
Unit.PX -> 1.0f
@@ -63,16 +69,9 @@ abstract class Size : Serializable {
6369
}
6470
}
6571

66-
protected fun getFactor(displayMetrics: DisplayMetrics, oldUnit: Unit, newUnit: Unit): Float {
67-
if (oldUnit == newUnit) {
68-
return 1f
69-
}
70-
return getFactor(displayMetrics, newUnit) / getFactor(displayMetrics, oldUnit)
71-
}
72-
73-
protected fun getFactor(context: Context, oldUnit: Unit, newUnit: Unit): Float {
72+
private fun getFactor(context: Context, oldUnit: Unit, newUnit: Unit): Float {
7473
return context.resources.displayMetrics.run {
75-
getFactor(this, newUnit) / getFactor(this, oldUnit)
74+
getFactor(this, oldUnit) / getFactor(this, newUnit)
7675
}
7776
}
7877

@@ -94,9 +93,7 @@ abstract class Size : Serializable {
9493
fun from(typedValueUnit: Int): Unit? {
9594
return values().firstOrNull { typedValueUnit == it.typedValueUnit }
9695
}
97-
9896
}
99-
10097
}
10198

10299
private class SimpleSize(private val size: Float, private val unit: Unit) : Size() {
@@ -110,25 +107,20 @@ abstract class Size : Serializable {
110107

111108
private class DimensionResourceSize(private val sizeRes: Int) : Size() {
112109

113-
override fun getSize(context: Context, unit: Unit) = context.resources.run {
114-
getRawSize(context).applyFactor(context, Unit.PX, unit)
115-
}
110+
override fun getSize(context: Context, unit: Unit) = getRawSize(context).applyFactor(context, Unit.PX, unit)
116111

117112
override fun getRawSize(context: Context) = context.resources.getDimension(sizeRes)
118-
119113
}
120114

121115
class AttrThemeSize(private val attrInt: Int) : Size() {
122116

123117
companion object {
124118

125119
private val cache = WeakHashMap<Resources.Theme, SparseArray<Float>>()
126-
127120
}
128121

129-
override fun getSize(context: Context, unit: Unit): Float = context.resources.run {
122+
override fun getSize(context: Context, unit: Unit): Float =
130123
getRawSize(context).applyFactor(context, Unit.PX, unit)
131-
}
132124

133125
override fun getRawSize(context: Context): Float {
134126
val theme = context.theme
@@ -158,11 +150,35 @@ abstract class Size : Serializable {
158150
if (theme.resolveAttribute(attrInt, this, true)) getDimension(metrics) else 0f
159151
}
160152
}
161-
162153
}
163-
164154
}
165155

166-
fun TextView.setTextSize(size: Size) {
167-
setTextSize(COMPLEX_UNIT_PX, size.getSize(context, Size.Unit.PX))
168-
}
156+
fun TextView.setTextSize(size: Size) = setTextSize(COMPLEX_UNIT_PX, size.getSize(context, Size.Unit.PX))
157+
158+
159+
val Int.px
160+
get() = Size.from(toFloat(), Size.Unit.PX)
161+
162+
val Float.px
163+
get() = Size.from(this, Size.Unit.PX)
164+
165+
val Double.px
166+
get() = Size.from(toFloat(), Size.Unit.PX)
167+
168+
val Int.dp
169+
get() = Size.from(toFloat(), Size.Unit.DP)
170+
171+
val Float.dp
172+
get() = Size.from(this, Size.Unit.DP)
173+
174+
val Double.dp
175+
get() = Size.from(toFloat(), Size.Unit.DP)
176+
177+
val Int.sp
178+
get() = Size.from(toFloat(), Size.Unit.SP)
179+
180+
val Float.sp
181+
get() = Size.from(this, Size.Unit.SP)
182+
183+
val Double.sp
184+
get() = Size.from(toFloat(), Size.Unit.SP)

0 commit comments

Comments
 (0)