ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7355 from hackbar/style-cleanup 

Style cleanup
This commit is contained in:
Pierre Bourdon 2018-08-27 04:32:50 +02:00 committed by GitHub
parent 045b9a97b5 fda785c452
commit b571d0c537
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Android/app/src/main/AndroidManifest.xml
View File

@ -31,7 +31,7 @@
<activity
android:name=".ui.main.MainActivity"
android:theme="@style/DolphinGamecube">
android:theme="@style/DolphinBase">
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
<intent-filter>
@ -43,7 +43,7 @@
<activity
android:name=".ui.main.TvMainActivity"
android:theme="@style/DolphinTvGamecube">
android:theme="@style/DolphinTvBase">
<!-- This intentfilter marks this Activity as the one that gets launched from Home screen. -->
<intent-filter>
@ -55,12 +55,12 @@
<activity
android:name=".features.settings.ui.SettingsActivity"
android:theme="@style/DolphinSettingsGamecube"
android:theme="@style/DolphinSettingsBase"
android:label="@string/preferences_settings"/>
<activity
android:name=".activities.EmulationActivity"
android:theme="@style/DolphinEmulationGamecube"/>
android:theme="@style/DolphinEmulationBase"/>
<activity
android:name=".activities.CustomFilePickerActivity"
@ -71,6 +71,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity android:name=".activities.AppLinkActivity" >
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -81,7 +82,6 @@
</intent-filter>
</activity>
<service android:name=".services.DirectoryInitializationService"/>
<service android:name=".services.GameFileCacheService"/>
<service

4
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/activities/EmulationActivity.java
View File

@ -210,7 +210,7 @@ public final class EmulationActivity extends AppCompatActivity
int themeId;
if (mDeviceHasTouchScreen)
{
themeId = R.style.DolphinEmulationGamecube;
themeId = R.style.DolphinEmulationBase;
// Get a handle to the Window containing the UI.
mDecorView = getWindow().getDecorView();
@ -229,7 +229,7 @@ public final class EmulationActivity extends AppCompatActivity
}
else
{
themeId = R.style.DolphinEmulationTvGamecube;
themeId = R.style.DolphinEmulationTvBase;
}
setTheme(themeId);

1
Source/Android/app/src/main/res/values/colors.xml
View File

@ -3,6 +3,7 @@
<color name="dolphin_blue">#2196f3</color>
<color name="dolphin_blue_dark">#1976d2</color>
<color name="dolphin_purple">#651fff</color>
<color name="dolphin_accent_wii">#9e9e9e</color>
<color name="dolphin_accent_wiiware">#2979ff</color>

63
Source/Android/app/src/main/res/values/styles.xml
View File

@ -8,6 +8,7 @@
<item name="colorPrimary">@color/dolphin_blue</item>
<!-- Darker variant for the status bar and contextual app bars -->
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<item name="colorAccent">@color/dolphin_purple</item>
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
@ -21,34 +22,7 @@
<style name="DolphinSettingsBase" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/dolphin_blue</item>
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
</style>
<!-- Inherit from the Base Dolphin Theme -->
<style name="DolphinWii" parent="DolphinBase">
<!-- Theme UI controls like checkboxes and text fields -->
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinGamecube" parent="DolphinBase">
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinWiiware" parent="DolphinBase">
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<!-- Inherit from the Base Dolphin Settings Theme -->
<style name="DolphinSettingsWii" parent="DolphinSettingsBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinSettingsGamecube" parent="DolphinSettingsBase">
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinSettingsWiiware" parent="DolphinSettingsBase">
<!-- Theme UI controls like checkboxes and text fields -->
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
<item name="colorAccent">@color/dolphin_purple</item>
</style>
<!-- Themes for Dialogs -->
@ -58,6 +32,7 @@
<style name="DolphinEmulationBase" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="colorPrimary">@color/dolphin_blue</item>
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<item name="colorAccent">@color/dolphin_purple</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:windowBackground">@android:color/black</item>
@ -68,22 +43,10 @@
<item name="android:windowAllowReturnTransitionOverlap">true</item>
</style>
<!-- Inherit from the Base Dolphin Emulation Theme -->
<style name="DolphinEmulationWii" parent="DolphinEmulationBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinEmulationGamecube" parent="DolphinEmulationBase">
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinEmulationWiiware" parent="DolphinEmulationBase">
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<style name="DolphinEmulationTvBase" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/dolphin_blue</item>
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<item name="colorAccent">@color/dolphin_purple</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:windowBackground">@android:color/black</item>
@ -94,19 +57,6 @@
<item name="android:windowAllowReturnTransitionOverlap">true</item>
</style>
<!-- Inherit from the Base Dolphin Emulation Theme -->
<style name="DolphinEmulationTvWii" parent="DolphinEmulationTvBase">
<item name="colorAccent">@color/dolphin_accent_wii</item>
</style>
<style name="DolphinEmulationTvGamecube" parent="DolphinEmulationTvBase">
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
</style>
<style name="DolphinEmulationTvWiiware" parent="DolphinEmulationTvBase">
<item name="colorAccent">@color/dolphin_accent_wiiware</item>
</style>
<!-- Hax to make Tablayout render icons -->
<style name="MyCustomTextAppearance" parent="TextAppearance.Design.Tab">
<item name="textAllCaps">false</item>
@ -116,15 +66,14 @@
<style name="DolphinTvBase" parent="Theme.Leanback.Browse">
<item name="colorPrimary">@color/dolphin_blue</item>
<item name="colorPrimaryDark">@color/dolphin_blue_dark</item>
<item name="colorAccent">@color/dolphin_purple</item>
<!-- Enable window content transitions -->
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
</style>
<style name="DolphinTvGamecube" parent="DolphinTvBase">
<item name="colorAccent">@color/dolphin_accent_gamecube</item>
<!-- Use CustomTitleView as the leanback title view. -->
<item name="browseTitleViewLayout">@layout/titleview</item>
</style>