Skip to content

Commit

Permalink
v3.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
15dd committed Oct 7, 2024
1 parent efa8cdf commit ed276d7
Show file tree
Hide file tree
Showing 133 changed files with 559 additions and 539 deletions.
2 changes: 1 addition & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ plugins {
}

android {
namespace = "com.cyh128.hikarinovel"
namespace = "com.cyh128.hikari_novel"
compileSdk = 34

defaultConfig {
Expand Down
Binary file added app/debug/app-debug.apk
Binary file not shown.
21 changes: 21 additions & 0 deletions app/debug/output-metadata.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"version": 3,
"artifactType": {
"type": "APK",
"kind": "Directory"
},
"applicationId": "com.cyh128.hikari_novel",
"variantName": "debug",
"elements": [
{
"type": "SINGLE",
"filters": [],
"attributes": [],
"versionCode": 241007,
"versionName": "3.1.0",
"outputFile": "app-debug.apk"
}
],
"elementType": "File",
"minSdkVersionForDexing": 24
}
Binary file modified app/release/app-release.apk
Binary file not shown.
Binary file modified app/release/baselineProfiles/0/app-release.dm
Binary file not shown.
Binary file modified app/release/baselineProfiles/1/app-release.dm
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel
package com.cyh128.hikari_novel

import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.platform.app.InstrumentationRegistry
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cyh128.hikarinovel
package com.cyh128.hikari_novel

import android.app.Application
import com.cyh128.hikarinovel.ui.view.other.CrashActivity
import com.cyh128.hikari_novel.ui.view.other.CrashActivity
import com.developer.crashx.config.CrashConfig
import com.google.android.material.color.DynamicColors
import com.tencent.mmkv.MMKV
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.base
package com.cyh128.hikari_novel.base

import android.os.Bundle
import android.view.LayoutInflater
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.base
package com.cyh128.hikari_novel.base

import android.os.Bundle
import android.view.LayoutInflater
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.base
package com.cyh128.hikari_novel.base

import android.os.Bundle
import android.view.LayoutInflater
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.cyh128.hikarinovel.data.di
package com.cyh128.hikari_novel.data.di

import android.content.Context
import androidx.room.Room
import com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryDatabase
import com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryDatabase
import com.cyh128.hikarinovel.data.source.local.database.search_history.SearchHistoryDatabase
import com.cyh128.hikarinovel.data.source.local.database.visit_history.VisitHistoryDatabase
import com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryDatabase
import com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryDatabase
import com.cyh128.hikari_novel.data.source.local.database.search_history.SearchHistoryDatabase
import com.cyh128.hikari_novel.data.source.local.database.visit_history.VisitHistoryDatabase
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class BookshelfNovelInfo(
val bid: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class Comment(
val replyUrl: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

enum class DefaultTab {
Home,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

sealed class Event {
data object LoadSuccessEvent: Event() //加载内容成功
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

//网络错误异常
class NetworkException(message: String?): Exception(message)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class HomeBlock(
val title: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class HorizontalRead(
val title: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

enum class Language {
FOLLOW_SYSTEM,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.cyh128.hikari_novel.data.model

enum class LoadMode { REFRESH, LOADMORE }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

import android.os.Parcelable
import kotlinx.parcelize.Parcelize
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class NovelCover(
val title: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class NovelInfo (
var title: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class ReadChapter(
val volumePos: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

import android.os.Parcelable
import kotlinx.parcelize.Parcelize
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

enum class ReaderOrientation {
Vertical, Horizontal
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class NovelCoverResponse(
val maxNum: Int,
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
package com.cyh128.hikari_novel.data.model

enum class SearchMode { TITLE, AUTHOR }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.model
package com.cyh128.hikari_novel.data.model

data class UserInfo(
val avatar: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import android.accounts.NetworkErrorException
import android.content.pm.PackageManager
import com.cyh128.hikarinovel.HikariApp
import com.cyh128.hikarinovel.data.model.DefaultTab
import com.cyh128.hikarinovel.data.model.Language
import com.cyh128.hikarinovel.data.model.ReaderOrientation
import com.cyh128.hikarinovel.data.source.local.mmkv.AppConfig
import com.cyh128.hikarinovel.data.source.remote.Network
import com.cyh128.hikari_novel.HikariApp
import com.cyh128.hikari_novel.data.model.DefaultTab
import com.cyh128.hikari_novel.data.model.Language
import com.cyh128.hikari_novel.data.model.ReaderOrientation
import com.cyh128.hikari_novel.data.source.local.mmkv.AppConfig
import com.cyh128.hikari_novel.data.source.remote.Network
import com.google.gson.Gson
import rxhttp.awaitResult
import javax.inject.Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.model.BookshelfNovelInfo
import com.cyh128.hikari_novel.data.model.BookshelfNovelInfo
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.flow.asStateFlow
import javax.inject.Inject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryDao
import com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryEntity
import com.cyh128.hikarinovel.data.source.local.mmkv.HorizontalReadConfig
import com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryDao
import com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history.HorizontalReadHistoryEntity
import com.cyh128.hikari_novel.data.source.local.mmkv.HorizontalReadConfig
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.source.local.mmkv.ReadColorConfig
import com.cyh128.hikari_novel.data.source.local.mmkv.ReadColorConfig
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.source.local.database.search_history.SearchHistoryDao
import com.cyh128.hikarinovel.data.source.local.database.search_history.SearchHistoryEntity
import com.cyh128.hikari_novel.data.source.local.database.search_history.SearchHistoryDao
import com.cyh128.hikari_novel.data.source.local.database.search_history.SearchHistoryEntity
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryDao
import com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryEntity
import com.cyh128.hikarinovel.data.source.local.mmkv.VerticalReadConfig
import com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryDao
import com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history.VerticalReadHistoryEntity
import com.cyh128.hikari_novel.data.source.local.mmkv.VerticalReadConfig
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.source.local.database.visit_history.VisitHistoryDao
import com.cyh128.hikarinovel.data.source.local.database.visit_history.VisitHistoryEntity
import com.cyh128.hikari_novel.data.source.local.database.visit_history.VisitHistoryDao
import com.cyh128.hikari_novel.data.source.local.database.visit_history.VisitHistoryEntity
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
package com.cyh128.hikarinovel.data.repository
package com.cyh128.hikari_novel.data.repository

import com.cyh128.hikarinovel.data.model.BookshelfNovelInfo
import com.cyh128.hikarinovel.data.model.ChapterContentResponse
import com.cyh128.hikarinovel.data.model.CommentResponse
import com.cyh128.hikarinovel.data.model.HomeBlock
import com.cyh128.hikarinovel.data.model.InFiveSecondException
import com.cyh128.hikarinovel.data.model.LoginResponse
import com.cyh128.hikarinovel.data.model.NetworkException
import com.cyh128.hikarinovel.data.model.NovelCoverResponse
import com.cyh128.hikarinovel.data.model.NovelInfo
import com.cyh128.hikarinovel.data.model.ReplyResponse
import com.cyh128.hikarinovel.data.model.SignedInException
import com.cyh128.hikarinovel.data.model.TempSignInException
import com.cyh128.hikarinovel.data.model.UserInfo
import com.cyh128.hikarinovel.data.model.Volume
import com.cyh128.hikarinovel.data.source.local.mmkv.AppConfig
import com.cyh128.hikarinovel.data.source.local.mmkv.LoginInfo
import com.cyh128.hikarinovel.data.source.remote.Network
import com.cyh128.hikarinovel.util.HttpCodeParser
import com.cyh128.hikarinovel.util.Wenku8Parser
import com.cyh128.hikarinovel.util.urlEncode
import com.cyh128.hikari_novel.data.model.BookshelfNovelInfo
import com.cyh128.hikari_novel.data.model.ChapterContentResponse
import com.cyh128.hikari_novel.data.model.CommentResponse
import com.cyh128.hikari_novel.data.model.HomeBlock
import com.cyh128.hikari_novel.data.model.InFiveSecondException
import com.cyh128.hikari_novel.data.model.LoginResponse
import com.cyh128.hikari_novel.data.model.NetworkException
import com.cyh128.hikari_novel.data.model.NovelCoverResponse
import com.cyh128.hikari_novel.data.model.NovelInfo
import com.cyh128.hikari_novel.data.model.ReplyResponse
import com.cyh128.hikari_novel.data.model.SignedInException
import com.cyh128.hikari_novel.data.model.TempSignInException
import com.cyh128.hikari_novel.data.model.UserInfo
import com.cyh128.hikari_novel.data.model.Volume
import com.cyh128.hikari_novel.data.source.local.mmkv.AppConfig
import com.cyh128.hikari_novel.data.source.local.mmkv.LoginInfo
import com.cyh128.hikari_novel.data.source.remote.Network
import com.cyh128.hikari_novel.util.HttpCodeParser
import com.cyh128.hikari_novel.util.Wenku8Parser
import com.cyh128.hikari_novel.util.urlEncode
import com.yariksoffice.lingver.Lingver
import rxhttp.awaitResult
import java.nio.charset.Charset
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history

abstract class BaseReadHistoryEntity(
open val cid: String,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history

import androidx.room.Dao
import androidx.room.Query
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history

import androidx.room.Database
import androidx.room.RoomDatabase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.horizontal_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.horizontal_read_history

import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.cyh128.hikarinovel.data.source.local.database.read_history.BaseReadHistoryEntity
import com.cyh128.hikari_novel.data.source.local.database.read_history.BaseReadHistoryEntity

//名称和表的结构不要修改,除非做数据迁移Migration,否则数据会丢失
@Entity(tableName = "horizontal_read_history")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history

import androidx.room.Dao
import androidx.room.Query
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history

import androidx.room.Database
import androidx.room.RoomDatabase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.cyh128.hikarinovel.data.source.local.database.read_history.vertical_read_history
package com.cyh128.hikari_novel.data.source.local.database.read_history.vertical_read_history

import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.PrimaryKey
import com.cyh128.hikarinovel.data.source.local.database.read_history.BaseReadHistoryEntity
import com.cyh128.hikari_novel.data.source.local.database.read_history.BaseReadHistoryEntity

//名称和表的结构不要修改,除非做数据迁移Migration,否则数据会丢失
@Entity(tableName = "vertical_read_history")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.search_history
package com.cyh128.hikari_novel.data.source.local.database.search_history

import androidx.room.Dao
import androidx.room.Query
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.search_history
package com.cyh128.hikari_novel.data.source.local.database.search_history

import androidx.room.Database
import androidx.room.RoomDatabase
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.cyh128.hikarinovel.data.source.local.database.search_history
package com.cyh128.hikari_novel.data.source.local.database.search_history

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
Loading

0 comments on commit ed276d7

Please sign in to comment.