Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Added a description on how to use the tokens. 2.1 is nearly ready at …

…this point.
  • Loading branch information...
commit 3dd812007f9c4d9d466a603541aaf55eb1810378 1 parent f61028b
@vincetran vincetran authored
View
2  local.properties
@@ -7,4 +7,4 @@
# location of the SDK. This is only used by Ant
# For customization when using a Version Control System, please read the
# header note.
-sdk.dir=/opt/android
+sdk.dir=C:\\android
View
228 res/layout/tutorial.xml
@@ -72,7 +72,32 @@
<TableRow>
<TextView
android:layout_column="0"
+ android:text="@string/tokens_how"
+ android:textStyle="bold"
+ android:gravity="center"
+ android:layout_span="3"
+ android:paddingBottom="3dip"/>
+
+ </TableRow>
+ <TableRow>
+ <TextView
+ android:layout_column="0"
+ android:text="@string/tokens_desc"
+ android:gravity="left"
+ android:layout_span="3"
+ />
+
+ </TableRow>
+ <View
+ android:paddingTop="3dip"
+ android:paddingBottom="3dip"
+ android:layout_height="2dip"
+ android:background="#FF909090" />
+ <TableRow>
+ <TextView
+ android:layout_column="0"
android:text="@string/date_and_time"
+ android:textStyle="bold"
android:gravity="center"
android:layout_span="3"/>
</TableRow>
@@ -81,15 +106,15 @@
android:layout_column="0"
android:text="@string/ptttt"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vtttt"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -97,15 +122,15 @@
android:layout_column="0"
android:text="@string/pttt"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vttt"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -113,15 +138,15 @@
android:layout_column="0"
android:text="@string/pt"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vt"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<View
@@ -131,6 +156,7 @@
<TextView
android:layout_column="0"
android:text="@string/date_only"
+ android:textStyle="bold"
android:gravity="center"
android:layout_span="3"/>
</TableRow>
@@ -139,15 +165,15 @@
android:layout_column="0"
android:text="@string/pxxxx"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vxxxx"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -155,15 +181,15 @@
android:layout_column="0"
android:text="@string/pxxx"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vxxx"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -171,15 +197,15 @@
android:layout_column="0"
android:text="@string/px"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vx"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<View
@@ -189,6 +215,7 @@
<TextView
android:layout_column="0"
android:text="@string/time_only"
+ android:textStyle="bold"
android:gravity="center"
android:layout_span="3"/>
</TableRow>
@@ -197,15 +224,15 @@
android:layout_column="0"
android:text="@string/pX"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vX"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<View
@@ -224,6 +251,7 @@
<TextView
android:layout_column="0"
android:text="@string/custom"
+ android:textStyle="bold"
android:gravity="center"
android:layout_span="3"/>
</TableRow>
@@ -232,22 +260,22 @@
android:layout_column="0"
android:text="@string/pMMMM"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/month"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vMMMM"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -255,22 +283,22 @@
android:layout_column="0"
android:text="@string/pMMM"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/month"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vMMM"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -278,22 +306,22 @@
android:layout_column="0"
android:text="@string/pM"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/month"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vM"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -301,22 +329,22 @@
android:layout_column="0"
android:text="@string/pcccc"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/day"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vcccc"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -324,22 +352,22 @@
android:layout_column="0"
android:text="@string/pccc"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/day"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vccc"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -347,22 +375,22 @@
android:layout_column="0"
android:text="@string/pd"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/day"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vd"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -370,22 +398,22 @@
android:layout_column="0"
android:text="@string/pyy"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/year"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vyy"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -393,22 +421,22 @@
android:layout_column="0"
android:text="@string/py"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/year"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vy"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -416,22 +444,22 @@
android:layout_column="0"
android:text="@string/ph"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/hour_12"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vh"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -439,22 +467,22 @@
android:layout_column="0"
android:text="@string/pk"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/hour_24"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vk"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -462,22 +490,22 @@
android:layout_column="0"
android:text="@string/pmm"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/minute"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vmm"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
<TableRow>
@@ -485,22 +513,22 @@
android:layout_column="0"
android:text="@string/pss"
android:gravity="right"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="1"
android:text="@string/second"
android:gravity="center"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
<TextView
android:layout_column="2"
android:text="@string/vss"
android:gravity="left"
- android:paddingLeft="7dip"
- android:paddingRight="7dip"
+ android:paddingLeft="3dip"
+ android:paddingRight="3dip"
android:paddingBottom="3dip" />
</TableRow>
</TableLayout>
View
3  res/values/strings.xml
@@ -17,6 +17,9 @@
<string name="context_edit">Edit</string>
<string name="context_clip_save">Save</string>
+ <string name="tokens_how">How to use:</string>
+ <string name="tokens_desc">A token will expand to the appropriate format whenever you select to copy it.\nFor example, \"Today is %ccc\" will expand to \"Today is Thursday.\"\n</string>
+
<string name="date_and_time">Date and time</string>
<string name="ptttt">%tttt</string>
<string name="vtttt">January 10, 2012 9:19 PM</string>
View
3  src/com/designatum_1393/textspansion/tutorial.java
@@ -31,9 +31,6 @@ public void onCreate(Bundle savedInstanceState)
tutImage = (ImageView) findViewById(R.id.tut_image);
tokensTut = (ScrollView) findViewById(R.id.tokens);
- tutImage.setVisibility(View.GONE);
- tokensTut.setVisibility(View.VISIBLE);
-
btnNext = (Button) findViewById(R.id.next_button);
btnBack = (Button) findViewById(R.id.back_button);
if (counter == 0)
Please sign in to comment.
Something went wrong with that request. Please try again.