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

Merge remote-tracking branch 'sbosley/110805-light-theme'

Browse Source
pull/14/head
Tim Su 15 years ago
parent d5058b2154 3750959a0c
commit 75d5864c83
17 changed files with 140 additions and 66 deletions
Show Stats Download Patch File Download Diff File

4
astrid/AndroidManifest.xml
Unescape Escape View File

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.timsu.astrid"
android:versionName="3.8.1-rc2"
android:versionCode="189">
android:versionName="3.8.2"
android:versionCode="191">
<!-- widgets, alarms, and services will break if Astrid is installed on SD card -->
<!-- android:installLocation="internalOnly"> -->

6
astrid/res/drawable/background_white.xml
Unescape Escape View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#ffffff" />
</shape>

BIN
astrid/res/drawable/header_background_white.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

1
astrid/res/layout/gcal_control.xml
Unescape Escape View File

@ -20,6 +20,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
style="@style/TextAppearance.GEN_EditLabel"
android:text="@string/gcal_TEA_addToCalendar_label" />
<Spinner

4
astrid/res/layout/repeat_control.xml
Unescape Escape View File

@ -7,9 +7,11 @@
android:layout_height="wrap_content"
android:layout_marginLeft="5dip"
android:button="@drawable/btn_check_small"
android:text="@string/repeat_enabled"/>
android:text="@string/repeat_enabled"
style="@style/TextAppearance.GEN_EditLabel" />
<LinearLayout android:id="@+id/repeatContainer"
style="@style/Content"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="wrap_content">

8
astrid/res/layout/task_edit_activity.xml
Unescape Escape View File

@ -2,9 +2,10 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:astrid="http://schemas.android.com/apk/res/com.timsu.astrid"
android:id="@+id/taskEditParent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/background_gradient">
style="@style/Content">
<View
android:layout_width="fill_parent"
@ -272,6 +273,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/checkbox_facebook"
android:text="@string/actfm_EPA_facebook"
android:paddingLeft="45dip"
@ -279,6 +281,7 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/checkbox_twitter"
android:text="@string/actfm_EPA_twitter"
android:paddingLeft="45dip"
@ -318,6 +321,7 @@
android:text="@string/TEA_reminder_label"
style="@style/TextAppearance.GEN_EditLabel" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/reminder_due"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -325,6 +329,7 @@
android:button="@drawable/btn_check_small"
android:text="@string/TEA_reminder_due" />
<CheckBox
style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/reminder_overdue"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
@ -336,6 +341,7 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<CheckBox
style="@style/TextAppearance.GEN_EditLabel"
android:id="@+id/reminder_random"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

6
astrid/res/layout/task_list_activity.xml
Unescape Escape View File

@ -4,16 +4,16 @@
android:id="@+id/taskListParent"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:background="@drawable/background_gradient"
style="@style/Content"
android:orientation="vertical">
<!-- Header -->
<LinearLayout
style="@style/Header"
android:layout_width="fill_parent"
android:layout_height="43dip"
android:layout_weight="1"
android:orientation="horizontal"
android:background="@drawable/header_background">
android:orientation="horizontal">
<!-- Filters Button -->
<ImageView android:id="@+id/back"

10
astrid/res/values/attrs.xml
Unescape Escape View File

@ -1,5 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<!-- theme attributes -->
<attr name="asContentBackground" format="reference"/>
<attr name="asHeaderBackground" format="reference"/>
<attr name="asTextColor" format="color"/>
<attr name="asDetailsColor" format="color"/>
<attr name="asDueDateColor" format="color"/>
<attr name="asDueDateOverdueColor" format="color"/>
<attr name="asDueDateCompletedColor" format="color"/>
<declare-styleable name="ContactsAutoComplete">
<attr name="allowMultiple" format="boolean"/>
<attr name="completeTags" format="boolean"/>

10
astrid/res/values/keys.xml
Unescape Escape View File

@ -161,11 +161,19 @@
<string name="p_colorize">colorize</string>
<string name="p_fontSize">font_size</string>
<string name="p_showNotes">notesVisible</string>
<string name="p_transparent">transparent</string>
<string name="p_transparent_deprecated">transparent</string>
<string name="p_theme">theme</string>
<string name="p_voiceInputEnabled">voiceInputEnabled</string>
<string name="p_voiceInputCreatesTask">voiceInputCreatesTask</string>
<string name="p_voiceRemindersEnabled">voiceRemindersEnabled</string>
<string-array name="EPr_theme_settings">
<!-- theme_settings: options for preference menu -->
<item>white</item>
<item>black</item>
<item>transparent</item>
</string-array>
<string-array name="EPr_font_size">
<!-- font_size: options for preference menu -->
<item>10</item>

