archive
/
tasks
mirror of https://github.com/tasks/tasks
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Theme cleanup

Browse Source
pull/281/head
Alex Baker 11 years ago
parent 5dc6c19d5d
commit 29b901c81b
14 changed files with 10 additions and 109 deletions
Show Stats Download Patch File Download Diff File

4
src/main/AndroidManifest.xml
Unescape Escape View File

@ -309,7 +309,7 @@
<!-- custom filters -->
<activity
android:name="com.todoroo.astrid.core.CustomFilterActivity"
android:theme="@style/TasksDialog" />
android:theme="@style/Tasks.Dialog"/>
<activity
android:name="com.todoroo.astrid.core.DeleteFilterActivity"
@ -342,7 +342,7 @@
<activity
android:name="com.todoroo.astrid.actfm.TagSettingsActivityTablet"
android:windowSoftInputMode="stateHidden"
android:theme="@style/TasksDialog" />
android:theme="@style/Tasks.Dialog" />
<!-- gtasks -->
<activity

2
src/main/java/org/tasks/injection/InjectingPreferenceActivity.java
Unescape Escape View File

@ -34,7 +34,7 @@ public abstract class InjectingPreferenceActivity extends PreferenceActivity imp
toolbar = (Toolbar) toolbarContainer.findViewById(R.id.toolbar);
toolbar.setTitle(getTitle());
toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
toolbar.setNavigationIcon(R.drawable.ic_up);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

BIN
src/main/res/drawable-hdpi/dialog_full_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
src/main/res/drawable-hdpi/dialog_full_holo_light.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.5 KiB

BIN
src/main/res/drawable-xhdpi/dialog_full_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.1 KiB

BIN
src/main/res/drawable-xhdpi/dialog_full_holo_light.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.2 KiB

BIN
src/main/res/drawable/dialog_full_holo_dark.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 882 B

BIN
src/main/res/drawable/dialog_full_holo_light.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1003 B

BIN
src/main/res/drawable/panel_background.9.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.1 KiB

26
src/main/res/drawable/task_edit_background_transparent_white.xml
Unescape Escape View File

@ -1,26 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
** Copyright (c) 2012 Todoroo Inc
**
** See the file "LICENSE" for the full license governing this code.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- Bottom 2dp Shadow -->
<item>
<shape android:shape="rectangle" >
<gradient
android:endColor="#33eeeeee"
android:startColor="#33d8d8d8" />
<corners android:radius="4dp" />
</shape>
</item>
<item android:bottom="2dp" android:right="1dp">
<shape android:shape="rectangle" >
<solid android:color="#33ffffff" />
<corners android:radius="4dp" />
</shape>
</item>
</layer-list>

2
src/main/res/layout/toolbar.xml
Unescape Escape View File

@ -10,7 +10,7 @@
android:layout_height="?attr/actionBarSize"
android:background="?attr/asAbBackgroundColor"
tasks:theme="@style/ActionBarThemeOverlay"
tasks:popupTheme="@style/ActionBarPopupThemeOverlay"
tasks:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tasks:titleTextAppearance="@style/ActionBar.TitleText" />
<View

16
src/main/res/values-v14/styles.xml
Unescape Escape View File

@ -1,22 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="TEA_Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
<item name="asTextColor">@android:color/black</item>
</style>
<style name="TEA_Dialog_Dark" parent="Theme.AppCompat.Dialog">
<item name="android:windowFrame">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
<item name="asTextColor">@android:color/white</item>
</style>
<style name="TextBoxText">
<item name="android:textColor">?attr/asTextColor</item>
</style>

1
src/main/res/values/colors.xml
Unescape Escape View File

@ -12,7 +12,6 @@
<color name="task_list_done">#ff777777</color>
<color name="task_edit_deadline_gray">#888888</color>
<color name="blue_theme_color">#33b5e5</color>
<color name="red_theme_color">#d90000</color>
<color name="dark_blue_theme_color">#1f78b4</color>
<color name="reminder_background">#262626</color>

68
src/main/res/values/styles.xml
Unescape Escape View File

