Skip to content

Commit fa1679f

Browse files
author
roman_tcaregorodtcev
committed
Window background annotation bug fixed
1 parent 4bd3235 commit fa1679f

File tree

4 files changed

+19
-19
lines changed

4 files changed

+19
-19
lines changed

core/src/main/java/com/omega_r/base/annotations/OmegaWindowBackground.kt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,22 @@ annotation class OmegaWindowBackground(
1919
@AttrRes val colorAttrRes: Int = 0,
2020
@ColorRes val colorRes: Int = 0
2121
) {
22-
fun apply(window: Window) {
23-
with(window.context) {
24-
when {
25-
drawableRes > 0 -> {
26-
window.setBackgroundDrawable(getCompatDrawable(drawableRes))
22+
companion object {
23+
fun OmegaWindowBackground.apply(window: Window) {
24+
with(window.context) {
25+
when {
26+
drawableRes > 0 -> {
27+
window.setBackgroundDrawable(getCompatDrawable(drawableRes))
28+
}
29+
colorRes > 0 -> {
30+
window.setBackgroundDrawable(ColorDrawable(getCompatColor(colorRes)))
31+
}
32+
colorAttrRes > 0 -> {
33+
window.setBackgroundDrawable(ColorDrawable(getColorByAttribute(colorAttrRes)))
34+
}
35+
}
2736
}
28-
colorRes > 0 -> {
29-
window.setBackgroundDrawable(ColorDrawable(getCompatColor(colorRes)))
30-
}
31-
colorAttrRes > 0 -> {
32-
window.setBackgroundDrawable(ColorDrawable(getColorByAttribute(colorAttrRes)))
33-
}
34-
}
37+
3538
}
3639
}
3740
}

core/src/main/java/com/omega_r/base/components/OmegaActivity.kt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@ package com.omega_r.base.components
33
import android.app.Activity
44
import android.content.Context
55
import android.content.Intent
6-
import android.graphics.drawable.ColorDrawable
76
import android.os.Bundle
8-
import android.os.PersistableBundle
97
import android.view.Menu
108
import android.view.MenuItem
119
import android.view.View
@@ -14,19 +12,16 @@ import androidx.annotation.*
1412
import androidx.appcompat.widget.Toolbar
1513
import androidx.core.app.ActivityCompat
1614
import androidx.core.content.ContextCompat
17-
import androidx.fragment.app.Fragment
1815
import androidx.recyclerview.widget.RecyclerView
1916
import com.omega_r.base.R
2017
import com.omega_r.base.annotations.*
18+
import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
2119
import com.omega_r.base.binders.IdHolder
2220
import com.omega_r.base.binders.managers.BindersManager
2321
import com.omega_r.base.clickers.ClickManager
2422
import com.omega_r.base.mvp.model.Action
2523
import com.omega_r.base.mvp.views.findAnnotation
2624
import com.omega_r.base.tools.DialogManager
27-
import com.omega_r.libs.extensions.context.getColorByAttribute
28-
import com.omega_r.libs.extensions.context.getCompatColor
29-
import com.omega_r.libs.extensions.context.getCompatDrawable
3025
import com.omega_r.libs.omegatypes.Text
3126
import com.omegar.libs.omegalaunchers.ActivityLauncher
3227
import com.omegar.libs.omegalaunchers.BaseIntentLauncher

core/src/main/java/com/omega_r/base/components/OmegaBottomSheetDialogFragment.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import android.view.*
99
import androidx.annotation.*
1010
import androidx.recyclerview.widget.RecyclerView
1111
import com.omega_r.base.annotations.*
12+
import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
1213
import com.omega_r.base.binders.IdHolder
1314
import com.omega_r.base.binders.managers.ResettableBindersManager
1415
import com.omega_r.base.clickers.ClickManager

core/src/main/java/com/omega_r/base/components/OmegaDialogFragment.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@ import android.view.*
99
import androidx.annotation.*
1010
import androidx.recyclerview.widget.RecyclerView
1111
import com.omega_r.base.annotations.*
12+
import com.omega_r.base.annotations.OmegaWindowBackground.Companion.apply
1213
import com.omega_r.base.binders.IdHolder
1314
import com.omega_r.base.binders.managers.ResettableBindersManager
1415
import com.omega_r.base.clickers.ClickManager
15-
import com.omega_r.base.mvp.views.findAnnotation
1616
import com.omega_r.base.mvp.model.Action
17+
import com.omega_r.base.mvp.views.findAnnotation
1718
import com.omega_r.libs.omegatypes.Text
1819
import com.omegar.libs.omegalaunchers.ActivityLauncher
1920
import com.omegar.libs.omegalaunchers.BaseIntentLauncher

0 commit comments

Comments
 (0)