diff --git a/DinDag/AndroidManifest.xml b/DinDag/AndroidManifest.xml index ec88280..021477f 100755 --- a/DinDag/AndroidManifest.xml +++ b/DinDag/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/DinDag/bin/AndroidManifest.xml b/DinDag/bin/AndroidManifest.xml index ec88280..021477f 100644 --- a/DinDag/bin/AndroidManifest.xml +++ b/DinDag/bin/AndroidManifest.xml @@ -1,6 +1,6 @@ diff --git a/DinDag/bin/DinDag.apk b/DinDag/bin/DinDag.apk index fe25269..e82b449 100644 Binary files a/DinDag/bin/DinDag.apk and b/DinDag/bin/DinDag.apk differ diff --git a/DinDag/bin/classes.dex b/DinDag/bin/classes.dex index afc5131..7f9b527 100644 Binary files a/DinDag/bin/classes.dex and b/DinDag/bin/classes.dex differ diff --git a/DinDag/bin/resources.ap_ b/DinDag/bin/resources.ap_ index 9e1d772..d9350ef 100644 Binary files a/DinDag/bin/resources.ap_ and b/DinDag/bin/resources.ap_ differ diff --git a/DinDag/src/se/hv/dindag/AboutUs.java b/DinDag/src/se/hv/dindag/AboutUs.java index 1487e6e..18aa5dd 100755 --- a/DinDag/src/se/hv/dindag/AboutUs.java +++ b/DinDag/src/se/hv/dindag/AboutUs.java @@ -1,6 +1,5 @@ package se.hv.dindag; -import se.hv.crille.R; import android.app.Activity; import android.os.Bundle; diff --git a/DinDag/src/se/hv/dindag/DinDagMenu.java b/DinDag/src/se/hv/dindag/DinDagMenu.java index 4475435..de7b7b4 100755 --- a/DinDag/src/se/hv/dindag/DinDagMenu.java +++ b/DinDag/src/se/hv/dindag/DinDagMenu.java @@ -1,12 +1,7 @@ package se.hv.dindag; -import se.hv.crille.R; import android.app.Activity; -import android.content.Intent; import android.os.Bundle; -import android.util.Log; -import android.view.MenuItem; -import android.widget.Toast; /** * Fires up the DinDagMenu diff --git a/DinDag/src/se/hv/dindag/Login.java b/DinDag/src/se/hv/dindag/Login.java index 8438ed7..a738d58 100755 --- a/DinDag/src/se/hv/dindag/Login.java +++ b/DinDag/src/se/hv/dindag/Login.java @@ -4,19 +4,14 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.ArrayList; -import se.hv.crille.R; - import android.app.Activity; import android.app.AlertDialog; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.View; import android.view.View.OnClickListener; import android.widget.Button; import android.widget.EditText; -import android.widget.ListView; -import android.widget.TextView; import android.widget.Toast; /** @@ -51,8 +46,8 @@ public class Login extends Activity { */ @Override public void onClick(View v) { - Toast.makeText(getApplicationContext(), "Kollar dina uppgifter...", - Toast.LENGTH_LONG).show(); + Toast.makeText(getApplicationContext(), + "Kollar dina uppgifter...", Toast.LENGTH_LONG).show(); // Loginknappen har klickats. Kolla uppgifterna EditText username = (EditText) findViewById(R.id.tfUsername); EditText password = (EditText) findViewById(R.id.tfPassword); diff --git a/DinDag/src/se/hv/dindag/LoginData.java b/DinDag/src/se/hv/dindag/LoginData.java index 75a6c23..440cfd6 100755 --- a/DinDag/src/se/hv/dindag/LoginData.java +++ b/DinDag/src/se/hv/dindag/LoginData.java @@ -1,7 +1,9 @@ package se.hv.dindag; import java.util.ArrayList; -import org.apache.http.*; + +import org.apache.http.HttpEntity; +import org.apache.http.HttpResponse; import org.apache.http.client.methods.HttpPost; import org.apache.http.impl.client.DefaultHttpClient; import org.apache.http.util.EntityUtils; diff --git a/DinDag/src/se/hv/dindag/MyDay.java b/DinDag/src/se/hv/dindag/MyDay.java index 44baafe..74dc035 100755 --- a/DinDag/src/se/hv/dindag/MyDay.java +++ b/DinDag/src/se/hv/dindag/MyDay.java @@ -4,13 +4,10 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.ExecutionException; -import se.hv.crille.R; - import android.app.AlertDialog; import android.app.ListActivity; import android.content.Intent; import android.os.Bundle; -import android.util.Log; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; @@ -66,7 +63,6 @@ public class MyDay extends ListActivity { // Fill the ArrayList with the items we got from the ASynkTask myDayItems = myDayNews.get(); - // Add the menuItems to our ListView ListAdapter adapter = new SimpleAdapter(this, myDayItems, R.layout.activity_myday_list, new String[] { KEY_TITLE, @@ -108,6 +104,7 @@ public class MyDay extends ListActivity { e.printStackTrace(); } } + /** * Displays the menu for the startup screen */ @@ -128,7 +125,8 @@ public class MyDay extends ListActivity { case R.id.menuSave: AlertDialog.Builder savePopup = new AlertDialog.Builder(this); savePopup.setTitle("Spara dina loginuppgifter"); - savePopup.setMessage("HŠr kan vi implementera en SQLlite-databas fšr att spara uppgifterna man matade in."); + savePopup + .setMessage("HŠr kan vi implementera en SQLlite-databas fšr att spara uppgifterna man matade in."); savePopup.setNeutralButton("OK", null); savePopup.show(); @@ -137,7 +135,8 @@ public class MyDay extends ListActivity { case R.id.menuMail: AlertDialog.Builder mailPopup = new AlertDialog.Builder(this); mailPopup.setTitle("Kolla mail"); - mailPopup.setMessage("…ppnar helt enkelt en WebView till studenternas Live-mail sida. Vi behšver inte ta med nŒgon login eller sŒ, bara šppna en WebView."); + mailPopup + .setMessage("…ppnar helt enkelt en WebView till studenternas Live-mail sida. Vi behšver inte ta med nŒgon login eller sŒ, bara šppna en WebView."); mailPopup.setNeutralButton("OK", null); mailPopup.show(); diff --git a/DinDag/src/se/hv/dindag/Start.java b/DinDag/src/se/hv/dindag/Start.java index 3cacbd0..ea2383d 100755 --- a/DinDag/src/se/hv/dindag/Start.java +++ b/DinDag/src/se/hv/dindag/Start.java @@ -4,8 +4,6 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.concurrent.ExecutionException; -import se.hv.crille.R; - import android.app.AlertDialog; import android.app.ListActivity; import android.content.Context; diff --git a/DinDag/src/se/hv/dindag/TwitterFeed.java b/DinDag/src/se/hv/dindag/TwitterFeed.java index 1a73cb3..24260bb 100755 --- a/DinDag/src/se/hv/dindag/TwitterFeed.java +++ b/DinDag/src/se/hv/dindag/TwitterFeed.java @@ -14,8 +14,6 @@ import org.apache.http.util.EntityUtils; import org.json.JSONArray; import org.json.JSONObject; -import se.hv.crille.R; - import android.app.ListActivity; import android.app.ProgressDialog; import android.content.Context; diff --git a/DinDag/src/se/hv/dindag/WebReader.java b/DinDag/src/se/hv/dindag/WebReader.java index 4ae5ecb..af2dec9 100755 --- a/DinDag/src/se/hv/dindag/WebReader.java +++ b/DinDag/src/se/hv/dindag/WebReader.java @@ -1,11 +1,9 @@ package se.hv.dindag; -import se.hv.crille.R; import android.app.Activity; import android.content.Intent; import android.os.Bundle; import android.webkit.WebView; -import android.widget.Toast; /** * Opens up a new WebView and loads the URL of the chosen element from the feed diff --git a/DinDag/src/se/hv/dindag/WebSinglePost.java b/DinDag/src/se/hv/dindag/WebSinglePost.java index b90e3f3..9075cf0 100755 --- a/DinDag/src/se/hv/dindag/WebSinglePost.java +++ b/DinDag/src/se/hv/dindag/WebSinglePost.java @@ -13,7 +13,8 @@ import android.os.AsyncTask; * point out wich DIV-tag we want to retrive. The result is stored in a String, * wich is returned as a result. * - * @param The URL of a certain website + * @param The + * URL of a certain website * @return The String of text contained in a specific DIV-tag * @author imcoh * diff --git a/DinDag/src/se/hv/dindag/XMLDataHandler.java b/DinDag/src/se/hv/dindag/XMLDataHandler.java index 4893b9f..f947bfa 100755 --- a/DinDag/src/se/hv/dindag/XMLDataHandler.java +++ b/DinDag/src/se/hv/dindag/XMLDataHandler.java @@ -11,11 +11,8 @@ import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; -import android.app.ProgressDialog; -import android.content.Context; import android.net.ParseException; import android.os.AsyncTask; -import android.os.SystemClock; import android.text.Html; import android.text.Spanned; import android.util.Log; diff --git a/DinDag/src/se/hv/dindag/XMLParser.java b/DinDag/src/se/hv/dindag/XMLParser.java index 34ca415..afe34bf 100755 --- a/DinDag/src/se/hv/dindag/XMLParser.java +++ b/DinDag/src/se/hv/dindag/XMLParser.java @@ -40,7 +40,8 @@ public class XMLParser { /** * Getting XML from URL making HTTP request * - * @param url string + * @param url + * string */ public String getXmlFromUrl(String url) { String xml = null; @@ -68,7 +69,8 @@ public class XMLParser { /** * Getting XML DOM element * - * @param XML string + * @param XML + * string * @return The DOM-object */ public Document getDomElement(String xml) { @@ -99,7 +101,8 @@ public class XMLParser { /** * Gets the value of the chosen node * - * @param elem element + * @param elem + * element * @return The value of the Node */ public final String getElementValue(Node elem) {