Pixelfed
/
Pixelcat-App-Android
mirror of https://github.com/pixelcatapp/Pixelcat
1
0
Fork 0
Code Issues Releases Wiki Activity

remove duplicate getColorForAttr extension

This commit is contained in:
Konrad Pozniak 2020-09-14 18:00:36 +02:00
parent c1a9897c2a
commit bc8ced0fd2
6 changed files with 7 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/kotlin/at/connyduck/pixelcat/components/compose/SendStatusService.kt
View File

@ -31,7 +31,7 @@ import android.webkit.MimeTypeMap
import androidx.core.app.NotificationCompat
import androidx.core.app.ServiceCompat
import at.connyduck.pixelcat.R
import at.connyduck.pixelcat.components.util.getColorForAttr
import at.connyduck.pixelcat.components.util.extension.getColorForAttr
import at.connyduck.pixelcat.components.util.getMimeType
import at.connyduck.pixelcat.db.AccountManager
import at.connyduck.pixelcat.model.NewStatus

2
app/src/main/kotlin/at/connyduck/pixelcat/components/notifications/NotificationsFragment.kt
View File

@ -30,7 +30,7 @@ import androidx.recyclerview.widget.SimpleItemAnimator
import at.connyduck.pixelcat.R
import at.connyduck.pixelcat.components.profile.ProfileActivity
import at.connyduck.pixelcat.components.timeline.detail.DetailActivity
import at.connyduck.pixelcat.components.util.getColorForAttr
import at.connyduck.pixelcat.components.util.extension.getColorForAttr
import at.connyduck.pixelcat.dagger.ViewModelFactory
import at.connyduck.pixelcat.databinding.FragmentNotificationsBinding
import at.connyduck.pixelcat.db.entitity.StatusEntity

2
app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/TimelineFragment.kt
View File

@ -29,8 +29,8 @@ import androidx.recyclerview.widget.DividerItemDecoration
import androidx.recyclerview.widget.SimpleItemAnimator
import at.connyduck.pixelcat.R
import at.connyduck.pixelcat.components.timeline.detail.DetailActivity
import at.connyduck.pixelcat.components.util.extension.getColorForAttr
import at.connyduck.pixelcat.components.util.extension.getDisplayWidthInPx
import at.connyduck.pixelcat.components.util.getColorForAttr
import at.connyduck.pixelcat.dagger.ViewModelFactory
import at.connyduck.pixelcat.databinding.FragmentTimelineBinding
import at.connyduck.pixelcat.db.entitity.StatusEntity

2
app/src/main/kotlin/at/connyduck/pixelcat/components/timeline/detail/DetailActivity.kt
View File

@ -15,10 +15,10 @@ import at.connyduck.pixelcat.components.timeline.TimeLineActionListener
import at.connyduck.pixelcat.components.util.Error
import at.connyduck.pixelcat.components.util.Loading
import at.connyduck.pixelcat.components.util.Success
import at.connyduck.pixelcat.components.util.extension.getColorForAttr
import at.connyduck.pixelcat.components.util.extension.getDisplayWidthInPx
import at.connyduck.pixelcat.components.util.extension.hide
import at.connyduck.pixelcat.components.util.extension.show
import at.connyduck.pixelcat.components.util.getColorForAttr
import at.connyduck.pixelcat.dagger.ViewModelFactory
import at.connyduck.pixelcat.databinding.ActivityDetailBinding
import at.connyduck.pixelcat.db.entitity.StatusEntity

34
app/src/main/kotlin/at/connyduck/pixelcat/components/util/ThemeUtils.kt
View File

@ -1,34 +0,0 @@
/*
* Copyright (C) 2020 Conny Duck
*
* This file is part of Pixelcat.
*
* Pixelcat is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Pixelcat is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package at.connyduck.pixelcat.components.util
import android.content.Context
import android.util.TypedValue
import androidx.annotation.AttrRes
import androidx.annotation.ColorInt
@ColorInt
fun Context.getColorForAttr(@AttrRes attr: Int): Int {
val value = TypedValue()
if (theme.resolveAttribute(attr, value, true)) {
return value.data
}
throw IllegalStateException("Attribute not found")
}

7
app/src/main/kotlin/at/connyduck/pixelcat/components/util/extension/ContextExtensions.kt
View File

@ -42,9 +42,8 @@ fun Context.getDisplayWidthInPx(): Int {
@ColorInt
fun Context.getColorForAttr(@AttrRes attr: Int): Int {
val value = TypedValue()
return if (this.theme.resolveAttribute(attr, value, true)) {
value.data
} else {
throw IllegalArgumentException()
if (this.theme.resolveAttribute(attr, value, true)) {
return value.data
}
throw IllegalArgumentException("Attribute not found")
}