DataHearth/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wrong card background fix + bump gradle version (#337)

Browse Source
This commit is contained in:
Bram van de Kerkhof 2016-06-07 20:14:36 +02:00
parent dad9dcd742
commit 172305fc6a
10 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadAdapter.kt
View File

@ -23,7 +23,7 @@ class RecentlyReadAdapter(val fragment: RecentlyReadFragment)
* @param viewType int containing viewType
*/
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecentlyReadHolder {
val view = parent.inflate(R.layout.item_recent_manga)
val view = parent.inflate(R.layout.item_recently_read)
return RecentlyReadHolder(view, this)
}

6
app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadFragment.kt
View File

@ -14,12 +14,12 @@ import eu.kanade.tachiyomi.ui.main.MainActivity
import eu.kanade.tachiyomi.ui.manga.MangaActivity
import eu.kanade.tachiyomi.ui.reader.ReaderActivity
import eu.kanade.tachiyomi.widget.NpaLinearLayoutManager
import kotlinx.android.synthetic.main.fragment_recent_manga.*
import kotlinx.android.synthetic.main.fragment_recently_read.*
import nucleus.factory.RequiresPresenter
/**
* Fragment that shows recently read manga.
* Uses R.layout.fragment_recent_manga.
* Uses R.layout.fragment_recently_read.
* UI related actions should be called from here.
*/
@RequiresPresenter(RecentlyReadPresenter::class)
@ -49,7 +49,7 @@ class RecentlyReadFragment : BaseRxFragment<RecentlyReadPresenter>() {
* @param savedState status of saved state
*/
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedState: Bundle?): View? {
return inflater.inflate(R.layout.fragment_recent_manga, container, false)
return inflater.inflate(R.layout.fragment_recently_read, container, false)
}
/**

4
app/src/main/java/eu/kanade/tachiyomi/ui/recently_read/RecentlyReadHolder.kt
View File

@ -9,13 +9,13 @@ import eu.kanade.tachiyomi.R
import eu.kanade.tachiyomi.data.database.models.MangaChapterHistory
import eu.kanade.tachiyomi.data.source.SourceManager
import kotlinx.android.synthetic.main.dialog_remove_recently.view.*
import kotlinx.android.synthetic.main.item_recent_manga.view.*
import kotlinx.android.synthetic.main.item_recently_read.view.*
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
/**
* Holder that contains recent manga item
* Uses R.layout.item_recent_manga.
* Uses R.layout.item_recently_read.
* UI related actions should be called from here.
*
* @param view the inflated view for this holder.

4
app/src/main/res/layout/card_myanimelist_personal.xml
View File

@ -3,9 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/cv_mal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/card_margin"
style="@style/Theme.Widget.CardView"
>
<RelativeLayout

2
app/src/main/res/layout/fragment_recent_manga.xml → app/src/main/res/layout/fragment_recently_read.xml
View File

@ -9,7 +9,7 @@
android:id="@+id/recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:listitem="@layout/item_recent_manga">
tools:listitem="@layout/item_recently_read">
</android.support.v7.widget.RecyclerView>

2
app/src/main/res/layout/item_recent_manga.xml → app/src/main/res/layout/item_recently_read.xml
View File

@ -3,8 +3,6 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/cv_manga"
style="@style/Theme.Widget.CardView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
>
<LinearLayout

1
app/src/main/res/values/attrs.xml
View File

@ -22,4 +22,5 @@
<attr name="selectable_library_drawable" format="reference|integer"/>
<attr name="divider_drawable" format="reference|integer" />
<attr name="text_color_primary" format="reference|integer"/>
<attr name="background_card" format="reference|integer"/>
</resources>

7
app/src/main/res/values/styles.xml
View File

@ -142,9 +142,10 @@
</style>
<style name="Theme.Widget.CardView">
<item name="android:layout_marginRight">@dimen/card_margin</item>
<item name="android:layout_marginLeft">@dimen/card_margin</item>
<item name="android:layout_marginTop">@dimen/card_margin</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">?attr/background_card</item>
<item name="android:layout_margin">@dimen/card_margin</item>
</style>
<style name="Theme.Widget.GridView">

2
app/src/main/res/values/themes.xml
View File

@ -33,6 +33,7 @@
<item name="selectable_library_drawable">@drawable/library_item_selector_light</item>
<item name="divider_drawable">@drawable/line_divider_light</item>
<item name="text_color_primary">@color/textColorPrimaryLight</item>
<item name="background_card">@color/backgroundLight</item>
</style>
<style name="Theme.Tachiyomi" parent="Theme.Base">
@ -68,6 +69,7 @@
<item name="selectable_library_drawable">@drawable/library_item_selector_dark</item>
<item name="divider_drawable">@drawable/line_divider_dark</item>
<item name="text_color_primary">@color/textColorPrimaryDark</item>
<item name="background_card">@color/backgroundDark</item>
</style>
<style name="Theme.Tachiyomi.Dark" parent="Theme.Base.Dark">

2
build.gradle
View File

@ -6,7 +6,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.0'
classpath 'com.android.tools.build:gradle:2.1.2'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.12.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files