19
astrid/res/values/strings-core.xml
Unescape Escape View File

@ -366,14 +366,12 @@
<!-- Preference: Task List Show Notes Description (enabled) -->
<string name="EPr_showNotes_desc_enabled">Notes will always be displayed</string>
<!-- Preference: Transparent -->
<string name="EPr_transparent_title">Transparency</string>
<!-- Preference: Transparent Description (disabled) -->
<string name="EPr_transparent_desc_disabled">Desktop wallpaper will not be shown</string>
<!-- Preference: Transparent Description (enabled) -->
<string name="EPr_transparent_desc_enabled">Desktop wallpaper will be shown</string>
<!-- Preference: Theme -->
<string name="EPr_theme_title">Color Theme</string>
<!-- Preference: Theme Description (%s => value) -->
<string name="EPr_theme_desc">Currently: %s</string>
<!-- Preference: Transparent Description (android 1.6) -->
<string name="EPr_transparent_desc_unsupported">Setting requires Android 2.0+</string>
<string name="EPr_theme_desc_unsupported">Setting requires Android 2.0+</string>
<!-- Preference Category: Defaults Title -->
<string name="EPr_defaults_header">New Task Defaults</string>
@ -431,6 +429,13 @@
<item>At deadline or overdue</item>
</string-array>
<string-array name="EPr_themes">
<!-- theme_settings: labels for Theme preference menu -->
<item>White</item>
<item>Black</item>
<item>Transparent</item>
</string-array>
<!-- ========================================== Task Management Settings == -->
<!-- Preference Screen Header: Old Task Management -->

53
astrid/res/values/styles.xml
Unescape Escape View File

@ -4,20 +4,47 @@
<!-- ========================================================== General -->
<style name="TextAppearance" parent="android:TextAppearance" />
<style name="Theme" parent="@style/Theme.GreenDroid">
<item name="android:windowBackground">@null</item>
<item name="asContentBackground">@drawable/background_gradient</item>
<item name="asHeaderBackground">@drawable/header_background</item>
<item name="asTextColor">#ffffffff</item>
<item name="asDetailsColor">#ff777777</item>
<item name="asDueDateColor">#ff7777aa</item>
<item name="asDueDateOverdueColor">#ffee5555</item>
<item name="asDueDateCompletedColor">#ff777777</item>
</style>
<!-- generic style for labels above edit boxes -->
<style name="TextAppearance.GEN_EditLabel">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
<style name="Theme.Transparent">
<item name="asContentBackground">@drawable/background_transparent</item>
</style>
<style name="Theme" parent="@style/Theme.GreenDroid">
<item name="android:windowBackground">@null</item>
<style name="Theme.White">
<item name="asContentBackground">@drawable/background_white</item>
<item name="asHeaderBackground">@drawable/header_background_white</item>
<item name="asTextColor">#ff000000</item>
<item name="asDetailsColor">#ff7777aa</item>
<item name="asDueDateColor">#ff000000</item>
</style>
<style name="White" parent="android:Theme.Light">
<item name="android:windowBackground">@null</item>
<!--================================================== Stuff == -->
<style name="Content">
<item name="android:background">?attr/asContentBackground</item>
</style>
<style name="Header">
<item name="android:background">?attr/asHeaderBackground</item>
</style>
<style name="TextAppearance" parent="android:TextAppearance">
<item name="android:textColor">?attr/asTextColor</item>
</style>
<!-- generic style for labels above edit boxes -->
<style name="TextAppearance.GEN_EditLabel">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">bold</item>
</style>
<!--================================================== Custom Dialogs == -->
@ -75,20 +102,20 @@
</style>
<style name="TextAppearance.TAd_ItemDetails">
<item name="android:textColor">#ff777777</item>
<item name="android:textColor">?attr/asDetailsColor</item>
<item name="android:textColorLink">#ff88aaff</item>
</style>
<style name="TextAppearance.TAd_ItemDueDate" parent="TextAppearance.TAd_ItemDetails">
<item name="android:textColor">#ff7777aa</item>
<item name="android:textColor">?attr/asDueDateColor</item>
</style>
<style name="TextAppearance.TAd_ItemDueDate_Overdue" parent="TextAppearance.TAd_ItemDueDate">
<item name="android:textColor">#ffee5555</item>
<item name="android:textColor">?attr/asDueDateOverdueColor</item>
</style>
<style name="TextAppearance.TAd_ItemDueDate_Completed" parent="TextAppearance.TAd_ItemDueDate">
<item name="android:textColor">#ff777777</item>
<item name="android:textColor">?attr/asDueDateCompletedColor</item>
</style>
<!-- ============================================== FilterListAdapter == -->

