Skip to content

Commit 91f9feb

Browse files
committed
Fix details ui
1 parent b393384 commit 91f9feb

File tree

3 files changed

+15
-8
lines changed

3 files changed

+15
-8
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,18 @@
11
package org.koitharu.kotatsu.core.util.ext
22

3+
import org.koitharu.kotatsu.core.io.NullOutputStream
4+
import java.io.ObjectOutputStream
5+
36
@Suppress("UNCHECKED_CAST")
47
fun <T> Class<T>.castOrNull(obj: Any?): T? {
58
if (obj == null || !isInstance(obj)) {
69
return null
710
}
811
return obj as T
912
}
13+
14+
fun Any.isSerializable() = runCatching {
15+
val oos = ObjectOutputStream(NullOutputStream())
16+
oos.writeObject(this)
17+
oos.flush()
18+
}.isSuccess

app/src/main/kotlin/org/koitharu/kotatsu/core/util/ext/Throwable.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ import org.koitharu.kotatsu.core.exceptions.UnsupportedSourceException
2727
import org.koitharu.kotatsu.core.exceptions.WrapperIOException
2828
import org.koitharu.kotatsu.core.exceptions.WrongPasswordException
2929
import org.koitharu.kotatsu.core.exceptions.resolve.ExceptionResolver
30-
import org.koitharu.kotatsu.core.io.NullOutputStream
3130
import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_LOCALE_GENRES_NOT_SUPPORTED
3231
import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_BOTH_STATES_GENRES_NOT_SUPPORTED
3332
import org.koitharu.kotatsu.parsers.ErrorMessages.FILTER_MULTIPLE_GENRES_NOT_SUPPORTED
@@ -40,7 +39,6 @@ import org.koitharu.kotatsu.parsers.exception.ParseException
4039
import org.koitharu.kotatsu.parsers.exception.TooManyRequestExceptions
4140
import org.koitharu.kotatsu.parsers.util.ifNullOrEmpty
4241
import org.koitharu.kotatsu.scrobbling.common.domain.ScrobblerAuthRequiredException
43-
import java.io.ObjectOutputStream
4442
import java.net.ConnectException
4543
import java.net.NoRouteToHostException
4644
import java.net.SocketException
@@ -223,9 +221,3 @@ fun Throwable.isWebViewUnavailable(): Boolean {
223221

224222
@Suppress("FunctionName")
225223
fun NoSpaceLeftException() = IOException(MSG_NO_SPACE_LEFT)
226-
227-
fun Throwable.isSerializable() = runCatching {
228-
val oos = ObjectOutputStream(NullOutputStream())
229-
oos.writeObject(this)
230-
oos.flush()
231-
}.isSuccess

app/src/main/res/layout/layout_details_table.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
android:padding="4dp"
4242
android:singleLine="true"
4343
android:textAppearance="?textAppearanceBodyMedium"
44+
app:layout_constrainedWidth="true"
4445
app:layout_constraintBaseline_toBaselineOf="@id/textView_source_label"
4546
app:layout_constraintEnd_toEndOf="@id/card_details"
4647
app:layout_constraintHorizontal_bias="0"
@@ -69,6 +70,7 @@
6970
android:padding="4dp"
7071
android:singleLine="true"
7172
android:textAppearance="?textAppearanceBodyMedium"
73+
app:layout_constrainedWidth="true"
7274
app:layout_constraintBaseline_toBaselineOf="@id/textView_author_label"
7375
app:layout_constraintEnd_toEndOf="@id/card_details"
7476
app:layout_constraintHorizontal_bias="0"
@@ -96,6 +98,7 @@
9698
android:drawablePadding="4dp"
9799
android:singleLine="true"
98100
android:textAppearance="?textAppearanceBodyMedium"
101+
app:layout_constrainedWidth="true"
99102
app:layout_constraintBaseline_toBaselineOf="@id/textView_translation_label"
100103
app:layout_constraintEnd_toEndOf="@id/card_details"
101104
app:layout_constraintHorizontal_bias="0"
@@ -153,6 +156,7 @@
153156
android:layout_marginEnd="@dimen/screen_padding"
154157
android:singleLine="true"
155158
android:textAppearance="?textAppearanceBodyMedium"
159+
app:layout_constrainedWidth="true"
156160
app:layout_constraintBaseline_toBaselineOf="@id/textView_state_label"
157161
app:layout_constraintEnd_toEndOf="@id/card_details"
158162
app:layout_constraintHorizontal_bias="0"
@@ -179,6 +183,7 @@
179183
android:layout_marginEnd="@dimen/screen_padding"
180184
android:singleLine="true"
181185
android:textAppearance="?textAppearanceBodyMedium"
186+
app:layout_constrainedWidth="true"
182187
app:layout_constraintBaseline_toBaselineOf="@id/textView_chapters_label"
183188
app:layout_constraintEnd_toEndOf="@id/card_details"
184189
app:layout_constraintHorizontal_bias="0"
@@ -207,6 +212,7 @@
207212
android:padding="4dp"
208213
android:singleLine="true"
209214
android:textAppearance="?textAppearanceBodyMedium"
215+
app:layout_constrainedWidth="true"
210216
app:layout_constraintBaseline_toBaselineOf="@id/textView_local_label"
211217
app:layout_constraintEnd_toEndOf="@id/card_details"
212218
app:layout_constraintHorizontal_bias="0"

0 commit comments

Comments
 (0)