From a863f3e18d88e797f2c9da8c0628137c70df8646 Mon Sep 17 00:00:00 2001
From: di7chro <crille@crille.org>
Date: Tue, 26 Feb 2013 09:56:14 +0100
Subject: [PATCH] =?UTF-8?q?Mera=20k=C3=A4llkod?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 DinDag/AndroidManifest.xml               | 67 ++++++++++++++++++++++--
 DinDag/bin/AndroidManifest.xml           | 67 ++++++++++++++++++++++--
 DinDag/bin/classes/.gitignore            |  1 +
 DinDag/gen/se/hv/dindag/BuildConfig.java |  6 ---
 DinDag/gen/se/hv/dindag/R.java           | 36 -------------
 DinDag/res/values/strings.xml            | 10 +++-
 DinDag/res/values/styles.xml             |  0
 7 files changed, 138 insertions(+), 49 deletions(-)
 mode change 100644 => 100755 DinDag/AndroidManifest.xml
 delete mode 100644 DinDag/gen/se/hv/dindag/BuildConfig.java
 delete mode 100644 DinDag/gen/se/hv/dindag/R.java
 mode change 100644 => 100755 DinDag/res/values/strings.xml
 mode change 100644 => 100755 DinDag/res/values/styles.xml

diff --git a/DinDag/AndroidManifest.xml b/DinDag/AndroidManifest.xml
old mode 100644
new mode 100755
index 6059bb5..ec88280
--- a/DinDag/AndroidManifest.xml
+++ b/DinDag/AndroidManifest.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.hv.dindag"
+    package="se.hv.crille"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -7,11 +8,71 @@
         android:minSdkVersion="9"
         android:targetSdkVersion="17" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:clearTaskOnLaunch="true"
+        android:icon="@drawable/icon_gubben"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/hvTheme" >
+        <activity
+            android:name="se.hv.dindag.Start"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.WebReader"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.WEBREADER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.Login"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.MyDay"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.DinDagMenu"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.AboutUs"
+            android:clearTaskOnLaunch="true"
+            android:label="Om appen"
+            android:theme="@android:style/Theme.Dialog" >
+            <intent-filter>
+                <action android:name="se.hv.dindag.ABOUT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.TwitterFeed"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/twitterTitle" >
+            <intent-filter>
+                <action android:name="se.hv.dindag.TWITTER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/DinDag/bin/AndroidManifest.xml b/DinDag/bin/AndroidManifest.xml
index 6059bb5..ec88280 100644
--- a/DinDag/bin/AndroidManifest.xml
+++ b/DinDag/bin/AndroidManifest.xml
@@ -1,5 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="se.hv.dindag"
+    package="se.hv.crille"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -7,11 +8,71 @@
         android:minSdkVersion="9"
         android:targetSdkVersion="17" />
 
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
-        android:icon="@drawable/ic_launcher"
+        android:clearTaskOnLaunch="true"
+        android:icon="@drawable/icon_gubben"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/hvTheme" >
+        <activity
+            android:name="se.hv.dindag.Start"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.WebReader"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+            <intent-filter>
+                <action android:name="android.intent.action.WEBREADER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.Login"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.MyDay"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.DinDagMenu"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/app_name" >
+        </activity>
+        <activity
+            android:name="se.hv.dindag.AboutUs"
+            android:clearTaskOnLaunch="true"
+            android:label="Om appen"
+            android:theme="@android:style/Theme.Dialog" >
+            <intent-filter>
+                <action android:name="se.hv.dindag.ABOUT" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="se.hv.dindag.TwitterFeed"
+            android:clearTaskOnLaunch="true"
+            android:label="@string/twitterTitle" >
+            <intent-filter>
+                <action android:name="se.hv.dindag.TWITTER" />
+
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/DinDag/bin/classes/.gitignore b/DinDag/bin/classes/.gitignore
index 8f383c0..5520da2 100644
--- a/DinDag/bin/classes/.gitignore
+++ b/DinDag/bin/classes/.gitignore
@@ -1 +1,2 @@
 /se
+/.gitignore
diff --git a/DinDag/gen/se/hv/dindag/BuildConfig.java b/DinDag/gen/se/hv/dindag/BuildConfig.java
deleted file mode 100644
index 45c695a..0000000
--- a/DinDag/gen/se/hv/dindag/BuildConfig.java
+++ /dev/null
@@ -1,6 +0,0 @@
-/** Automatically generated file. DO NOT MODIFY */
-package se.hv.dindag;
-
-public final class BuildConfig {
-    public final static boolean DEBUG = true;
-}
\ No newline at end of file
diff --git a/DinDag/gen/se/hv/dindag/R.java b/DinDag/gen/se/hv/dindag/R.java
deleted file mode 100644
index 40efe91..0000000
--- a/DinDag/gen/se/hv/dindag/R.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/* AUTO-GENERATED FILE.  DO NOT MODIFY.
- *
- * This class was automatically generated by the
- * aapt tool from the resource data it found.  It
- * should not be modified by hand.
- */
-
-package se.hv.dindag;
-
-public final class R {
-    public static final class attr {
-    }
-    public static final class drawable {
-        public static final int ic_launcher=0x7f020000;
-    }
-    public static final class string {
-        public static final int app_name=0x7f030000;
-    }
-    public static final class style {
-        /** 
-        Base application theme, dependent on API level. This theme is replaced
-        by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-    
-
-            Theme customizations available in newer API levels can go in
-            res/values-vXX/styles.xml, while customizations related to
-            backward-compatibility can go here.
-        
-         */
-        public static final int AppBaseTheme=0x7f040000;
-        /**  Application theme. 
- All customizations that are NOT specific to a particular API-level can go here. 
-         */
-        public static final int AppTheme=0x7f040001;
-    }
-}
diff --git a/DinDag/res/values/strings.xml b/DinDag/res/values/strings.xml
old mode 100644
new mode 100755
index 50f8c7d..29fc63d
--- a/DinDag/res/values/strings.xml
+++ b/DinDag/res/values/strings.xml
@@ -1,5 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <string name="app_name">DinDag</string>
+    <string name="app_name">Din Dag på HV</string>
+    <string name="hello_world">Hello world!</string>
+    <string name="menu_settings">Settings</string>
+    <string name="btnLoginText">Logga in</string>
+    <string name="usernameHint">Användarnamn</string>
+    <string name="passwordHint">Lösenord</string>
+    <string name="txtAbout">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.</string>
+    <string name="twitterTitle">Tweets från Högskolan Väst</string>
 
 </resources>
\ No newline at end of file
diff --git a/DinDag/res/values/styles.xml b/DinDag/res/values/styles.xml
old mode 100644
new mode 100755