Skip to content

Commit 3aeaebb

Browse files
Aidan79225Aidan79225
committed
[Infra] Fix errors to pass the spolessCheck
1 parent f40d255 commit 3aeaebb

File tree

158 files changed

+2491
-1900
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

158 files changed

+2491
-1900
lines changed

‎app/src/main/java/cc/ptt/android/HomeActivity.kt

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,9 @@ import cc.ptt.android.common.KeyboardUtils
1414
import cc.ptt.android.common.StaticValue
1515
import cc.ptt.android.data.preference.MainPreferences
1616
import org.koin.android.ext.android.inject
17-
import java.util.*
1817
import kotlin.math.abs
1918

2019
class HomeActivity : BaseActivity() {
21-
2220
private val mainPreferences: MainPreferences by inject()
2321
private var themeType = 0
2422
private var timeTemp: Long = 0
@@ -28,7 +26,7 @@ class HomeActivity : BaseActivity() {
2826
setTheme(R.style.AppTheme)
2927
super.onCreate(savedInstanceState)
3028
themeType = mainPreferences.getThemeType()
31-
StaticValue.ThemMode = themeType
29+
StaticValue.themMode = themeType
3230
when (themeType) {
3331
1 -> {
3432
AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO)
@@ -56,7 +54,7 @@ class HomeActivity : BaseActivity() {
5654
val metrics = DisplayMetrics()
5755
windowManager.defaultDisplay.getMetrics(metrics)
5856
StaticValue.densityDpi = metrics.densityDpi.toDouble()
59-
StaticValue.ScreenDensity = metrics.density.toDouble()
57+
StaticValue.screenDensity = metrics.density.toDouble()
6058
StaticValue.widthPixels = metrics.widthPixels.toDouble()
6159
StaticValue.highPixels = metrics.heightPixels.toDouble()
6260
StaticValue.backgroundColor = ContextCompat.getColor(this, cc.ptt.android.data.R.color.darkGreyTwo)
@@ -69,20 +67,21 @@ class HomeActivity : BaseActivity() {
6967
KeyboardUtils.hideSoftInput(this)
7068
}
7169

72-
private val backPressedCallback = object : OnBackPressedCallback(true) {
73-
override fun handleOnBackPressed() {
74-
if (Navigation.isRoot(this@HomeActivity)) {
75-
Navigation.popup(this@HomeActivity)
76-
} else {
77-
val currentTime = System.currentTimeMillis()
78-
if (abs(timeTemp - currentTime) > 1500) {
79-
Toast.makeText(this@HomeActivity, getString(R.string.press_again_to_leave), Toast.LENGTH_SHORT).show()
80-
timeTemp = currentTime
70+
private val backPressedCallback =
71+
object : OnBackPressedCallback(true) {
72+
override fun handleOnBackPressed() {
73+
if (Navigation.isRoot(this@HomeActivity)) {
74+
Navigation.popup(this@HomeActivity)
8175
} else {
82-
finish()
83-
System.gc()
76+
val currentTime = System.currentTimeMillis()
77+
if (abs(timeTemp - currentTime) > 1500) {
78+
Toast.makeText(this@HomeActivity, getString(R.string.press_again_to_leave), Toast.LENGTH_SHORT).show()
79+
timeTemp = currentTime
80+
} else {
81+
finish()
82+
System.gc()
83+
}
8484
}
8585
}
8686
}
87-
}
8887
}

‎app/src/main/java/cc/ptt/android/Navigation.kt

Lines changed: 37 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -10,40 +10,50 @@ import cc.ptt.android.common.extension.navigateForward
1010
import cc.ptt.android.data.model.remote.board.article.Article
1111

1212
object Navigation {
13-
1413
fun switchToLoginPage(activity: FragmentActivity) {
1514
getNavController(activity)?.navigateForward(
1615
R.id.include_login,
1716
Bundle(),
1817
isSingleTop = false,
19-
useDefaultAnim = true
18+
useDefaultAnim = true,
2019
)
2120
}
2221

23-
fun switchToArticleListPage(activity: FragmentActivity, title: String, subtitle: String, boardId: String) {
24-
val args = Bundle().apply {
25-
putString(ArticleListFragment.KEY_TITLE, title)
26-
putString(ArticleListFragment.KEY_SUBTITLE, subtitle)
27-
putString(ArticleListFragment.KEY_BOARD_ID, boardId)
28-
}
22+
fun switchToArticleListPage(
23+
activity: FragmentActivity,
24+
title: String,
25+
subtitle: String,
26+
boardId: String,
27+
) {
28+
val args =
29+
Bundle().apply {
30+
putString(ArticleListFragment.KEY_TITLE, title)
31+
putString(ArticleListFragment.KEY_SUBTITLE, subtitle)
32+
putString(ArticleListFragment.KEY_BOARD_ID, boardId)
33+
}
2934
getNavController(activity)?.navigateForward(
3035
R.id.articleListFragment,
3136
args,
3237
isSingleTop = false,
33-
useDefaultAnim = true
38+
useDefaultAnim = true,
3439
)
3540
}
3641

37-
fun switchToArticleReadPage(activity: FragmentActivity, article: Article?, boardName: String) {
38-
val args = Bundle().apply {
39-
putParcelable(ArticleReadFragment.KEY_ARTICLE, article)
40-
putString(ArticleReadFragment.KEY_BOARD_NAME, boardName)
41-
}
42+
fun switchToArticleReadPage(
43+
activity: FragmentActivity,
44+
article: Article?,
45+
boardName: String,
46+
) {
47+
val args =
48+
Bundle().apply {
49+
putParcelable(ArticleReadFragment.KEY_ARTICLE, article)
50+
putString(ArticleReadFragment.KEY_BOARD_NAME, boardName)
51+
}
4252
getNavController(activity)?.navigateForward(
4353
R.id.articleReadFragment,
4454
args,
4555
isSingleTop = false,
46-
useDefaultAnim = true
56+
useDefaultAnim = true,
4757
)
4858
}
4959

@@ -52,7 +62,7 @@ object Navigation {
5262
R.id.articleListSearchFragment,
5363
Bundle(),
5464
isSingleTop = false,
55-
useDefaultAnim = true
65+
useDefaultAnim = true,
5666
)
5767
}
5868

@@ -61,7 +71,7 @@ object Navigation {
6171
R.id.postArticleFragment,
6272
Bundle(),
6373
isSingleTop = false,
64-
useDefaultAnim = true
74+
useDefaultAnim = true,
6575
)
6676
}
6777

@@ -70,7 +80,7 @@ object Navigation {
7080
R.id.searchBoardsFragment,
7181
Bundle(),
7282
isSingleTop = false,
73-
useDefaultAnim = false
83+
useDefaultAnim = false,
7484
)
7585
}
7686

@@ -79,19 +89,21 @@ object Navigation {
7989
R.id.hotArticleFilterFragment,
8090
Bundle(),
8191
isSingleTop = false,
82-
useDefaultAnim = false
92+
useDefaultAnim = false,
8393
)
8494
}
8595

8696
fun popup(activity: FragmentActivity) {
8797
getNavController(activity)?.popBackStack()
8898
}
8999

90-
fun isRoot(activity: FragmentActivity): Boolean {
91-
return activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment)?.childFragmentManager?.fragments.isNullOrEmpty()
92-
}
100+
fun isRoot(activity: FragmentActivity): Boolean =
101+
activity.supportFragmentManager
102+
.findFragmentById(R.id.nav_host_fragment)
103+
?.childFragmentManager
104+
?.fragments
105+
.isNullOrEmpty()
93106

94-
private fun getNavController(activity: FragmentActivity): NavController? {
95-
return (activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment)?.navController
96-
}
107+
private fun getNavController(activity: FragmentActivity): NavController? =
108+
(activity.supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as? NavHostFragment)?.navController
97109
}

‎app/src/main/java/cc/ptt/android/PttApplication.kt

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,18 @@ package cc.ptt.android
22

33
import android.app.Application
44
import cc.ptt.android.common.di.commonModules
5-
import cc.ptt.android.data.di.*
6-
import cc.ptt.android.di.*
5+
import cc.ptt.android.data.di.apiModules
6+
import cc.ptt.android.data.di.localDataSourceModules
7+
import cc.ptt.android.data.di.preferenceModules
8+
import cc.ptt.android.data.di.remoteDataSourceModules
9+
import cc.ptt.android.data.di.repositoryModules
10+
import cc.ptt.android.di.viewModelModules
711
import cc.ptt.android.domain.di.useCaseModules
812
import kotlinx.coroutines.FlowPreview
913
import org.koin.android.ext.koin.androidContext
1014
import org.koin.core.context.GlobalContext.startKoin
1115

1216
class PttApplication : Application() {
13-
1417
@FlowPreview
1518
override fun onCreate() {
1619
super.onCreate()
@@ -27,7 +30,7 @@ class PttApplication : Application() {
2730
viewModelModules,
2831
commonModules,
2932
preferenceModules,
30-
)
33+
),
3134
)
3235
}
3336
}

‎app/src/main/java/cc/ptt/android/articlelist/ArticleListAdapter.kt

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,8 @@ import cc.ptt.android.databinding.ArticleListItemDeleteBinding
1212

1313
class ArticleListAdapter(
1414
private val articleList: MutableList<Article> = mutableListOf(),
15-
private val mOnItemClickListener: OnItemClickListener
15+
private val mOnItemClickListener: OnItemClickListener,
1616
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
17-
1817
private var selectArticle: Article? = null
1918

2019
@SuppressLint("NotifyDataSetChanged")
@@ -24,38 +23,43 @@ class ArticleListAdapter(
2423
notifyDataSetChanged()
2524
}
2625

27-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
28-
return when (viewType) {
26+
override fun onCreateViewHolder(
27+
parent: ViewGroup,
28+
viewType: Int,
29+
): RecyclerView.ViewHolder =
30+
when (viewType) {
2931
ViewHolderType.Normal.ordinal -> {
3032
PostViewHolder(
3133
ArticleListItemBinding.inflate(
3234
LayoutInflater.from(parent.context),
3335
parent,
34-
false
35-
)
36+
false,
37+
),
3638
)
3739
}
40+
3841
else -> {
3942
DeletedViewHolder(
4043
ArticleListItemDeleteBinding.inflate(
4144
LayoutInflater.from(parent.context),
4245
parent,
43-
false
44-
)
46+
false,
47+
),
4548
)
4649
}
4750
}
48-
}
4951

50-
override fun getItemViewType(position: Int): Int {
51-
return if (articleList[position].deleted) {
52+
override fun getItemViewType(position: Int): Int =
53+
if (articleList[position].deleted) {
5254
ViewHolderType.Deleted.ordinal
5355
} else {
5456
ViewHolderType.Normal.ordinal
5557
}
56-
}
5758

58-
override fun onBindViewHolder(viewHolder: RecyclerView.ViewHolder, position: Int) {
59+
override fun onBindViewHolder(
60+
viewHolder: RecyclerView.ViewHolder,
61+
position: Int,
62+
) {
5963
val article = articleList[position]
6064
if (viewHolder is PostViewHolder) {
6165
viewHolder.onBind(article, article == selectArticle)
@@ -72,12 +76,11 @@ class ArticleListAdapter(
7276
}
7377
}
7478

75-
override fun getItemCount(): Int {
76-
return articleList.size
77-
}
79+
override fun getItemCount(): Int = articleList.size
7880

7981
enum class ViewHolderType {
80-
Normal, Deleted
82+
Normal,
83+
Deleted,
8184
}
8285

8386
interface OnItemClickListener {

0 commit comments

Comments
 (0)