Skip to content
Browse files

Merge branch 'master' of github.com:oh-haiku/oh-haiku

  • Loading branch information...
2 parents be68d81 + f6867c8 commit e60bbcc8bd80b6717c75f85925efe02efebc6e34 @jesjos jesjos committed May 1, 2012
View
4 code/OhHaiku/AndroidManifest.xml
@@ -18,6 +18,10 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
+ <activity
+ android:name=".BrowseSavedActivity"
+ android:label="@string/app_name" >
+ </activity>
</application>
</manifest>
View
19 code/OhHaiku/src/com/ohhaiku/BrowseSavedHaikusActivity.java
@@ -0,0 +1,19 @@
+package com.ohhaiku;
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+/*
+ * Activity that displays the user's saved Haikus (both finished and unfinished ones).
+ */
+
+public class BrowseSavedHaikusActivity extends Activity{
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ TextView tw = new TextView(this);
+ tw.setText("Saved Haikus");
+ setContentView(tw);
+ }
+}
View
20 code/OhHaiku/src/com/ohhaiku/HelpActivity.java
@@ -0,0 +1,20 @@
+package com.ohhaiku;
+
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+/*
+ * Activity that shows help and FAQ
+ */
+
+public class HelpActivity extends Activity{
+
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ TextView tw = new TextView(this);
+ tw.setText("Help");
+ setContentView(tw);
+ }
+}
View
6 code/OhHaiku/src/com/ohhaiku/OhHaikuActivity.java
@@ -4,11 +4,15 @@
import android.os.Bundle;
import android.widget.TextView;
+/*
+ * Main activity: shows the Haiku composition window.
+ */
+
public class OhHaikuActivity extends Activity {
/** Called when the activity is first created. */
@Override
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
+ super.onCreate(savedInstanceState);
TextView tw = new TextView(this);
tw.setText("Hello world!");
setContentView(tw);
View
18 code/OhHaiku/src/com/ohhaiku/TweetAHaikuActivity.java
@@ -0,0 +1,18 @@
+package com.ohhaiku;
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.TextView;
+
+/*
+ * Activity that allows the user to tweet a Haiku.
+ */
+
+public class TweetAHaikuActivity extends Activity{
+ @Override
+ public void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ TextView tw = new TextView(this);
+ tw.setText("Tweet a haiku");
+ setContentView(tw);
+ }
+}

0 comments on commit e60bbcc

Please sign in to comment.
Something went wrong with that request. Please try again.