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

Merge Jimmy's layout for billing and resolve conflicts

Browse Source
pull/14/head
Sam Bosley 14 years ago
parent fea5fb275d ba2f828821
commit 6e8331ebd3
6 changed files with 181 additions and 9 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 249 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 56 KiB

179
astrid/res/layout/billing_activity.xml
Unescape Escape View File

@ -3,18 +3,179 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
<Button
android:id="@+id/buy_month"
<TextView
android:id="@+id/premium_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Buy one month"/>
android:gravity="center"
android:textSize="24dip"
android:text="@string/premium_billing_title" />
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/premium_description_holder"
android:layout_width="wrap_content"
android:layout_height="0dip"
android:layout_weight="1"
android:background="@drawable/post_it"
android:orientation="vertical"
android:paddingRight="30dip"
android:paddingLeft="30dip"
android:paddingTop="30dip"
android:paddingBottom="70dip" >
<TextView
android:id="@+id/premium_description_title"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="16dip"
android:gravity="left"
android:text="@string/premium_description_header"
android:textColor="@color/dark_blue_theme_color"
android:textSize="24dip" />
<Button
android:id="@+id/buy_year"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_1"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_2"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_3"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_4"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_5"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:layout_height="15dip"
android:layout_width="15dip"
android:src="@drawable/icn_premium_checkmark"
android:layout_gravity="top|left"/>
<TextView
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="left"
android:text="@string/premium_description_6"
android:textSize="14dip"
android:layout_marginBottom="12dip"
android:textColor="@color/black"/>
</LinearLayout>
</LinearLayout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="Buy one year"/>
android:orientation="horizontal">
<Button
android:id="@+id/premium_buy_month"
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:layout_marginBottom="15dip"
android:layout_marginTop="0dip"
android:layout_weight="1"
android:background="@drawable/bluebutton"
android:text="@string/premium_buy_month"
android:gravity="center"/>
<Button
android:id="@+id/premium_buy_year"
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_marginLeft="15dip"
android:layout_marginRight="15dip"
android:layout_marginBottom="15dip"
android:layout_marginTop="0dip"
android:layout_weight="1"
android:background="@drawable/bluebutton"
android:text="@string/premium_buy_year"
android:gravity="center" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

1
astrid/res/values/colors.xml
Unescape Escape View File

@ -42,6 +42,7 @@
<color name="widget_header_legacy_start">#fc1c2334</color>
<color name="widget_header_legacy_end">#fc243455</color>
<color name="widget_body_legacy">#fc1c1c1c</color>
<color name="black">#000</color>
</resources>

10
astrid/res/values/strings-premium.xml
Unescape Escape View File

@ -64,4 +64,14 @@
<string name="subscriptions_learn_more">Learn more</string>
<string name="subscriptions_help_url" formatted="false">http://market.android.com/support/bin/answer.py?answer=1050566&amp;hl=%lang%&amp;dl=%region%</string>
<string name="premium_billing_title">Astrid Premium</string>
<string name="premium_buy_month">$4.99\n1 month</string>
<string name="premium_buy_year">$39.99\n1 year</string>
<string name="premium_description_header">Do more with Astrid!</string>
<string name="premium_description_1">Attach files to to-dos (pdfs, doc, ppt…)</string>
<string name="premium_description_2">Syncs files with astrid.com</string>
<string name="premium_description_3">Turn emails with attachments into tasks</string>
<string name="premium_description_4">Save voice notes at audio files</string>
<string name="premium_description_5">Preview upcoming features</string>
<string name="premium_description_6">Support the Astrid Team!</string>
</resources>

Write Preview
Loading…
Cancel
Save