Skip to content

Commit 4eb89aa

Browse files
committed
Change the prefix for resource names to 'ycdev'
1 parent c21b94c commit 4eb89aa

27 files changed

+160
-159
lines changed

uiLib/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ android {
1111
minSdkVersion versions.minSdk
1212
}
1313

14+
resourcePrefix 'ycdev'
1415
viewBinding.enabled = true
1516

1617
lintOptions {

uiLib/src/main/java/me/ycdev/android/lib/commonui/activity/GridEntriesActivity.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import me.ycdev.android.lib.common.utils.IntentUtils.INTENT_TYPE_ACTIVITY
2020
import me.ycdev.android.lib.common.utils.IntentUtils.INTENT_TYPE_BROADCAST
2121
import me.ycdev.android.lib.common.wrapper.BroadcastHelper
2222
import me.ycdev.android.lib.commonui.R
23-
import me.ycdev.android.lib.commonui.databinding.CommonuiGridEntriesItemBinding
23+
import me.ycdev.android.lib.commonui.databinding.YcdevGridEntriesItemBinding
2424
import me.ycdev.android.lib.commonui.recyclerview.MarginItemDecoration
2525

2626
@Suppress("MemberVisibilityCanBePrivate", "unused")
@@ -31,7 +31,7 @@ abstract class GridEntriesActivity : AppCompatActivity() {
3131
protected lateinit var loadingView: ProgressBar
3232

3333
protected open val contentViewLayout: Int
34-
@LayoutRes get() = R.layout.commonui_grid_entries
34+
@LayoutRes get() = R.layout.ycdev_grid_entries
3535

3636
protected abstract val intents: List<Entry>
3737

@@ -91,7 +91,7 @@ abstract class GridEntriesActivity : AppCompatActivity() {
9191
}
9292

9393
open fun getGridEntriesMargin(): Int {
94-
val a = obtainStyledAttributes(intArrayOf(R.attr.commonuiGridEntriesItemMargin))
94+
val a = obtainStyledAttributes(intArrayOf(R.attr.ycdevGridEntriesItemMargin))
9595
val margin: Int = a.getDimensionPixelSize(0, 0)
9696
a.recycle()
9797
return margin
@@ -140,7 +140,7 @@ abstract class GridEntriesActivity : AppCompatActivity() {
140140

141141
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder {
142142
val itemView = LayoutInflater.from(context)
143-
.inflate(R.layout.commonui_grid_entries_item, parent, false)
143+
.inflate(R.layout.ycdev_grid_entries_item, parent, false)
144144
return ViewHolder(itemView)
145145
}
146146

@@ -156,7 +156,7 @@ abstract class GridEntriesActivity : AppCompatActivity() {
156156
}
157157

158158
class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
159-
val binding: CommonuiGridEntriesItemBinding = CommonuiGridEntriesItemBinding.bind(itemView)
159+
val binding: YcdevGridEntriesItemBinding = YcdevGridEntriesItemBinding.bind(itemView)
160160
}
161161
}
162162
}

uiLib/src/main/java/me/ycdev/android/lib/commonui/base/LoadingAsyncTaskBase.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import me.ycdev.android.lib.commonui.R
88
abstract class LoadingAsyncTaskBase<Params, Result> : WaitingAsyncTaskBase<Params, Int, Result> {
99

1010
override val initMessage: String
11-
get() = activity.getString(R.string.commonui_tips_loading_percent, 0)
11+
get() = activity.getString(R.string.ycdev_tips_loading_percent, 0)
1212

1313
constructor(activity: Activity) : super(activity)
1414

@@ -21,7 +21,7 @@ abstract class LoadingAsyncTaskBase<Params, Result> : WaitingAsyncTaskBase<Param
2121
override fun onProgressUpdate(vararg values: Int?) {
2222
val percent = values[0]
2323
if (dialog.isShowing) {
24-
dialog.setMessage(activity.getString(R.string.commonui_tips_loading_percent, percent))
24+
dialog.setMessage(activity.getString(R.string.ycdev_tips_loading_percent, percent))
2525
}
2626
}
2727
}

uiLib/src/main/java/me/ycdev/android/lib/commonui/base/WaitingAsyncTaskBase.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ abstract class WaitingAsyncTaskBase<Params, Progress, Result> constructor(
1919
protected lateinit var dialog: ProgressDialog
2020

2121
protected open val initMessage: String
22-
get() = activity.getString(R.string.commonui_tips_loading)
22+
get() = activity.getString(R.string.ycdev_tips_loading)
2323

2424
fun setAutoFinishWhenCanceled(autoFinishWhenCanceled: Boolean) {
2525
mAutoFinishWhenCanceled = autoFinishWhenCanceled

uiLib/src/main/res/drawable/commonui_grid_entries_item_bkg.xml

Lines changed: 0 additions & 8 deletions
This file was deleted.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
<item android:drawable="@color/ycdev_grid_entries_item_bkg_pressed" android:state_pressed="true"/>
5+
<item android:drawable="@color/ycdev_grid_entries_item_bkg_focused" android:state_focused="true"/>
6+
<item android:drawable="@color/ycdev_grid_entries_item_bkg_normal"/>
7+
8+
</selector>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:drawable="@drawable/commonui_scrollbar_thumb_normal" />
3+
<item android:drawable="@drawable/ycdev_scrollbar_thumb_normal" />
44
</selector>
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3-
<item android:drawable="@drawable/commonui_scrollbar_track_normal" />
3+
<item android:drawable="@drawable/ycdev_scrollbar_track_normal" />
44
</selector>

0 commit comments

Comments
 (0)