sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added default event color property to WeekView (untested)

Browse Source
This commit is contained in:
Caesar2011
2018-07-13 13:39:35 +02:00
parent 8ed48e40bb
commit a0a76109a1
10 changed files with 25 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
View File

@@ -499,6 +499,8 @@ public class WeekView extends View {
if (a.getBoolean(R.styleable.WeekView_dropListenerEnabled, false)) if (a.getBoolean(R.styleable.WeekView_dropListenerEnabled, false))
this.enableDropListener(); this.enableDropListener();
mMinOverlappingMinutes = a.getInt(R.styleable.WeekView_minOverlappingMinutes, 0); mMinOverlappingMinutes = a.getInt(R.styleable.WeekView_minOverlappingMinutes, 0);
mDefaultEventColor = a.getColor(R.styleable.WeekView_defaultEventColor, mDefaultEventColor);
} finally { } finally {
a.recycle(); a.recycle();
} }

2
app/src/main/res/color/menu_text_color.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/colorFUSecondary" android:state_checked="true" /> <item android:color="@color/colorFUBlue" android:state_checked="true" />
<item android:color="@color/colorFUBlack" android:state_checked="false"/> <item android:color="@color/colorFUBlack" android:state_checked="false"/>
</selector> </selector>

2
app/src/main/res/layout/app_bar_main.xml
View File

@@ -16,7 +16,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="@color/colorFUPrimary" android:background="@color/colorFUGreen"
app:popupTheme="@style/AppTheme.PopupOverlay" /> app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>

7
app/src/main/res/layout/fragment_schedule.xml
View File

@@ -6,9 +6,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".fragments.ScheduleFragment"> tools:context=".fragments.ScheduleFragment">
<de.sebse.fuplanner.tools.ui.weekview.WeekView <de.sebse.fuplanner.tools.ui.weekview.WeekView
android:id="@+id/weekView" android:id="@+id/weekView"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -32,7 +29,9 @@
app:showDistinctPastFutureColor="true" app:showDistinctPastFutureColor="true"
app:showDistinctWeekendColor="true" app:showDistinctWeekendColor="true"
app:hourSeparatorColor="@android:color/black" app:hourSeparatorColor="@android:color/black"
app:showNowLine="true"/> app:showNowLine="true"
app:defaultEventColor="@color/colorFUBlue"
/>
</FrameLayout> </FrameLayout>

2
app/src/main/res/layout/fragment_startup.xml
View File

@@ -2,7 +2,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorFUPrimary" android:background="@color/colorFUGreen"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context="de.sebse.fuplanner.fragments.StartupFragment"> tools:context="de.sebse.fuplanner.fragments.StartupFragment">

2
app/src/main/res/layout/list_all_show_more.xml
View File

@@ -14,6 +14,6 @@
android:textStyle="bold" android:textStyle="bold"
android:typeface="sans" android:typeface="sans"
android:gravity="center" android:gravity="center"
android:textColor="@color/colorFUSecondary" android:textColor="@color/colorFUBlue"
/> />
</LinearLayout> </LinearLayout>

18
app/src/main/res/values-v21/styles.xml
View File

@@ -2,19 +2,19 @@
<resources> <resources>
<style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" > <style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" >
<item name="android:colorPrimary">@color/colorFUPrimary</item> <item name="android:colorPrimary">@color/colorFUGreen</item>
<item name="android:colorAccent">@color/colorFUSecondary</item> <item name="android:colorAccent">@color/colorFUBlue</item>
<item name="android:colorPrimaryDark">@color/colorFUPrimaryDark</item> <item name="android:colorPrimaryDark">@color/colorFUGreenDark</item>
<item name="android:colorBackground">@color/colorFUGray</item> <item name="android:colorBackground">@color/colorFUGray</item>
<item name="android:statusBarColor">?android:attr/colorPrimaryDark</item> <item name="android:statusBarColor">?android:attr/colorPrimaryDark</item>
<item name="colorPrimary">@color/colorFUPrimary</item> <item name="colorPrimary">@color/colorFUGreen</item>
<item name="colorPrimaryDark">@color/colorFUPrimaryDark</item> <item name="colorPrimaryDark">@color/colorFUGreenDark</item>
<item name="colorAccent">@color/colorFUSecondary</item> <item name="colorAccent">@color/colorFUBlue</item>
</style> </style>
<style name="FUTheme_Dialog" parent="android:Theme.Material.Light.Dialog.NoActionBar" > <style name="FUTheme_Dialog" parent="android:Theme.Material.Light.Dialog.NoActionBar" >
<item name="android:colorPrimary">@color/colorFUPrimary</item> <item name="android:colorPrimary">@color/colorFUGreen</item>
<item name="android:colorPrimaryDark">@color/colorFUPrimaryDark</item> <item name="android:colorPrimaryDark">@color/colorFUGreenDark</item>
<item name="android:colorAccent">@color/colorFUSecondary</item> <item name="android:colorAccent">@color/colorFUBlue</item>
</style> </style>
</resources> </resources>

1
app/src/main/res/values/attrs.xml
View File

@@ -65,5 +65,6 @@
<attr name="zoomFocusPoint" format="fraction" /> <attr name="zoomFocusPoint" format="fraction" />
<attr name="zoomFocusPointEnabled" format="boolean" /> <attr name="zoomFocusPointEnabled" format="boolean" />
<attr name="dropListenerEnabled" format="boolean" /> <attr name="dropListenerEnabled" format="boolean" />
<attr name="defaultEventColor" format="color" />
</declare-styleable> </declare-styleable>
</resources> </resources>

6
app/src/main/res/values/colors.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorFUPrimary">#99cc00</color> <color name="colorFUGreen">#99cc00</color>
<color name="colorFUPrimaryDark">#2f4000</color> <color name="colorFUGreenDark">#2f4000</color>
<color name="colorFUWhite">#FDFDFD</color> <color name="colorFUWhite">#FDFDFD</color>
<color name="colorFUGray">#cccccc</color> <color name="colorFUGray">#cccccc</color>
<color name="colorFUSecondary">#003366</color> <color name="colorFUBlue">#003366</color>
<color name="colorFUBlack">#333333</color> <color name="colorFUBlack">#333333</color>
<color name="colorFURedLight">#f5cccc</color> <color name="colorFURedLight">#f5cccc</color>
<color name="colorFURedLight2">#cca3a3</color> <color name="colorFURedLight2">#cca3a3</color>

6
app/src/main/res/values/styles.xml
View File

@@ -15,9 +15,9 @@
<style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" > <style name="FUTheme" parent="Theme.AppCompat.Light.NoActionBar" >
<item name="android:colorBackground">@color/colorFUGray</item> <item name="android:colorBackground">@color/colorFUGray</item>
<item name="colorPrimary">@color/colorFUPrimary</item> <item name="colorPrimary">@color/colorFUGreen</item>
<item name="colorPrimaryDark">@color/colorFUPrimaryDark</item> <item name="colorPrimaryDark">@color/colorFUGreenDark</item>
<item name="colorAccent">@color/colorFUSecondary</item> <item name="colorAccent">@color/colorFUBlue</item>
</style> </style>
</resources> </resources>