tenkuma/jamfish
tenkuma/jamfish
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Renamed the themes internally

Browse source
This commit is contained in:
Karim Abou Zeid 2015-12-29 15:12:47 +01:00
commit 1383d9eb82
8 changed files with 24 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -18,7 +18,7 @@
android:icon="@drawable/ic_launcher" android:icon="@drawable/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.MaterialMusic.Light" android:theme="@style/Theme.Phonograph.Light"
tools:ignore="UnusedAttribute"> tools:ignore="UnusedAttribute">
<activity <activity
android:name=".ui.activities.MainActivity" android:name=".ui.activities.MainActivity"

2
app/src/main/java/com/kabouzeid/gramophone/ui/activities/base/AbsThemeActivity.java
View file

@ -53,7 +53,7 @@ public abstract class AbsThemeActivity extends AppCompatActivity implements KabV
} }
private void setupTheme() { private void setupTheme() {
boolean dark = theme != R.style.Theme_MaterialMusic_Light; boolean dark = theme != R.style.Theme_Phonograph_Light;
colorPrimary = PreferenceUtil.getInstance(this).getThemeColorPrimary(this); colorPrimary = PreferenceUtil.getInstance(this).getThemeColorPrimary(this);
colorPrimaryDarker = ColorUtil.shiftColorDown(colorPrimary); colorPrimaryDarker = ColorUtil.shiftColorDown(colorPrimary);

8
app/src/main/java/com/kabouzeid/gramophone/util/PreferenceUtil.java
View file

@ -101,16 +101,16 @@ public final class PreferenceUtil {
int value = Integer.parseInt(mPreferences.getString(GENERAL_THEME, "0")); int value = Integer.parseInt(mPreferences.getString(GENERAL_THEME, "0"));
switch (value) { switch (value) {
case 0: case 0:
return R.style.Theme_MaterialMusic_Light; return R.style.Theme_Phonograph_Light;
case 1: case 1:
return R.style.Theme_MaterialMusic; return R.style.Theme_Phonograph;
case 2: case 2:
return R.style.Theme_MaterialMusic_Black; return R.style.Theme_Phonograph_Black;
} }
} catch (NumberFormatException ignored) { } catch (NumberFormatException ignored) {
} }
return R.style.Theme_MaterialMusic_Light; return R.style.Theme_Phonograph_Light;
} }
public int getThemeColorPrimary(Context context) { public int getThemeColorPrimary(Context context) {

4
app/src/main/res/layout/notification.xml
View file

@ -65,7 +65,7 @@
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:gravity="bottom" android:gravity="bottom"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" android:textAppearance="@style/Theme.Phonograph.Notification.Title"
tools:ignore="NestedWeights" /> tools:ignore="NestedWeights" />
<TextView <TextView
@ -77,7 +77,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification" /> android:textAppearance="@style/Theme.Phonograph.Notification" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

6
app/src/main/res/layout/notification_big.xml
View file

@ -73,7 +73,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification.Title" /> android:textAppearance="@style/Theme.Phonograph.Notification.Title" />
<TextView <TextView
android:id="@+id/text" android:id="@+id/text"
@ -85,7 +85,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification" /> android:textAppearance="@style/Theme.Phonograph.Notification" />
<TextView <TextView
android:id="@+id/text2" android:id="@+id/text2"
@ -96,7 +96,7 @@
android:ellipsize="marquee" android:ellipsize="marquee"
android:fadingEdge="horizontal" android:fadingEdge="horizontal"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/Theme.MaterialMusic.Notification" /> android:textAppearance="@style/Theme.Phonograph.Notification" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout

10
app/src/main/res/values-v21/styles.xml
View file

@ -1,29 +1,29 @@
<resources> <resources>
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base"> <style name="Theme.Phonograph" parent="Theme.Phonograph.Base">
<item name="round_selector">@drawable/round_ripple_selector</item> <item name="round_selector">@drawable/round_ripple_selector</item>
<item name="rect_selector">@drawable/rect_ripple_selector_dark</item> <item name="rect_selector">@drawable/rect_ripple_selector_dark</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
</style> </style>
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light"> <style name="Theme.Phonograph.Light" parent="Theme.Phonograph.Base.Light">
<item name="round_selector">@drawable/round_ripple_selector</item> <item name="round_selector">@drawable/round_ripple_selector</item>
<item name="rect_selector">@drawable/rect_ripple_selector</item> <item name="rect_selector">@drawable/rect_ripple_selector</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
</style> </style>
<style name="Theme.MaterialMusic.Black" parent="Theme.MaterialMusic.Base.Black"> <style name="Theme.Phonograph.Black" parent="Theme.Phonograph.Base.Black">
<item name="round_selector">@drawable/round_ripple_selector</item> <item name="round_selector">@drawable/round_ripple_selector</item>
<item name="rect_selector">@drawable/rect_ripple_selector</item> <item name="rect_selector">@drawable/rect_ripple_selector</item>
<item name="android:statusBarColor">@android:color/transparent</item> <item name="android:statusBarColor">@android:color/transparent</item>
</style> </style>
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.Material.Notification" /> <style name="Theme.Phonograph.Notification" parent="@android:style/TextAppearance.Material.Notification" />
<style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" /> <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.Material.Notification.Title" />
<style name="PlayPauseFab" parent="PlayPauseFabParent"> <style name="PlayPauseFab" parent="PlayPauseFabParent">
<item name="android:transitionName">@string/transition_fab</item> <item name="android:transitionName">@string/transition_fab</item>

10
app/src/main/res/values/styles.xml
View file

@ -1,14 +1,14 @@
<resources xmlns:tools="http://schemas.android.com/tools"> <resources xmlns:tools="http://schemas.android.com/tools">
<style name="Theme.MaterialMusic" parent="Theme.MaterialMusic.Base" /> <style name="Theme.Phonograph" parent="Theme.Phonograph.Base" />
<style name="Theme.MaterialMusic.Light" parent="Theme.MaterialMusic.Base.Light" /> <style name="Theme.Phonograph.Light" parent="Theme.Phonograph.Base.Light" />
<style name="Theme.MaterialMusic.Black" parent="Theme.MaterialMusic.Base.Black" /> <style name="Theme.Phonograph.Black" parent="Theme.Phonograph.Base.Black" />
<style name="Theme.MaterialMusic.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" /> <style name="Theme.Phonograph.Notification" parent="@android:style/TextAppearance.StatusBar.EventContent" />
<style name="Theme.MaterialMusic.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" /> <style name="Theme.Phonograph.Notification.Title" parent="@android:style/TextAppearance.StatusBar.EventContent.Title" />
<style name="OverFlowButton" parent="OverFlowButtonParent" /> <style name="OverFlowButton" parent="OverFlowButtonParent" />

6
app/src/main/res/values/styles_parents.xml
View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<style name="Theme.MaterialMusic.Base" parent="Theme.AppCompat.NoActionBar"> <style name="Theme.Phonograph.Base" parent="Theme.AppCompat.NoActionBar">
<item name="android:windowActionBarOverlay">true</item> <item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item> <item name="windowActionBarOverlay">true</item>
@ -29,7 +29,7 @@
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item> <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
</style> </style>
<style name="Theme.MaterialMusic.Base.Light" parent="Theme.AppCompat.Light.NoActionBar"> <style name="Theme.Phonograph.Base.Light" parent="Theme.AppCompat.Light.NoActionBar">
<item name="android:windowActionBarOverlay">true</item> <item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item> <item name="windowActionBarOverlay">true</item>
@ -57,7 +57,7 @@
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item> <item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
</style> </style>
<style name="Theme.MaterialMusic.Base.Black" parent="@style/Theme.MaterialMusic.Base"> <style name="Theme.Phonograph.Base.Black" parent="@style/Theme.Phonograph.Base">
<item name="android:windowBackground">@drawable/black</item> <item name="android:windowBackground">@drawable/black</item>
<item name="divider_color">#18FFFFFF</item> <item name="divider_color">#18FFFFFF</item>
<item name="cardBackgroundColor">@color/grey_900</item> <item name="cardBackgroundColor">@color/grey_900</item>