mirrors/aniyomi
1
0
Fork 0
mirror of https://github.com/aniyomiorg/aniyomi.git synced 2024-11-28 00:37:58 +03:00
Code Issues Projects Releases Packages Wiki Activity

removed extra blank lines (#1259)

Browse source 
fixed results not showing for jellybean
made edit text max line 1 to prevent it newlines being added and moving the edit text into the list view
This commit is contained in:
Carlos 2018-02-18 13:36:34 -05:00 committed by inorichi
parent 9194dc0161
commit fc1f290b85
3 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/eu/kanade/tachiyomi/ui/manga/track/TrackSearchAdapter.kt
View file

@ -6,8 +6,8 @@ import android.view.ViewGroup
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.engine.DiskCacheStrategy
import eu.kanade.tachiyomi.R import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.data.glide.GlideApp import eu.kanade.tachiyomi.data.glide.GlideApp
import eu.kanade.tachiyomi.data.track.model.TrackSearch
import eu.kanade.tachiyomi.util.gone import eu.kanade.tachiyomi.util.gone
import eu.kanade.tachiyomi.util.inflate import eu.kanade.tachiyomi.util.inflate
import kotlinx.android.synthetic.main.track_search_item.view.* import kotlinx.android.synthetic.main.track_search_item.view.*
@ -53,7 +53,6 @@ class TrackSearchAdapter(context: Context)
.centerCrop() .centerCrop()
.into(view.track_search_cover) .into(view.track_search_cover)
if (track.publishing_status.isNullOrBlank()) { if (track.publishing_status.isNullOrBlank()) {
view.track_search_status.gone() view.track_search_status.gone()
view.track_search_status_result.gone() view.track_search_status_result.gone()
@ -74,9 +73,7 @@ class TrackSearchAdapter(context: Context)
} else { } else {
view.track_search_start_result.text = track.start_date view.track_search_start_result.text = track.start_date
} }
} }
} }
} }
} }

3
app/src/main/res/layout/track_search_dialog.xml
View file

@ -14,6 +14,7 @@
android:hint="@string/title" android:hint="@string/title"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:maxLines="1"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent"/>
<ProgressBar <ProgressBar
@ -34,7 +35,7 @@
android:id="@+id/track_search_list" android:id="@+id/track_search_list"
style="@style/Theme.Widget.CardView" style="@style/Theme.Widget.CardView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_marginTop="40dp" android:layout_marginTop="40dp"
android:choiceMode="singleChoice" android:choiceMode="singleChoice"
android:clipToPadding="false" android:clipToPadding="false"

13
app/src/main/res/layout/track_search_item.xml
View file

@ -21,6 +21,8 @@
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:contentDescription="@string/description_cover" android:contentDescription="@string/description_cover"
android:scaleType="centerCrop" android:scaleType="centerCrop"
@ -29,13 +31,13 @@
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.0"
tools:src="@drawable/branded_logo_icon"/> tools:src="@drawable/branded_logo_icon"/>
<TextView <TextView
android:id="@+id/track_search_title" android:id="@+id/track_search_title"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:maxLines="3" android:maxLines="3"
@ -50,6 +52,7 @@
android:id="@+id/track_search_type" android:id="@+id/track_search_type"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:text="@string/track_type" android:text="@string/track_type"
@ -63,6 +66,7 @@
android:id="@+id/track_search_type_result" android:id="@+id/track_search_type_result"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary" android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@ -76,6 +80,7 @@
android:id="@+id/track_search_start" android:id="@+id/track_search_start"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:text="@string/track_start_date" android:text="@string/track_start_date"
@ -89,6 +94,7 @@
android:id="@+id/track_search_start_result" android:id="@+id/track_search_start_result"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary" android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@ -102,6 +108,7 @@
android:id="@+id/track_search_status" android:id="@+id/track_search_status"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:text="@string/track_status" android:text="@string/track_status"
@ -115,6 +122,7 @@
android:id="@+id/track_search_status_result" android:id="@+id/track_search_status_result"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginLeft="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:maxLines="1" android:maxLines="1"
android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary" android:textAppearance="@style/TextAppearance.Regular.Body1.Secondary"
@ -129,6 +137,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:layout_marginLeft="8dp"
android:layout_marginRight="8dp" android:layout_marginRight="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"