Skip to content

Commit 5528d0c

Browse files
dogidogi
committed
transer
1 parent 54e81b5 commit 5528d0c

File tree

12 files changed

+39
-39
lines changed

12 files changed

+39
-39
lines changed

‎app/src/main/java/org/ole/planet/myplanet/ui/chat/ChatDetailFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ class ChatDetailFragment : Fragment() {
304304
private fun createProviderButton(context: Context, providerName: String, modelName: String): Button =
305305
Button(context).apply {
306306
text = providerName.lowercase(Locale.getDefault())
307-
setTextColor(ContextCompat.getColor(context, R.color.md_black_1000))
307+
setTextColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_black_1000))
308308
textSize = 18f
309309
setTypeface(null, Typeface.BOLD)
310310
setPadding(16, 8, 16, 8)
@@ -350,7 +350,7 @@ class ChatDetailFragment : Fragment() {
350350
view.setTextColor(ContextCompat.getColor(context, R.color.textColorPrimary))
351351
} else {
352352
view.setBackgroundColor(ContextCompat.getColor(context, R.color.disable_color))
353-
view.setTextColor(ContextCompat.getColor(context, R.color.md_black_1000))
353+
view.setTextColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_black_1000))
354354
}
355355
}
356356
}

‎app/src/main/java/org/ole/planet/myplanet/ui/courses/AdapterProgressGrid.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,9 @@ class AdapterProgressGrid(private val context: Context, private val list: JsonAr
2323
if (list[position].asJsonObject.has("percentage")) {
2424
holder.tvProgress.text = context.getString(R.string.percentage, list[position].asJsonObject["percentage"].asString)
2525
if (list[position].asJsonObject["completed"].asBoolean) {
26-
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.md_green_500))
26+
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_green_500))
2727
} else {
28-
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.md_yellow_500))
28+
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_yellow_500))
2929
}
3030
} else {
3131
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.mainColor))

‎app/src/main/java/org/ole/planet/myplanet/ui/courses/TakeCourseFragment.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
230230
} else {
231231
binding.nextStep.visibility = View.VISIBLE
232232
binding.nextStep.isClickable = true
233-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
233+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
234234
}
235235

236236
updateStepDisplay(position)
@@ -240,14 +240,14 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
240240
if (courseId == "4e6b78800b6ad18b4e8b0e1e38a98cac") {
241241
if (isStepCompleted(mRealm, steps[position - 1]?.id, userModel?.id)) {
242242
binding.nextStep.isClickable = true
243-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
243+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
244244
} else {
245-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_grey_500))
245+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_grey_500))
246246
binding.nextStep.isClickable = false
247247
}
248248
} else {
249249
binding.nextStep.isClickable = true
250-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
250+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
251251
}
252252
}
253253

@@ -256,11 +256,11 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
256256
private fun onClickNext() {
257257
binding.tvStep.text = String.format(Locale.getDefault(), "${getString(R.string.step)} %d/%d", binding.viewPager2.currentItem, steps.size)
258258
if (binding.viewPager2.currentItem >= steps.size) {
259-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_grey_500))
259+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_grey_500))
260260
binding.nextStep.visibility = View.GONE
261261
binding.finishStep.visibility = View.VISIBLE
262262
} else {
263-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
263+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
264264
binding.nextStep.visibility = View.VISIBLE
265265
binding.finishStep.visibility = View.GONE
266266
}
@@ -273,7 +273,7 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
273273
binding.nextStep.visibility = View.VISIBLE
274274
binding.finishStep.visibility = View.GONE
275275
}else{
276-
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
276+
binding.nextStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
277277
binding.nextStep.visibility = View.VISIBLE
278278
binding.finishStep.visibility = View.GONE
279279
}
@@ -340,7 +340,7 @@ class TakeCourseFragment : Fragment(), ViewPager.OnPageChangeListener, View.OnCl
340340
Toast.makeText(context, getString(R.string.please_complete_survey), Toast.LENGTH_SHORT).show() }
341341
} else {
342342
binding.finishStep.isEnabled = true
343-
binding.finishStep.setTextColor(ContextCompat.getColor(requireContext(), R.color.md_white_1000))
343+
binding.finishStep.setTextColor(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_white_1000))
344344
binding.finishStep.setOnClickListener {
345345
NavigationHelper.popBackStack(requireActivity().supportFragmentManager)
346346
}

‎app/src/main/java/org/ole/planet/myplanet/ui/dashboard/BellDashboardFragment.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -112,15 +112,15 @@ class BellDashboardFragment : BaseDashboardFragment() {
112112
}
113113

