From e99458512c49fdd8eede925070516acd9f04172c Mon Sep 17 00:00:00 2001 From: rayacevdo45 Date: Sun, 28 Jun 2015 12:12:25 -0400 Subject: [PATCH 1/3] first commit --- src/main/AndroidManifest.xml | 2 ++ src/main/java/nyc/c4q/ListViewActivity.java | 12 ++++++++++ src/main/java/nyc/c4q/NetworkActivity.java | 22 ++++------------- .../java/nyc/c4q/NotificationActivity.java | 10 ++++++++ src/main/java/nyc/c4q/json/Zipcode.java | 13 ++++++++++ src/main/res/layout/activity_listview.xml | 24 +++++++++++++------ 6 files changed, 59 insertions(+), 24 deletions(-) diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index ea076f1..5d3830c 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -4,6 +4,8 @@ android:versionCode="2" android:versionName="1.0.0-SNAPSHOT"> + + adapter = new ArrayAdapter(this, android.R.layout.simple_list_item_1, COLORS); +// for (int i = 0; i < ListViewActivity.COLORS.length; i++) { +// View v = itemsAdapter.getView(i, null, listView); +// +// +// v.setBackground(new ColorDrawable()); + //} } } diff --git a/src/main/java/nyc/c4q/NetworkActivity.java b/src/main/java/nyc/c4q/NetworkActivity.java index 3604cfc..ad31938 100644 --- a/src/main/java/nyc/c4q/NetworkActivity.java +++ b/src/main/java/nyc/c4q/NetworkActivity.java @@ -1,29 +1,12 @@ package nyc.c4q; import android.app.Activity; -import android.os.AsyncTask; import android.os.Bundle; import android.text.method.ScrollingMovementMethod; -import android.util.Log; import android.view.View; import android.widget.Button; import android.widget.TextView; -import com.squareup.okhttp.FormEncodingBuilder; -import com.squareup.okhttp.HttpUrl; -import com.squareup.okhttp.OkHttpClient; -import com.squareup.okhttp.Request; -import com.squareup.okhttp.RequestBody; -import com.squareup.okhttp.Response; - -import java.io.BufferedInputStream; -import java.io.DataOutputStream; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; -import java.net.URLConnection; -import java.util.ArrayList; - public class NetworkActivity extends Activity { // Fields =========================== @@ -50,6 +33,10 @@ protected void onCreate(Bundle savedInstanceState) { httptextlog = (TextView) findViewById(R.id.httptextlog); httptextlog.setMovementMethod(new ScrollingMovementMethod()); + httptextlog.setText(urlParams); + + final String replaced = urlParams.replaceAll("\\+"," "); + /* The goal is to use AsyncTasks here. Shortcut to create URL in Java: @@ -82,6 +69,7 @@ public void onClick(View v) { httpbingetokhttp.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { + httptextlog.setText(replaced); } }); diff --git a/src/main/java/nyc/c4q/NotificationActivity.java b/src/main/java/nyc/c4q/NotificationActivity.java index f1f56ad..9800262 100644 --- a/src/main/java/nyc/c4q/NotificationActivity.java +++ b/src/main/java/nyc/c4q/NotificationActivity.java @@ -1,6 +1,7 @@ package nyc.c4q; import android.app.Activity; +import android.app.Notification; import android.app.NotificationManager; import android.os.Bundle; import android.widget.Button; @@ -17,7 +18,16 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_notification); + notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + Notification.Builder builder = new Notification.Builder(NotificationActivity.this); + builder.setContentTitle("notification"); + //builder.setContentText("notification"); + //builder.setSmallIcon(R.drawable.ic_launcher); + + //builder.setContentIntent(pendingIntent); + Notification notification = builder.build(); + notificationManager.notify(1, notification); Button autocancelnotification = (Button) findViewById(R.id.autocancelnotification); Button swipenotification = (Button) findViewById(R.id.swipenotification); diff --git a/src/main/java/nyc/c4q/json/Zipcode.java b/src/main/java/nyc/c4q/json/Zipcode.java index 6d4761f..c22741a 100644 --- a/src/main/java/nyc/c4q/json/Zipcode.java +++ b/src/main/java/nyc/c4q/json/Zipcode.java @@ -1,4 +1,17 @@ package nyc.c4q.json; public class Zipcode { + String field; + + public Zipcode() { + } + + public String getField() { + return field; + } + + public void setField(String field) { + this.field = field; + } + } diff --git a/src/main/res/layout/activity_listview.xml b/src/main/res/layout/activity_listview.xml index 0d4b9d6..8477634 100644 --- a/src/main/res/layout/activity_listview.xml +++ b/src/main/res/layout/activity_listview.xml @@ -9,20 +9,30 @@ + android:layout_width="0dp" + android:layout_height="match_parent" + android:text="You have not clicked anything." + android:layout_weight="3"/> + + + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="9"/> \ No newline at end of file From ef54ce446693eb6c3fc1086edc1869f2099bcbbf Mon Sep 17 00:00:00 2001 From: rayacevdo45 Date: Sun, 28 Jun 2015 12:59:26 -0400 Subject: [PATCH 2/3] 2nd commit --- .../java/nyc/c4q/NotificationActivity.java | 77 ++++++++++++++++--- src/main/res/layout/activity_notification.xml | 12 ++- 2 files changed, 76 insertions(+), 13 deletions(-) diff --git a/src/main/java/nyc/c4q/NotificationActivity.java b/src/main/java/nyc/c4q/NotificationActivity.java index 9800262..50bb022 100644 --- a/src/main/java/nyc/c4q/NotificationActivity.java +++ b/src/main/java/nyc/c4q/NotificationActivity.java @@ -4,6 +4,7 @@ import android.app.Notification; import android.app.NotificationManager; import android.os.Bundle; +import android.view.View; import android.widget.Button; public class NotificationActivity extends Activity { @@ -19,15 +20,15 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_notification); - notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); - Notification.Builder builder = new Notification.Builder(NotificationActivity.this); - builder.setContentTitle("notification"); - //builder.setContentText("notification"); - //builder.setSmallIcon(R.drawable.ic_launcher); - - //builder.setContentIntent(pendingIntent); - Notification notification = builder.build(); - notificationManager.notify(1, notification); +// notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); +// Notification.Builder builder = new Notification.Builder(NotificationActivity.this); +// builder.setContentTitle("default@c4q.nyc"); +// builder.setContentText("Touch me to dismiss me!"); +// builder.setSmallIcon(R.drawable.c4qfavicon); +// builder.setAutoCancel(true); +// +// Notification notification = builder.build(); +// notificationManager.notify(1, notification); Button autocancelnotification = (Button) findViewById(R.id.autocancelnotification); Button swipenotification = (Button) findViewById(R.id.swipenotification); @@ -35,5 +36,63 @@ protected void onCreate(Bundle savedInstanceState) { Button dismisspermanentnotification = (Button) findViewById(R.id.dismisspermanentnotification); Button buttonnotification = (Button) findViewById(R.id.buttonnotification); + + + } + public void sn (View v){ + notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + Notification.Builder builder = new Notification.Builder(NotificationActivity.this); + builder.setContentTitle("swipe@c4q.nyc"); + builder.setContentText("Swipe right if you want to meet me. Otherwise, I'm not going away."); + builder.setSmallIcon(R.drawable.c4qfavicon); + + Notification.Builder builder2 = new Notification.Builder(NotificationActivity.this); + builder2.setContentTitle("permanent@c4q.nyc"); + builder2.setContentText("I'm staying planted right here."); + builder2.setSmallIcon(R.drawable.c4qfavicon); + builder2.setOngoing(true); + + Notification notification2 = builder2.build(); + notificationManager.notify(1, notification2); + + Notification notification = builder.build(); + notificationManager.notify(1, notification); + + } + public void pn (View v){ + notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + Notification.Builder builder = new Notification.Builder(NotificationActivity.this); + builder.setContentTitle("permanent@c4q.nyc"); + builder.setContentText("I'm staying planted right here."); + builder.setSmallIcon(R.drawable.c4qfavicon); + builder.setOngoing(true); + + Notification notification = builder.build(); + notificationManager.notify(1, notification); + + Notification.Builder builder2 = new Notification.Builder(NotificationActivity.this); + builder2.setContentTitle("permanent@c4q.nyc"); + builder2.setContentText("I'm staying planted right here."); + builder2.setSmallIcon(R.drawable.c4qfavicon); + builder2.setOngoing(true); + + Notification notification2 = builder2.build(); + notificationManager.notify(1, notification2); + + } + public void dp (View v){ + notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + notificationManager.cancelAll(); + } + public void ac (View v){ + notificationManager = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); + Notification.Builder builder = new Notification.Builder(NotificationActivity.this); + builder.setContentTitle("default@c4q.nyc"); + builder.setContentText("Touch me to dismiss me!"); + builder.setSmallIcon(R.drawable.c4qfavicon); + builder.setAutoCancel(true); + + Notification notification = builder.build(); + notificationManager.notify(1, notification); } } diff --git a/src/main/res/layout/activity_notification.xml b/src/main/res/layout/activity_notification.xml index 42b7d61..2184673 100644 --- a/src/main/res/layout/activity_notification.xml +++ b/src/main/res/layout/activity_notification.xml @@ -8,25 +8,29 @@ android:id="@+id/autocancelnotification" android:text="Default Notification" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:onClick="ac"/>