use findActivity everywhere #15
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -298,10 +298,6 @@ class NewPlayerImpl( | |
| mutableErrorFlow.emit(e) | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -27,6 +27,7 @@ import android.content.ContextWrapper | |
| import android.net.Uri | ||
| import android.os.Build | ||
| import android.os.PowerManager | ||
| import android.view.Window | ||
| import android.view.WindowManager | ||
| import androidx.annotation.OptIn | ||
| import androidx.annotation.RequiresApi | ||
|
|
@@ -55,6 +56,38 @@ import net.newpipe.newplayer.R | |
| import net.newpipe.newplayer.uiModel.EmbeddedUiConfig | ||
| import java.util.Locale | ||
|
|
||
| /** Get the [Activity] from local context. Assumes the activity exists! | ||
| * @return the activity | ||
| * @throws NullPointerException if there is no Activity | ||
| */ | ||
|
There was a problem hiding this comment. Consider adding @hide here, so this function does not show up on the KDoc documentation. |
||
| @Composable | ||
| internal fun activity(): Activity | ||
| = LocalContext.current.findActivity()!! | ||
|
|
||
| /** Call block with the [Activity] from current context, if there is an activity. | ||
| * | ||
| * @param default: the default value if there is no activity | ||
| * @param block: the block to call with the activity | ||
| */ | ||
|
There was a problem hiding this comment. Consider adding @hide here, so this function does not show up on the KDoc documentation. |
||
| @Composable | ||
| internal fun <T>activity(default: T, block: @Composable Activity.() -> T): T = | ||
| when (val a = LocalContext.current.findActivity()) { | ||
| null -> default | ||
| else -> block(a) | ||
| } | ||
|
|
||
|
|
||
| @Composable | ||
|
There was a problem hiding this comment. Consider adding @hide here, so this function does not show up on the KDoc documentation. |
||
| internal fun window(): Window | ||
| = activity().window | ||
|
|
||
| /** @hide */ | ||
| internal fun Context.findActivity(): Activity? = when (this) { | ||
| is Activity -> this | ||
| is ContextWrapper -> baseContext.findActivity() | ||
| else -> null | ||
| } | ||
|
|
||
| @Composable | ||
|
|
||
| /** @hide */ | ||
|
|
@@ -68,9 +101,9 @@ internal fun LockScreenOrientation(orientation: Int) { | |
|
|
||
| @SuppressLint("NewApi") | ||
|
|
||
| /** @return the default brightness of the screen, via window attributes */ | ||
| /** @hide */ | ||
| internal fun Activity.getDefaultBrightness(): Float { | ||
| val layout = window.attributes as WindowManager.LayoutParams | ||
| return if (layout.screenBrightness < 0) 0.5f else layout.screenBrightness | ||
| } | ||
|
|
@@ -86,12 +119,6 @@ internal fun setScreenBrightness(value: Float, activity: Activity) { | |
| } | ||
|
|
||
|
|
||
|
|
||
|
|
||
| @Composable | ||
|
|
@@ -104,19 +131,24 @@ internal fun getLocale(): Locale? { | |
| } | ||
|
|
||
| @Composable | ||
| /** @return A collection of current activity/window configurations */ | ||
| /** @hide */ | ||
| internal fun getEmbeddedUiConfig() | ||
| = activity(EmbeddedUiConfig.DUMMY) { getEmbeddedUiConfig() } | ||
|
|
||
| @Composable | ||
| @ReadOnlyComposable | ||
| /** @return A collection of current activity/window configurations */ | ||
| /** @hide */ | ||
| internal fun Activity.getEmbeddedUiConfig(): EmbeddedUiConfig { | ||
| val view = LocalView.current | ||
|
|
||
| val isLightStatusBar = WindowCompat.getInsetsController( | ||
| window, | ||
| view | ||
| ).isAppearanceLightStatusBars | ||
| val screenOrientation = requestedOrientation | ||
| val defaultBrightness = getDefaultBrightness() | ||
| return EmbeddedUiConfig( | ||
| systemBarInLightMode = isLightStatusBar, | ||
| brightness = defaultBrightness, | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Useful cleanup, but if I'm nitpicky this code change should not be part of this PR.
I don't care too much about this though :P. However, I don't know how other devs feel about this. I'd say do it as you feel best with.