mirror of
https://github.com/TeamNewPipe/NewPipe.git
synced 2024-11-23 11:32:32 +01:00
Merge pull request #3774 from eames-palmer/status-bar-color
Update status color to match toolbar color
This commit is contained in:
commit
5e9dce7d39
@ -34,8 +34,6 @@ import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.view.Window;
|
||||
import android.view.WindowManager;
|
||||
import android.widget.AdapterView;
|
||||
import android.widget.ArrayAdapter;
|
||||
import android.widget.Button;
|
||||
@ -127,12 +125,6 @@ public class MainActivity extends AppCompatActivity {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.activity_main);
|
||||
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
|
||||
Window w = getWindow();
|
||||
w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS,
|
||||
WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
|
||||
}
|
||||
|
||||
if (getSupportFragmentManager() != null
|
||||
&& getSupportFragmentManager().getBackStackEntryCount() == 0) {
|
||||
initFragments();
|
||||
|
@ -34,19 +34,19 @@
|
||||
<!-- PeerTube -->
|
||||
<style name="LightTheme.PeerTube" parent="LightTheme">
|
||||
<item name="colorPrimary">@color/light_peertube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_peertube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_peertube_statusbar_color</item>
|
||||
<item name="colorAccent">@color/light_peertube_accent_color</item>
|
||||
</style>
|
||||
|
||||
<style name="DarkTheme.PeerTube" parent="DarkTheme">
|
||||
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
|
||||
<item name="colorAccent">@color/dark_peertube_accent_color</item>
|
||||
</style>
|
||||
|
||||
<style name="BlackTheme.PeerTube" parent="BlackTheme">
|
||||
<item name="colorPrimary">@color/dark_peertube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_peertube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_peertube_statusbar_color</item>
|
||||
<item name="colorAccent">@color/dark_peertube_accent_color</item>
|
||||
</style>
|
||||
|
||||
|
@ -4,44 +4,44 @@
|
||||
<color name="light_youtube_primary_color">#e53935</color>
|
||||
<color name="light_youtube_dark_color">#992722</color>
|
||||
<color name="light_youtube_accent_color">#000000</color>
|
||||
<color name="light_youtube_statusbar_color">#ff4336</color>
|
||||
<color name="light_youtube_statusbar_color">#e53935</color>
|
||||
|
||||
<color name="dark_youtube_primary_color">#CD322E</color>
|
||||
<color name="dark_youtube_dark_color">#992722</color>
|
||||
<color name="dark_youtube_accent_color">#FFFFFF</color>
|
||||
<color name="dark_youtube_statusbar_color">#ff4336</color>
|
||||
<color name="dark_youtube_statusbar_color">#CD322E</color>
|
||||
|
||||
<!-- SoundCloud -->
|
||||
<color name="light_soundcloud_primary_color">#f57c00</color>
|
||||
<color name="light_soundcloud_dark_color">#995700</color>
|
||||
<color name="light_soundcloud_accent_color">#000000</color>
|
||||
<color name="light_soundcloud_statusbar_color">#ff9100</color>
|
||||
<color name="light_soundcloud_statusbar_color">#f57c00</color>
|
||||
|
||||
<color name="dark_soundcloud_primary_color">#f57c00</color>
|
||||
<color name="dark_soundcloud_dark_color">#995700</color>
|
||||
<color name="dark_soundcloud_accent_color">#FFFFFF</color>
|
||||
<color name="dark_soundcloud_statusbar_color">#ff9100</color>
|
||||
<color name="dark_soundcloud_statusbar_color">#f57c00</color>
|
||||
|
||||
<!-- PeerTube -->
|
||||
<color name="light_peertube_primary_color">#ff6f00</color>
|
||||
<color name="light_peertube_dark_color">#c43e00</color>
|
||||
<color name="light_peertube_accent_color">#000000</color>
|
||||
<color name="light_peertube_statusbar_color">#ff833a</color>
|
||||
<color name="light_peertube_statusbar_color">#ff6f00</color>
|
||||
|
||||
<color name="dark_peertube_primary_color">#ff6f00</color>
|
||||
<color name="dark_peertube_dark_color">#c43e00</color>
|
||||
<color name="dark_peertube_accent_color">#FFFFFF</color>
|
||||
<color name="dark_peertube_statusbar_color">#ff833a</color>
|
||||
<color name="dark_peertube_statusbar_color">#ff6f00</color>
|
||||
|
||||
<!-- Media.CCC -->
|
||||
<color name="light_media_ccc_primary_color">#9e9e9e</color>
|
||||
<color name="light_media_ccc_dark_color">#616161</color>
|
||||
<color name="light_media_ccc_accent_color">#000000</color>
|
||||
<color name="light_media_ccc_statusbar_color">#afafaf</color>
|
||||
<color name="light_media_ccc_statusbar_color">#9e9e9e</color>
|
||||
|
||||
<color name="dark_media_ccc_primary_color">#9e9e9e</color>
|
||||
<color name="dark_media_ccc_dark_color">#616161</color>
|
||||
<color name="dark_media_ccc_accent_color">#FFFFFF</color>
|
||||
<color name="dark_media_ccc_statusbar_color">#afafaf</color>
|
||||
<color name="dark_media_ccc_statusbar_color">#9e9e9e</color>
|
||||
|
||||
</resources>
|
@ -12,7 +12,7 @@
|
||||
|
||||
<style name="LightTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_background_color</item>
|
||||
<item name="windowBackground">@color/light_background_color</item>
|
||||
@ -119,7 +119,7 @@
|
||||
<style name="Base.DarkTheme" parent="Base.V7.DarkTheme" />
|
||||
<style name="DarkTheme" parent="Base.DarkTheme">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_background_color</item>
|
||||
<item name="windowBackground">@color/dark_background_color</item>
|
||||
@ -240,7 +240,7 @@
|
||||
<!-- Dialogs -->
|
||||
<style name="LightDialogTheme" parent="Theme.AppCompat.Light.Dialog">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/light_dialog_background_color</item>
|
||||
@ -248,7 +248,7 @@
|
||||
|
||||
<style name="DarkDialogTheme" parent="Theme.AppCompat.Dialog">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/dark_dialog_background_color</item>
|
||||
@ -256,7 +256,7 @@
|
||||
|
||||
<style name="LightDialogMinWidthTheme" parent="Theme.AppCompat.Light.Dialog.MinWidth">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/light_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/light_dialog_background_color</item>
|
||||
@ -264,7 +264,7 @@
|
||||
|
||||
<style name="DarkDialogMinWidthTheme" parent="Theme.AppCompat.Dialog.MinWidth">
|
||||
<item name="colorPrimary">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/dark_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/dark_youtube_accent_color</item>
|
||||
<item name="android:windowBackground">@color/dark_dialog_background_color</item>
|
||||
<item name="windowBackground">@color/dark_dialog_background_color</item>
|
||||
@ -289,7 +289,7 @@
|
||||
|
||||
<style name="OldVideoPlayerTheme" parent="Theme.AppCompat.Light.DarkActionBar">
|
||||
<item name="colorPrimary">@color/light_youtube_primary_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_dark_color</item>
|
||||
<item name="colorPrimaryDark">@color/light_youtube_primary_color</item>
|
||||
<item name="colorAccent">@color/light_youtube_accent_color</item>
|
||||
<item name="android:windowFullscreen">false</item>
|
||||
<item name="android:windowActionBarOverlay">true</item>
|
||||
|
Loading…
Reference in New Issue
Block a user