114114
private suspend fun handleConnectingState() {
115-
setNetworkIndicatorColor(R.color.md_yellow_600)
115+
setNetworkIndicatorColor(com.mikepenz.materialize.R.color.md_yellow_600)
116116
val updateUrl = settings.getString("serverURL", "") ?: return
117117
val mapping = ServerUrlMapper().processUrl(updateUrl)
118118
try {
119119
val reachable = isServerReachable(mapping)
120-
setNetworkIndicatorColor(if (reachable) R.color.green else R.color.md_yellow_600)
120+
setNetworkIndicatorColor(if (reachable) R.color.green else com.mikepenz.materialize.R.color.md_yellow_600)
121121
} catch (e: Exception) {
122122
e.printStackTrace()
123-
setNetworkIndicatorColor(R.color.md_yellow_600)
123+
setNetworkIndicatorColor(com.mikepenz.materialize.R.color.md_yellow_600)
124124
}
125125
}
126126

@@ -129,7 +129,7 @@ class BellDashboardFragment : BaseDashboardFragment() {
129129
context ?: return
130130

131131
when (status) {
132-
is NetworkStatus.Disconnected -> setNetworkIndicatorColor(R.color.md_red_700)
132+
is NetworkStatus.Disconnected -> setNetworkIndicatorColor(com.mikepenz.materialize.R.color.md_red_700)
133133
is NetworkStatus.Connecting -> handleConnectingState()
134134
is NetworkStatus.Connected -> setNetworkIndicatorColor(R.color.green)
135135
}
@@ -380,7 +380,7 @@ class BellDashboardFragment : BaseDashboardFragment() {
380380
if (RealmCertification.isCourseCertified(mRealm, courseId)) {
381381
star.setColorFilter(ContextCompat.getColor(requireContext(), R.color.colorPrimary))
382382
} else {
383-
star.setColorFilter(ContextCompat.getColor(requireContext(), R.color.md_blue_grey_300))
383+
star.setColorFilter(ContextCompat.getColor(requireContext(), com.mikepenz.materialize.R.color.md_blue_grey_300))
384384
}
385385
}
386386

‎app/src/main/java/org/ole/planet/myplanet/ui/dashboard/DashboardActivity.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1007,7 +1007,7 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
10071007
if (AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_NO ||
10081008
(AppCompatDelegate.getDefaultNightMode() == AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM && currentNightMode == Configuration.UI_MODE_NIGHT_NO)) {
10091009
headerBackground.setColorFilter(
1010-
ContextCompat.getColor(this, R.color.md_white_1000),
1010+
ContextCompat.getColor(this, com.mikepenz.materialize.R.color.md_white_1000),
10111011
PorterDuff.Mode.SRC_IN
10121012
)
10131013
}
@@ -1170,9 +1170,9 @@ class DashboardActivity : DashboardElementActivity(), OnHomeItemClickListener, N
11701170
return PrimaryDrawerItem().withName(iconText)
11711171
.withIcon(drawable)
11721172
.withTextColor(ContextCompat.getColor(this, R.color.textColorPrimary))
1173-
.withSelectedTextColor(ContextCompat.getColor(this, R.color.primary_dark))
1173+
.withSelectedTextColor(ContextCompat.getColor(this, com.mikepenz.materialize.R.color.primary_dark))
11741174
.withIconColor(ContextCompat.getColor(this, R.color.textColorPrimary))
1175-
.withSelectedIconColor(ContextCompat.getColor(this, R.color.primary_dark))
1175+
.withSelectedIconColor(ContextCompat.getColor(this, com.mikepenz.materialize.R.color.primary_dark))
11761176
.withSelectedColor(ContextCompat.getColor(this, R.color.textColorPrimary))
11771177
.withIconTintingEnabled(true)
11781178
}

‎app/src/main/java/org/ole/planet/myplanet/ui/myhealth/AdapterHealthExamination.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ class AdapterHealthExamination(private val context: Context, private val list: L
5656
model?.getFullName() ?: createdBy.split(":".toRegex()).dropLastWhile { it.isEmpty() }.toTypedArray().getOrNull(1) ?: createdBy
5757
}
5858
binding.txtDate.text = context.getString(R.string.two_strings, binding.txtDate.text, name).trimIndent()
59-
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.md_grey_50))
59+
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_grey_50))
6060
} else {
6161
binding.txtDate.text = context.getString(R.string.self_examination, binding.txtDate.text)
62-
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, R.color.md_green_50))
62+
holder.itemView.setBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_green_50))
6363
}
6464

6565
binding.txtPulse.text = list?.get(position)?.let { checkEmptyInt(it.pulse) }