@ -13,7 +13,6 @@
<item name="android:windowBackground">@android:color/white</item>
<item name="asDueDateOverdueColor">#ee5555</item>
<item name="asEditTextBackground">@null</item>
<item name="windowActionModeOverlay">true</item>
<item name="ic_action_add">@drawable/ic_action_add_light</item>
<item name="ic_action_new_attachment">@drawable/ic_action_attachment_2</item>
@ -24,12 +23,6 @@
<item name="ic_action_search">@drawable/ic_action_search</item>
<item name="ic_action_settings">@drawable/ic_action_gear</item>
<!-- actionbar-styling -->
<item name="homeAsUpIndicator">@drawable/ic_up</item>
<item name="android:homeAsUpIndicator">@drawable/ic_up</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
<item name="android:windowContentOverlay">@null</item>
<item name="drawer_background">@color/drawer_background</item>
<item name="drawer_background_selected">@color/drawer_background_selected</item>
<item name="asDueDateCompletedColor">#ff777777</item>
@ -100,34 +93,6 @@
<item name="fab_icon">@drawable/ic_action_add_black</item>
</style>
<style name="TasksDialog" parent="@android:style/Theme.Dialog">
<item name="asDueDateOverdueColor">#ffee5555</item>
<item name="asDueDateCompletedColor">#ff777777</item>
<item name="asSeparatorBackground">#888888</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowBackground">@drawable/panel_background</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="android:layout_width">fill_parent</item>
<item name="android:windowTitleSize">18dip</item>
<item name="android:windowTitleStyle">@style/DialogTitle</item>
<item name="android:windowTitleBackgroundStyle">@style/DialogTitle</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="windowActionBar">false</item>
<item name="asContentBackground">@android:color/white</item>
<item name="asTextColor">#ff000000</item>
<item name="asDetailsColor">#ff6666aa</item>
<item name="asDueDateColor">#878787</item>
<item name="asEditBackground">#dddddd</item>
<item name="asEditRowBackground">@drawable/task_edit_background_transparent_white</item>
<item name="asThemeTextColor">@color/blue_theme_color</item>
</style>
<style name="ActionBar.TitleText" parent="TextAppearance.AppCompat.Widget.ActionBar.Title">
<item name="android:textColor">#fff</item>
</style>
@ -136,20 +101,14 @@
<item name="android:textColor">@android:color/black</item>
</style>
<style name="ActionBarThemeOverlay" parent="">
<style name="ActionBarThemeOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
<item name="android:textColorPrimary">#fff</item>
<item name="colorControlNormal">#fff</item>
<item name="colorControlHighlight">#3fff</item>
</style>
<style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" />
<style name="Tasks.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"/>
<style name="DrawerArrowStyle" parent="Widget.AppCompat.DrawerArrowToggle">
<item name="spinBars">false</item>
</style>
<!--================================================== General == -->
<style name="TextAppearance" parent="android:TextAppearance">
@ -161,19 +120,10 @@
<!--================================================== Custom Dialogs == -->
<style name="DialogTitle">
<item name="android:textSize">18sp</item>
<item name="android:background">#323331</item>
</style>
<style name="ReminderDialog" parent="Theme.AppCompat.Dialog">
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowBackground">@drawable/reminder_dialog_inset_background</item>
<item name="android:windowIsTranslucent">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustPan</item>
<item name="asThemeTextColor">@color/dark_blue_theme_color</item>
</style>
@ -189,20 +139,14 @@
<!-- =============================================== TaskEditActivity == -->
<style name="TEA_Dialog" parent="@android:style/Theme.Dialog">
<item name="android:windowFrame">@null</item>
<style name="TEA_Dialog" parent="Theme.AppCompat.Light.Dialog">
<item name="asTextColor">@android:color/black</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
<item name="android:windowSoftInputMode">stateUnspecified|adjustResize</item>
<item name="android:windowBackground">@drawable/dialog_full_holo_light</item>
<item name="asTextColor">#000000</item>
</style>
<style name="TEA_Dialog_Dark" parent="TEA_Dialog">
<item name="android:windowBackground">@drawable/dialog_full_holo_dark</item>
<item name="asTextColor">#ffffff</item>
<style name="TEA_Dialog_Dark" parent="Theme.AppCompat.Dialog">
<item name="asTextColor">@android:color/white</item>
<item name="android:windowNoTitle">true</item>
</style>
<!-- ==================================================== TaskAdapter == -->

Write Preview
Loading…
Cancel
Save