diff --git a/DinDag/bin/DinDag.apk b/DinDag/bin/DinDag.apk index e82b449..18f3866 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 7f9b527..e039d6a 100644 Binary files a/DinDag/bin/classes.dex and b/DinDag/bin/classes.dex differ diff --git a/DinDag/bin/dexedLibs/android-support-v4-3b29930e25d173fefe5bdf6743798314.jar b/DinDag/bin/dexedLibs/android-support-v4-3b29930e25d173fefe5bdf6743798314.jar deleted file mode 100644 index 83fca6f..0000000 Binary files a/DinDag/bin/dexedLibs/android-support-v4-3b29930e25d173fefe5bdf6743798314.jar and /dev/null differ diff --git a/DinDag/bin/dexedLibs/jsoup-1.7.1-2d21966066442463654b2c8abd3c3313.jar b/DinDag/bin/dexedLibs/jsoup-1.7.1-2d21966066442463654b2c8abd3c3313.jar deleted file mode 100644 index 5d6f663..0000000 Binary files a/DinDag/bin/dexedLibs/jsoup-1.7.1-2d21966066442463654b2c8abd3c3313.jar and /dev/null differ diff --git a/DinDag/bin/jarlist.cache b/DinDag/bin/jarlist.cache deleted file mode 100644 index 1b5ec3f..0000000 --- a/DinDag/bin/jarlist.cache +++ /dev/null @@ -1,3 +0,0 @@ -# cache for current jar dependecy. DO NOT EDIT. -# format is -# Encoding is UTF-8 diff --git a/DinDag/bin/resources.ap_ b/DinDag/bin/resources.ap_ index d9350ef..53319dc 100644 Binary files a/DinDag/bin/resources.ap_ and b/DinDag/bin/resources.ap_ differ diff --git a/DinDag/res/layout/activity_login.xml b/DinDag/res/layout/activity_login.xml index 7366fec..9f29fbf 100755 --- a/DinDag/res/layout/activity_login.xml +++ b/DinDag/res/layout/activity_login.xml @@ -9,7 +9,7 @@ android:id="@+id/tfUsername" android:layout_width="match_parent" android:layout_height="wrap_content" - android:capitalize="none" + android:inputType="none" android:ems="10" android:hint="@string/usernameHint" > diff --git a/DinDag/res/values/strings.xml b/DinDag/res/values/strings.xml index 29fc63d..f73ea49 100755 --- a/DinDag/res/values/strings.xml +++ b/DinDag/res/values/strings.xml @@ -7,7 +7,7 @@ Logga in Användarnamn Lösenord - Denna app har utvecklats av Crille, Malin, Johan och Viktor. Om du visste hur mycket blod som ligger bakom utvecklingen av den här appen skulle du omedelbart springa hit och bjuda oss pÃ¥ kaffe. + Denna app har utvecklats av Crille, Malin, Johan och Victor. Om du visste hur mycket blod som ligger bakom utvecklingen av den här appen skulle du omedelbart springa hit och bjuda oss pÃ¥ kaffe. Tweets frÃ¥n Högskolan Väst \ No newline at end of file diff --git a/DinDag/src/se/hv/dindag/Login.java b/DinDag/src/se/hv/dindag/Login.java index a738d58..3fdb97e 100755 --- a/DinDag/src/se/hv/dindag/Login.java +++ b/DinDag/src/se/hv/dindag/Login.java @@ -44,7 +44,7 @@ public class Login extends Activity { * information from the textboxes and create a String with theese * two, whicjh is sent to the Hash-maker */ - @Override + public void onClick(View v) { Toast.makeText(getApplicationContext(), "Kollar dina uppgifter...", Toast.LENGTH_LONG).show(); diff --git a/DinDag/src/se/hv/dindag/MyDay.java b/DinDag/src/se/hv/dindag/MyDay.java index 74dc035..910418a 100755 --- a/DinDag/src/se/hv/dindag/MyDay.java +++ b/DinDag/src/se/hv/dindag/MyDay.java @@ -77,7 +77,7 @@ public class MyDay extends ListActivity { // Wait for an item in the list to be clicked lv.setOnItemClickListener(new OnItemClickListener() { - @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { // getting values from selected ListItem diff --git a/DinDag/src/se/hv/dindag/Start.java b/DinDag/src/se/hv/dindag/Start.java index ea2383d..387ac97 100755 --- a/DinDag/src/se/hv/dindag/Start.java +++ b/DinDag/src/se/hv/dindag/Start.java @@ -69,7 +69,7 @@ public class Start extends ListActivity { myBuild.setMessage("Du Šr inte ansluten till Internet. Utan en Internetanslutning kan du vŠl inte begŠra att jag ska kunna hŠmta din information?"); myBuild.setNeutralButton("OK", new DialogInterface.OnClickListener() { - @Override + public void onClick(DialogInterface dialog, int which) { Log.i("Start", "Kommit hit"); finish(); @@ -99,7 +99,7 @@ public class Start extends ListActivity { Button login = (Button) findViewById(R.id.btnLogin); login.setOnClickListener(new OnClickListener() { - @Override + public void onClick(View v) { // Login-button pressed. Start the Login-activity Intent myIntent = new Intent(Start.this, Login.class); @@ -138,7 +138,6 @@ public class Start extends ListActivity { // Wait for an item in the list to be clicked lv.setOnItemClickListener(new OnItemClickListener() { - @Override public void onItemClick(AdapterView parent, View view, int position, long id) { Toast.makeText(getApplicationContext(),