Skip to content

Commit 4632622

Browse files
committed
Fix sample app theme with appcompat
1 parent 92467bc commit 4632622

File tree

5 files changed

+18
-9
lines changed

5 files changed

+18
-9
lines changed

sample/src/main/java/com/alamkanak/weekview/sample/MainActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.alamkanak.weekview.sample;
22

3-
import android.app.Activity;
43
import android.graphics.RectF;
54
import android.os.Bundle;
5+
import android.support.v7.app.ActionBarActivity;
66
import android.util.TypedValue;
77
import android.view.Menu;
88
import android.view.MenuItem;
@@ -18,9 +18,9 @@
1818

1919
/**
2020
* Created by Raquib-ul-Alam Kanak on 7/21/2014.
21-
* Website: http://april-shower.com
21+
* Website: http://alamkanak.github.io
2222
*/
23-
public class MainActivity extends Activity implements WeekView.MonthChangeListener,
23+
public class MainActivity extends ActionBarActivity implements WeekView.MonthChangeListener,
2424
WeekView.EventClickListener, WeekView.EventLongPressListener {
2525

2626
private static final int TYPE_DAY_VIEW = 1;

sample/src/main/res/layout/activity_main.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,14 @@
1414
app:textSize="12sp"
1515
app:hourHeight="60dp"
1616
app:headerColumnPadding="8dp"
17-
app:headerColumnTextColor="#8f000000"
17+
app:headerColumnTextColor="@color/toolbar_text"
1818
app:headerRowPadding="12dp"
1919
app:columnGap="8dp"
2020
app:noOfVisibleDays="3"
21-
app:headerRowBackgroundColor="#ffefefef"
21+
app:headerRowBackgroundColor="@color/toolbar"
2222
app:dayBackgroundColor="#05000000"
2323
app:todayBackgroundColor="#1848adff"
24-
app:headerColumnBackground="#ffffffff"/>
24+
app:headerColumnBackground="#ffffffff"
25+
app:todayHeaderTextColor="@color/accent"/>
2526

2627
</RelativeLayout>

sample/src/main/res/values/colors.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,7 @@
44
<color name="event_color_02">#f57f68</color>
55
<color name="event_color_03">#87d288</color>
66
<color name="event_color_04">#f8b552</color>
7+
<color name="toolbar">#efefef</color>
8+
<color name="toolbar_text">#8f000000</color>
9+
<color name="accent">#2789e4</color>
710
</resources>

sample/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="app_name">Android Week View</string>
4-
<string name="action_today">Go to today</string>
4+
<string name="action_today">Today</string>
55
<string name="action_day_view">Day view</string>
66
<string name="action_three_day_view">3 day view</string>
77
<string name="action_week_view">Week view</string>

sample/src/main/res/values/styles.xml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22

33
<!-- Base application theme. -->
44
<style name="AppTheme" parent="Theme.AppCompat.Light">
5-
5+
<item name="colorPrimary">@color/toolbar</item>
6+
<item name="colorPrimaryDark">@color/accent</item>
7+
<item name="android:windowContentOverlay">@null</item>
8+
<item name="android:textColorPrimary">@color/toolbar_text</item>
9+
<item name="actionMenuTextColor">@color/toolbar_text</item>
10+
<item name="popupTheme">@style/ThemeOverlay.AppCompat.Light</item>
11+
<item name="colorControlActivated">@color/accent</item>
612
</style>
7-
813
</resources>

0 commit comments

Comments
 (0)