Skip to content

Commit 902814b

Browse files
committed
[fix|optimize|test] Fix some Android 7 adaptation issues; fix edge to edge adaptation issues; optimize experience; update test cases
1 parent bd46cab commit 902814b

27 files changed

+144
-145
lines changed

app/build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ android {
2222
minSdk = 24
2323
targetSdk = 35
2424
versionCode = 26
25-
versionName = "3.1-beta09"
25+
versionName = "3.1-beta10"
2626

2727
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
2828

app/src/androidTest/java/com/skyd/anivu/PeriodicTaskModule.kt

+8-7
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.skyd.anivu
22

33
import android.content.Context
44
import android.util.Log
5+
import androidx.paging.PagingConfig
56
import androidx.sqlite.db.SimpleSQLiteQuery
67
import androidx.test.core.app.ApplicationProvider
78
import androidx.test.ext.junit.runners.AndroidJUnit4
@@ -35,7 +36,6 @@ import com.skyd.anivu.model.preference.data.delete.autodelete.UseAutoDeletePrefe
3536
import com.skyd.anivu.model.preference.rss.RssSyncFrequencyPreference
3637
import com.skyd.anivu.model.repository.RssHelper
3738
import com.skyd.anivu.model.repository.feed.FeedRepository
38-
import com.skyd.anivu.model.repository.feed.ReorderGroupRepository
3939
import com.skyd.anivu.model.worker.deletearticle.DeleteArticleWorker
4040
import com.skyd.anivu.model.worker.deletearticle.listenerDeleteArticleFrequency
4141
import com.skyd.anivu.model.worker.rsssync.RssSyncWorker
@@ -52,7 +52,9 @@ import okhttp3.MediaType.Companion.toMediaType
5252
import okhttp3.OkHttpClient
5353
import okhttp3.logging.HttpLoggingInterceptor
5454
import org.junit.After
55-
import org.junit.Assert.*
55+
import org.junit.Assert.assertFalse
56+
import org.junit.Assert.assertNotEquals
57+
import org.junit.Assert.assertTrue
5658
import org.junit.Before
5759
import org.junit.FixMethodOrder
5860
import org.junit.Test
@@ -88,7 +90,7 @@ class PeriodicTaskModule {
8890
.build()
8991

9092
private val faviconExtractor = FaviconExtractor(retrofit)
91-
93+
private val pagingConfig = PagingConfig(pageSize = 20, enablePlaceholders = false)
9294

9395
private lateinit var context: Context
9496

@@ -97,7 +99,6 @@ class PeriodicTaskModule {
9799
private lateinit var feedDao: FeedDao
98100
private lateinit var articleDao: ArticleDao
99101
private var rssHelper: RssHelper = RssHelper(okHttpClient, faviconExtractor)
100-
private lateinit var reorderGroupRepository: ReorderGroupRepository
101102
private lateinit var feedRepository: FeedRepository
102103

103104
/**
@@ -360,7 +361,8 @@ class PeriodicTaskModule {
360361

361362
assertTrue(
362363
workManager.getWorkInfosForUniqueWorkFlow(DeleteArticleWorker.UNIQUE_WORK_NAME)
363-
.first().run { firstOrNull() == null || first().state == WorkInfo.State.CANCELLED }
364+
.first()
365+
.run { firstOrNull() == null || first().state == WorkInfo.State.CANCELLED }
364366
)
365367
}
366368
}
@@ -383,9 +385,8 @@ class PeriodicTaskModule {
383385
groupDao = db.groupDao()
384386
feedDao = db.feedDao()
385387
articleDao = db.articleDao()
386-
reorderGroupRepository = ReorderGroupRepository(groupDao)
387388
feedRepository =
388-
FeedRepository(groupDao, feedDao, articleDao, reorderGroupRepository, rssHelper)
389+
FeedRepository(groupDao, feedDao, articleDao, rssHelper, pagingConfig)
389390
}
390391

391392
@After

0 commit comments

Comments
 (0)