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

Polished the share activity

Browse Source
pull/14/head
Sam Bosley 13 years ago
parent 670e21a9a6
commit 1c22549a13
10 changed files with 228 additions and 33 deletions
Show Stats Download Patch File Download Diff File

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 743 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.8 KiB

87
astrid/res/layout-land/share_activity.xml
Unescape Escape View File

@ -0,0 +1,87 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#aaa" >
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:layout_marginTop="20dip"
android:orientation="horizontal">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_facebook"/>
<TextView
android:id="@+id/share_facebook"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_twitter"/>
<TextView
android:id="@+id/share_twitter"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginBottom="20dip">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_google"/>
<TextView
android:id="@+id/share_google"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<include layout="@layout/astrid_speech_bubble"/>
</LinearLayout>

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

@ -2,7 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#aaa"
android:background="#aaa"
android:orientation="vertical" >
<LinearLayout

96
astrid/res/layout/share_activity.xml
Unescape Escape View File

@ -2,30 +2,86 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical" >
android:orientation="vertical"
android:background="#aaa" >
<TextView
android:id="@+id/share_facebook"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="#444"
android:layout_marginBottom="15dip"/>
<TextView
android:id="@+id/share_twitter"
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:layout_marginTop="50dip"
android:orientation="horizontal">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_facebook"/>
<TextView
android:id="@+id/share_facebook"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="#444"
android:layout_marginBottom="15dip"/>
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_twitter"/>
<TextView
android:id="@+id/share_twitter"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<TextView
android:id="@+id/share_google"
<LinearLayout
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textSize="16sp"
android:textColor="#444"
android:layout_marginBottom="15dip"/>
android:layout_height="50dip"
android:layout_weight="1"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginBottom="50dip">
<ImageView
android:layout_width="30dip"
android:layout_height="30dip"
android:layout_marginRight="20dip"
android:scaleType="fitCenter"
android:src="@drawable/share_google"/>
<TextView
android:id="@+id/share_google"
android:gravity="center_vertical"
android:layout_width="150dip"
android:layout_height="fill_parent"
android:textSize="16sp"
android:textStyle="bold"
android:textColor="?attr/asThemeTextColor"/>
</LinearLayout>
<include layout="@layout/astrid_speech_bubble"/>
</LinearLayout>

8
astrid/res/values/strings-actfm.xml
Unescape Escape View File

@ -323,9 +323,11 @@
<string name="actfm_inapp_billing_summary">Attach files, voice backups, premium support &amp; more</string>
<!-- Sharing -->
<string name="share_with_facebook">Share with Facebook</string>
<string name="share_with_twitter">Share with Twitter</string>
<string name="share_with_google">Share with Google+</string>
<string name="share_with_facebook">Like on Facebook</string>
<string name="share_with_twitter">Follow on Twitter</string>
<string name="share_with_google">Share on Google+</string>
<string name="share_title">Share the love!</string>
<string name="share_speech_bubble">By sharing, you\'ll help others be more productive!</string>
</resources>

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

@ -572,7 +572,7 @@
<string name="EPr_share_astrid">Tell others about Astrid</string>
<string name="EPr_share_astrid_summary">Rate us or share on your favorite social network</string>
<string name="EPr_share_astrid_summary">Share about Astrid on your favorite social network</string>
<!-- slide 46a -->
<string name="EPr_deactivated">deactivated</string>

56
astrid/src/com/todoroo/astrid/activity/ShareActivity.java
Unescape Escape View File

@ -1,23 +1,37 @@
package com.todoroo.astrid.activity;
import android.app.Activity;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.style.UnderlineSpan;
import android.support.v4.app.ActionBar;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.MenuItem;
import android.util.DisplayMetrics;
import android.view.View;
import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.ImageView.ScaleType;
import android.widget.LinearLayout;
import android.widget.TextView;
import com.timsu.astrid.R;
import com.todoroo.astrid.service.ThemeService;
public class ShareActivity extends Activity {
public class ShareActivity extends FragmentActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
ThemeService.applyTheme(this);
super.onCreate(savedInstanceState);
ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setDisplayShowCustomEnabled(true);
actionBar.setCustomView(R.layout.header_title_view);
((TextView) actionBar.getCustomView().findViewById(R.id.title)).setText(R.string.share_title);
setContentView(R.layout.share_activity);
TextView fb = (TextView) findViewById(R.id.share_facebook);
setUpTextView(fb, getString(R.string.share_with_facebook), "http://facebook.com/weloveastrid"); //$NON-NLS-1$
@ -28,13 +42,13 @@ public class ShareActivity extends Activity {
TextView google = (TextView) findViewById(R.id.share_google);
setUpTextView(google, getString(R.string.share_with_google), "https://plus.google.com/116404018347675245869"); //$NON-NLS-1$
setupText();
}
private void setUpTextView(TextView tv, String text, final String url) {
SpannableString span = new SpannableString(text);
span.setSpan(new UnderlineSpan(), 0, text.length(), 0);
tv.setText(span);
tv.setOnClickListener(new OnClickListener() {
tv.setText(text);
((View) tv.getParent()).setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
@ -43,4 +57,30 @@ public class ShareActivity extends Activity {
});
}
private void setupText() {
View speechBubbleBackground = findViewById(R.id.speech_bubble_container);
speechBubbleBackground.setBackgroundColor(0);
DisplayMetrics metrics = getResources().getDisplayMetrics();
ImageView icon = (ImageView) findViewById(R.id.astridIcon);
int dim = (int) (80 * metrics.density);
icon.setLayoutParams(new LinearLayout.LayoutParams(dim, dim));
icon.setScaleType(ScaleType.FIT_CENTER);
TextView speechBubble = (TextView) findViewById(R.id.reminder_message);
speechBubble.setText(R.string.share_speech_bubble);
speechBubble.setTextSize(17);
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

10
astrid/src/com/todoroo/astrid/billing/BillingActivity.java
Unescape Escape View File

@ -11,6 +11,7 @@ import android.os.Bundle;
import android.os.Handler;
import android.support.v4.app.ActionBar;
import android.support.v4.app.FragmentActivity;
import android.support.v4.view.MenuItem;
import android.text.Html;
import android.text.Spanned;
import android.util.DisplayMetrics;
@ -274,4 +275,13 @@ public class BillingActivity extends FragmentActivity {
billingService.restoreTransactions();
}
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == android.R.id.home) {
finish();
return true;
}
return super.onOptionsItemSelected(item);
}
}

Write Preview
Loading…
Cancel
Save