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

Moved gcal to standard Astrid, added message to end of task edit page

Browse Source
pull/14/head
Tim Su 15 years ago
parent 104382f108
commit ed85a3e43c
3 changed files with 42 additions and 40 deletions
Show Stats Download Patch File Download Diff File

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

@ -245,39 +245,41 @@
<LinearLayout android:id="@+id/tab_addons_addons"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:orientation="vertical" />
android:orientation="vertical">
</ScrollView>
<LinearLayout android:id="@+id/addons_empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical">
<ImageView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="20dip"
android:src="@drawable/icon_pp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/TEA_addons_text"
android:padding="10dip"
android:gravity="center"
style="@style/TextAppearance.TLA_NoItems" />
<Button android:id="@+id/addons_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dip"
android:text="@string/TEA_addons_button" />
<LinearLayout android:id="@+id/addons_empty"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="100"
android:gravity="center"
android:visibility="gone"
android:orientation="vertical">
<ImageView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="20dip"
android:src="@drawable/icon_pp" />
<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/TEA_no_addons"
android:padding="10dip"
android:gravity="center"
style="@style/TextAppearance.TLA_NoItems" />
<Button android:id="@+id/addons_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dip"
android:text="@string/TEA_addons_button" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</ScrollView>
<LinearLayout
android:layout_width="fill_parent"

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

@ -286,10 +286,10 @@
</string-array>
<!-- Add Ons tab when no add-ons found -->
<string name="TEA_no_addons">No Add-ons Found!</string>
<string name="TEA_addons_text">Looking for more features?</string>
<!-- Add Ons button -->
<string name="TEA_addons_button">Get Some Add-ons</string>
<string name="TEA_addons_button">Get the Power Pack!</string>
<!-- ============================================= IntroductionActivity == -->

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

@ -260,16 +260,16 @@ public final class TaskEditActivity extends TabActivity {
Log.e("astrid-error", "loading-control-set", e); //$NON-NLS-1$ //$NON-NLS-2$
}
controls.add(new GCalControlSet(TaskEditActivity.this, addonsAddons));
if(addOnService.hasPowerPack()) {
controls.add(new GCalControlSet(TaskEditActivity.this, addonsAddons));
controls.add(new TimerControlSet(TaskEditActivity.this, addonsAddons));
controls.add(new AlarmControlSet(TaskEditActivity.this, addonsAddons));
}
// show add-on help if necessary
if(addonsAddons.getChildCount() == 0) {
((View)addonsAddons.getParent()).setVisibility(View.GONE);
findViewById(R.id.addons_empty).setVisibility(View.VISIBLE);
} else {
// show add-on help if necessary
View addonsEmpty = findViewById(R.id.addons_empty);
addonsEmpty.setVisibility(View.VISIBLE);
addonsAddons.removeView(addonsEmpty);
addonsAddons.addView(addonsEmpty);
((Button)findViewById(R.id.addons_button)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

Write Preview
Loading…
Cancel
Save