From 1ce17eaeda205be00e5d277eb41e69370d8a40a4 Mon Sep 17 00:00:00 2001
From: Taha Khudher <94954585+TahaKhudher@users.noreply.github.com>
Date: Thu, 9 Nov 2023 16:21:22 +0100
Subject: [PATCH 1/6] init
---
app/src/main/java/com/example/labb1_martin/MainActivity.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/app/src/main/java/com/example/labb1_martin/MainActivity.java b/app/src/main/java/com/example/labb1_martin/MainActivity.java
index 0f6b10e..51e39e2 100644
--- a/app/src/main/java/com/example/labb1_martin/MainActivity.java
+++ b/app/src/main/java/com/example/labb1_martin/MainActivity.java
@@ -11,4 +11,5 @@ protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
}
-}
\ No newline at end of file
+}
+//hej
\ No newline at end of file
From b89bf9a682d5061f925a5bdb4e26f8ebc829c205 Mon Sep 17 00:00:00 2001
From: Taha Khudher <94954585+TahaKhudher@users.noreply.github.com>
Date: Thu, 9 Nov 2023 16:21:41 +0100
Subject: [PATCH 2/6] init
---
.idea/vcs.xml | 6 ++++++
1 file changed, 6 insertions(+)
create mode 100644 .idea/vcs.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
From e128517f9f1ff4cb63986f7367d162760da7318c Mon Sep 17 00:00:00 2001
From: Taha Khudher <94954585+TahaKhudher@users.noreply.github.com>
Date: Thu, 9 Nov 2023 16:22:14 +0100
Subject: [PATCH 3/6] init
---
app/src/main/java/com/example/labb1_martin/MainActivity.java | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/src/main/java/com/example/labb1_martin/MainActivity.java b/app/src/main/java/com/example/labb1_martin/MainActivity.java
index 51e39e2..e904e72 100644
--- a/app/src/main/java/com/example/labb1_martin/MainActivity.java
+++ b/app/src/main/java/com/example/labb1_martin/MainActivity.java
@@ -12,4 +12,5 @@ protected void onCreate(Bundle savedInstanceState) {
setContentView(R.layout.activity_main);
}
}
+//hej
//hej
\ No newline at end of file
From 517b1787884d388a4d0483a7bfdd56689f7719f0 Mon Sep 17 00:00:00 2001
From: amarildo
Date: Thu, 9 Nov 2023 16:25:55 +0100
Subject: [PATCH 4/6] implement WeatherData parser
---
.idea/gradle.xml | 1 +
.idea/misc.xml | 1 -
app/build.gradle | 2 +
app/src/main/AndroidManifest.xml | 1 +
.../example/labb1_martin/MainActivity.java | 20 +++++++++
.../com/example/labb1_martin/WeatherData.java | 44 +++++++++++++++++++
.../labb1_martin/WeatherDataFetcher.java | 41 +++++++++++++++++
7 files changed, 109 insertions(+), 1 deletion(-)
create mode 100644 app/src/main/java/com/example/labb1_martin/WeatherData.java
create mode 100644 app/src/main/java/com/example/labb1_martin/WeatherDataFetcher.java
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 6d89050..ae388c2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,5 +1,6 @@
+