‎app/src/main/java/org/ole/planet/myplanet/ui/news/AdapterNews.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,14 +485,14 @@ class AdapterNews(var context: Context, private var currentUser: RealmUserModel?
485485
private fun getNews(holder: RecyclerView.ViewHolder, position: Int): RealmNews? {
486486
val news: RealmNews? = if (parentNews != null) {
487487
if (position == 0) {
488-
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, R.color.md_blue_50))
488+
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_blue_50))
489489
parentNews
490490
} else {
491-
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, R.color.md_white_1000))
491+
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_white_1000))
492492
getItem(position - 1)
493493
}
494494
} else {
495-
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, R.color.md_white_1000))
495+
(holder.itemView as CardView).setCardBackgroundColor(ContextCompat.getColor(context, com.mikepenz.materialize.R.color.md_white_1000))
496496
getItem(position)
497497
}
498498
return news

‎app/src/main/java/org/ole/planet/myplanet/ui/resources/ResourceDetailFragment.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class ResourceDetailFragment : BaseContainerFragment(), OnRatingChangeListener {
7373
val currentUserId = profileDbHandler.userModel?.id
7474
if (currentUserId != null && library.userId?.contains(currentUserId) != true) {
7575
Utilities.toast(activity, getString(R.string.added_to_my_library))
76-
binding.btnRemove.setImageResource(R.drawable.close_x)
76+
binding.btnRemove.setImageResource(eu.fiskur.chipcloud.R.drawable.close_x)
7777
}
7878
}
7979
}
@@ -203,7 +203,7 @@ class ResourceDetailFragment : BaseContainerFragment(), OnRatingChangeListener {
203203
if (isAdd) {
204204
R.drawable.ic_add_library
205205
} else {
206-
R.drawable.close_x
206+
eu.fiskur.chipcloud.R.drawable.close_x
207207
}
208208
)
209209
binding.btnRemove.contentDescription =

‎app/src/main/java/org/ole/planet/myplanet/ui/sync/DashboardElementActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ abstract class DashboardElementActivity : SyncActivity(), FragmentManager.OnBack
190190
}
191191
if (resIcon != null) {
192192
DrawableCompat.setTintMode(resIcon.mutate(), PorterDuff.Mode.SRC_ATOP)
193-
DrawableCompat.setTint(resIcon, ContextCompat.getColor(this, R.color.accent))
193+
DrawableCompat.setTint(resIcon, ContextCompat.getColor(this, com.mikepenz.materialize.R.color.accent))
194194
}
195195
goOnline.icon = resIcon
196196
}

‎app/src/main/java/org/ole/planet/myplanet/ui/viewer/AudioPlayerActivity.kt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ class AudioPlayerActivity : AppCompatActivity() {
5252

5353
binding.trackTitle.text = extractedFileName
5454
binding.artistName.text = resourceTitle
55-
playButton = binding.playerView.findViewById(R.id.exo_play)
56-
pauseButton = binding.playerView.findViewById(R.id.exo_pause)
55+
playButton = binding.playerView.findViewById(androidx.media3.ui.R.id.exo_play)
56+
pauseButton = binding.playerView.findViewById(androidx.media3.ui.R.id.exo_pause)
5757

58-
val overlay = binding.playerView.findViewById<FrameLayout>(R.id.exo_overlay)
58+
val overlay = binding.playerView.findViewById<FrameLayout>(androidx.media3.ui.R.id.exo_overlay)
5959

6060

6161
val blurredImageView = ImageView(this).apply {
@@ -71,7 +71,7 @@ class AudioPlayerActivity : AppCompatActivity() {
7171
.into(blurredImageView)
7272

7373
overlay.addView(blurredImageView, 0)
74-
val controller = binding.playerView.findViewById<View>(R.id.exo_controller)
74+
val controller = binding.playerView.findViewById<View>(androidx.media3.ui.R.id.exo_controller)
7575
controller?.setBackgroundColor(android.graphics.Color.TRANSPARENT)
7676

7777

@@ -91,7 +91,7 @@ class AudioPlayerActivity : AppCompatActivity() {
9191
player.prepare()
9292
player.playWhenReady = true
9393

94-
val controller = binding.playerView.findViewById<View>(R.id.exo_controller)
94+
val controller = binding.playerView.findViewById<View>(androidx.media3.ui.R.id.exo_controller)
9595
controller?.setBackgroundColor(android.graphics.Color.TRANSPARENT)
9696

9797
val timeBar = binding.playerView.findViewById<DefaultTimeBar>(

0 commit comments

Comments
 (0)