9
astrid/res/xml/preferences.xml
Unescape Escape View File

@ -18,10 +18,11 @@
android:title="@string/EPr_showNotes_title"
android:defaultValue="false" />
<CheckBoxPreference
android:key="@string/p_transparent"
android:title="@string/EPr_transparent_title"
android:defaultValue="false" />
<ListPreference
android:key="@string/p_theme"
android:entries="@array/EPr_themes"
android:entryValues="@array/EPr_theme_settings"
android:title="@string/EPr_theme_title" />
</PreferenceCategory>
<PreferenceCategory

28
astrid/src/com/todoroo/astrid/activity/EditPreferences.java
Unescape Escape View File

@ -21,6 +21,7 @@ import android.content.res.Resources;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
import android.preference.Preference;
import android.preference.Preference.OnPreferenceChangeListener;
import android.preference.Preference.OnPreferenceClickListener;
import android.preference.PreferenceCategory;
import android.preference.PreferenceScreen;
@ -59,6 +60,8 @@ public class EditPreferences extends TodorooPreferenceActivity {
private static final int ABOUT_PREFERENCE = 0; // see preferences.xml for order of prefs
private static final int POWER_PACK_PREFERENCE = 2;
public static final int RESULT_CODE_THEME_CHANGED = 1;
// --- instance variables
@Autowired private TaskService taskService;
@ -228,7 +231,6 @@ public class EditPreferences extends TodorooPreferenceActivity {
public void updatePreferences(final Preference preference, Object value) {
final Resources r = getResources();
if (r.getString(R.string.p_showNotes).equals(preference.getKey())) {
if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_showNotes_desc_disabled);
@ -238,14 +240,17 @@ public class EditPreferences extends TodorooPreferenceActivity {
taskService.clearDetails(Criterion.all);
Flags.set(Flags.REFRESH);
}
} else if (r.getString(R.string.p_transparent).equals(preference.getKey())) {
} else if (r.getString(R.string.p_theme).equals(preference.getKey())) {
if(AndroidUtilities.getSdkVersion() < 5) {
preference.setEnabled(false);
preference.setSummary(R.string.EPr_transparent_desc_unsupported);
} else if (value != null && !(Boolean)value)
preference.setSummary(R.string.EPr_transparent_desc_disabled);
else
preference.setSummary(R.string.EPr_transparent_desc_enabled);
preference.setSummary(R.string.EPr_theme_desc_unsupported);
} else {
int index = 0;
if(value != null)
index = AndroidUtilities.indexOf(r.getStringArray(R.array.EPr_theme_settings), (String)value);
preference.setSummary(getString(R.string.EPr_theme_desc,
r.getStringArray(R.array.EPr_themes)[index]));
}
}
@ -292,9 +297,14 @@ public class EditPreferences extends TodorooPreferenceActivity {
}
public void addPreferenceListeners() {
//
findPreference(getString(R.string.p_theme)).setOnPreferenceChangeListener(new OnPreferenceChangeListener() {
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
setResult(RESULT_CODE_THEME_CHANGED);
return true;
}
});
}
private void onVoiceReminderStatusChanged(final Preference preference, boolean newValue) {
try {

6
astrid/src/com/todoroo/astrid/activity/TaskEditActivity.java
Unescape Escape View File

@ -32,7 +32,6 @@ import android.content.DialogInterface;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.graphics.Color;
import android.os.Bundle;
import android.speech.RecognizerIntent;
import android.text.format.DateUtils;
@ -75,6 +74,7 @@ import com.todoroo.astrid.service.MetadataService;
import com.todoroo.astrid.service.StartupService;
import com.todoroo.astrid.service.StatisticsService;
import com.todoroo.astrid.service.TaskService;
import com.todoroo.astrid.service.ThemeService;
import com.todoroo.astrid.tags.TagsControlSet;
import com.todoroo.astrid.timers.TimerControlSet;
import com.todoroo.astrid.ui.EditTextControlSet;
@ -200,6 +200,7 @@ public final class TaskEditActivity extends TabActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
ThemeService.applyTheme(this);
super.onCreate(savedInstanceState);
new StartupService().onStartupApplication(this);
@ -248,7 +249,8 @@ public final class TaskEditActivity extends TabActivity {
setIndicator(r.getString(R.string.TEA_tab_more),
r.getDrawable(R.drawable.gl_more)).setContent(
R.id.tab_more));
getTabWidget().setBackgroundColor(Color.BLACK);
tabHost.setBackgroundDrawable(findViewById(R.id.taskEditParent).getBackground());
//getTabWidget().setBackgroundColor(Color.WHITE);
AndroidUtilities.callApiMethod(8, getTabWidget(), "setStripEnabled", //$NON-NLS-1$
new Class<?>[] { boolean.class }, false);
if(getIntent().hasExtra(TOKEN_TAB))

7
astrid/src/com/todoroo/astrid/activity/TaskListActivity.java
Unescape Escape View File

@ -206,13 +206,13 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
protected void onCreate(Bundle savedInstanceState) {
DependencyInjectionService.getInstance().inject(this);
requestWindowFeature(Window.FEATURE_NO_TITLE);
ThemeService.applyTheme(this);
super.onCreate(savedInstanceState);
new StartupService().onStartupApplication(this);
ViewGroup parent = (ViewGroup) getLayoutInflater().inflate(R.layout.task_list_activity, null);
parent.addView(getListBody(parent), 1);
setContentView(parent);
ThemeService.applyTheme(this);
if(database == null)
return;
@ -605,8 +605,9 @@ public class TaskListActivity extends ListActivity implements OnScrollListener,
return;
}
if(requestCode == ACTIVITY_SETTINGS) {
ThemeService.applyTheme(this);
if(requestCode == ACTIVITY_SETTINGS && resultCode == EditPreferences.RESULT_CODE_THEME_CHANGED) {
finish();
startActivity(getIntent());
}
super.onActivityResult(requestCode, resultCode, data);

19
astrid/src/com/todoroo/astrid/service/ThemeService.java
Unescape Escape View File

@ -2,8 +2,6 @@ package com.todoroo.astrid.service;
import android.app.Activity;
import android.graphics.PixelFormat;
import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager;
import com.timsu.astrid.R;
@ -11,16 +9,15 @@ import com.todoroo.andlib.utility.Preferences;
public class ThemeService {
private static void applyTheme(View parent) {
if(Preferences.getBoolean(R.string.p_transparent, false))
parent.setBackgroundResource(R.drawable.background_transparent);
else
parent.setBackgroundResource(R.drawable.background_gradient);
}
@SuppressWarnings("nls")
public static void applyTheme(Activity activity) {
View root = ((ViewGroup)activity.findViewById(android.R.id.content)).getChildAt(0);
applyTheme(root);
String preference = Preferences.getStringValue(R.string.p_theme);
if(preference != null && preference.equals("black"))
activity.setTheme(R.style.Theme);
else if(preference != null && preference.equals("transparent"))
activity.setTheme(R.style.Theme_Transparent);
else
activity.setTheme(R.style.Theme_White);
activity.getWindow().setFormat(PixelFormat.RGBA_8888);
activity.getWindow().addFlags(WindowManager.LayoutParams.FLAG_DITHER);

14
astrid/src/com/todoroo/astrid/service/UpgradeService.java
Unescape Escape View File

@ -36,7 +36,7 @@ import com.todoroo.astrid.utility.AstridPreferences;
public final class UpgradeService {
public static final int V3_8_0_3 = 189;
public static final int V3_8_2 = 191;
public static final int V3_8_0_2 = 188;
public static final int V3_8_0 = 186;
public static final int V3_7_7 = 184;
@ -136,13 +136,11 @@ public final class UpgradeService {
StringBuilder changeLog = new StringBuilder();
// current message
if(from >= V3_8_0 && from < V3_8_0_3) {
newVersionString(changeLog, "3.8.0.3 (7/19/11)", new String[] {
"Improved Google Tasks Sync migration process",
"Handle service errors in Google Tasks sync gracefully",
"Fixed Astrid.com sync would sometimes send unchanged tasks",
"Fix for crashes. Keep on reporting them!",
});
if(from >= V3_8_0 && from < V3_8_2) {
if(Preferences.getBoolean(R.string.p_transparent_deprecated, false))
Preferences.setString(R.string.p_theme, "transparent");
else
Preferences.setString(R.string.p_theme, "black");
}
if(from >= V3_8_0 && from < V3_8_0_2) {
newVersionString(changeLog, "3.8.0.2 (7/16/11)", new String[] {

Write Preview
Loading…
Cancel
Save