Merge branch 'master' of https://github.com/Xie-Jason/legado
	
		
	
				
					
				
			
						commit
						206382fa00
					
				
									
										
											File diff suppressed because it is too large
											Load Diff
										
									
								
							
						@ -0,0 +1,15 @@ | 
				
			|||||||
 | 
					package io.legado.app.data.entities | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import android.os.Parcelable | 
				
			||||||
 | 
					import androidx.room.ColumnInfo | 
				
			||||||
 | 
					import kotlinx.parcelize.Parcelize | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Parcelize | 
				
			||||||
 | 
					class BookChapterReview( | 
				
			||||||
 | 
					    @ColumnInfo(defaultValue = "0") | 
				
			||||||
 | 
					    var bookId: Long = 0, | 
				
			||||||
 | 
					    var chapterId: Long = 0, | 
				
			||||||
 | 
					    var summaryUrl: String = "", | 
				
			||||||
 | 
					): Parcelable { | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					} | 
				
			||||||
@ -0,0 +1,20 @@ | 
				
			|||||||
 | 
					package io.legado.app.data.entities.rule | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					import android.os.Parcelable | 
				
			||||||
 | 
					import kotlinx.parcelize.Parcelize | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					@Parcelize | 
				
			||||||
 | 
					data class ReviewRule( | 
				
			||||||
 | 
					    var reviewUrl: String? = null,          // 段评URL | 
				
			||||||
 | 
					    var avatarRule: String? = null,         // 段评发布者头像 | 
				
			||||||
 | 
					    var contentRule: String? = null,        // 段评内容 | 
				
			||||||
 | 
					    var postTimeRule: String? = null,       // 段评发布时间 | 
				
			||||||
 | 
					    var reviewQuoteUrl: String? = null,     // 获取段评回复URL | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    // 这些功能将在以上功能完成以后实现 | 
				
			||||||
 | 
					    var voteUpUrl: String? = null,          // 点赞URL | 
				
			||||||
 | 
					    var voteDownUrl: String? = null,        // 点踩URL | 
				
			||||||
 | 
					    var postReviewUrl: String? = null,      // 发送回复URL | 
				
			||||||
 | 
					    var postQuoteUrl: String? = null,       // 发送回复段评URL | 
				
			||||||
 | 
					    var deleteUrl: String? = null,          // 删除段评URL | 
				
			||||||
 | 
					): Parcelable | 
				
			||||||
@ -1,11 +1,14 @@ | 
				
			|||||||
package io.legado.app.ui.book.read.page.entities | 
					package io.legado.app.ui.book.read.page.entities | 
				
			||||||
 | 
					
 | 
				
			||||||
data class TextChar( | 
					/** | 
				
			||||||
 | 
					 * 字符信息 | 
				
			||||||
 | 
					 */ | 
				
			||||||
 | 
					data class TextColumn( | 
				
			||||||
    val charData: String, | 
					    val charData: String, | 
				
			||||||
    var start: Float, | 
					    var start: Float, | 
				
			||||||
    var end: Float, | 
					    var end: Float, | 
				
			||||||
 | 
					    val style: Int = 0, //0:文字,1:图片,2:按钮 | 
				
			||||||
    var selected: Boolean = false, | 
					    var selected: Boolean = false, | 
				
			||||||
    var isImage: Boolean = false, | 
					 | 
				
			||||||
    var isSearchResult: Boolean = false | 
					    var isSearchResult: Boolean = false | 
				
			||||||
) { | 
					) { | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -1,25 +1,25 @@ | 
				
			|||||||
<?xml version="1.0" encoding="utf-8"?> | 
					<?xml version="1.0" encoding="utf-8"?> | 
				
			||||||
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | 
					<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation"> | 
				
			||||||
    <string name="pk_bookshelf_px">bookshelf_px</string> | 
					    <string name="pk_bookshelf_px" translatable="false">bookshelf_px</string> | 
				
			||||||
    <string name="legado_gzh">开源阅读</string> | 
					    <string name="legado_gzh" translatable="false">开源阅读</string> | 
				
			||||||
    <string name="email">kunfei.ge@gmail.com</string> | 
					    <string name="email" translatable="false">kunfei.ge@gmail.com</string> | 
				
			||||||
 | 
					
 | 
				
			||||||
    <string name="source_rule_url">https://alanskycn.gitee.io/teachme/</string> | 
					    <string name="source_rule_url" translatable="false">https://alanskycn.gitee.io/teachme/</string> | 
				
			||||||
    <string name="this_github_url">https://github.com/gedoor/legado</string> | 
					    <string name="this_github_url" translatable="false">https://github.com/gedoor/legado</string> | 
				
			||||||
    <string name="contributors_url">https://github.com/gedoor/legado/graphs/contributors</string> | 
					    <string name="contributors_url" translatable="false">https://github.com/gedoor/legado/graphs/contributors</string> | 
				
			||||||
    <string name="home_page_url">https://gedoor.github.io</string> | 
					    <string name="home_page_url" translatable="false">https://gedoor.github.io</string> | 
				
			||||||
    <string name="license_url">https://github.com/gedoor/legado/blob/master/LICENSE</string> | 
					    <string name="license_url" translatable="false">https://github.com/gedoor/legado/blob/master/LICENSE</string> | 
				
			||||||
    <string name="latest_release_url">https://github.com/gedoor/legado/releases/latest</string> | 
					    <string name="latest_release_url" translatable="false">https://github.com/gedoor/legado/releases/latest</string> | 
				
			||||||
    <string name="latest_release_api">https://api.github.com/repos/gedoor/legado/releases/latest</string> | 
					    <string name="latest_release_api" translatable="false">https://api.github.com/repos/gedoor/legado/releases/latest</string> | 
				
			||||||
    <string name="tg_url">https://t.me/legado_channels</string> | 
					    <string name="tg_url" translatable="false">https://t.me/legado_channels</string> | 
				
			||||||
    <string name="discord_url">https://discord.gg/qDE52P5xGW</string> | 
					    <string name="discord_url" translatable="false">https://discord.gg/qDE52P5xGW</string> | 
				
			||||||
 | 
					
 | 
				
			||||||
    <string name="http_ip">http://%1$s:%2$d</string> | 
					    <string name="http_ip" translatable="false">http://%1$s:%2$d</string> | 
				
			||||||
    <string name="git_hub">GitHub</string> | 
					    <string name="git_hub" translatable="false">GitHub</string> | 
				
			||||||
    <string name="diy_edit_source_group_title">【%s】</string> | 
					    <string name="diy_edit_source_group_title" translatable="false">【%s】</string> | 
				
			||||||
    <string name="vip_title">🔒%s</string> | 
					    <string name="vip_title" translatable="false">🔒%s</string> | 
				
			||||||
    <string name="payed_title">🔓%s</string> | 
					    <string name="payed_title" translatable="false">🔓%s</string> | 
				
			||||||
 | 
					
 | 
				
			||||||
    <string name="separator">丨</string> | 
					    <string name="separator" translatable="false">丨</string> | 
				
			||||||
 | 
					
 | 
				
			||||||
</resources> | 
					</resources> | 
				
			||||||
					Loading…
					
					
				
		Reference in new issue