diff --git a/app/.DS_Store b/app/.DS_Store new file mode 100644 index 00000000..0f93f242 Binary files /dev/null and b/app/.DS_Store differ diff --git a/app/.gitignore b/app/.gitignore old mode 100644 new mode 100755 diff --git a/app/app.iml b/app/app.iml new file mode 100644 index 00000000..7bc6c399 --- /dev/null +++ b/app/app.iml @@ -0,0 +1,146 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle old mode 100644 new mode 100755 diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro old mode 100644 new mode 100755 diff --git a/app/src/.DS_Store b/app/src/.DS_Store new file mode 100644 index 00000000..9d6a5662 Binary files /dev/null and b/app/src/.DS_Store differ diff --git a/app/src/androidTest/java/mg/studio/weatherappdesign/ExampleInstrumentedTest.java b/app/src/androidTest/java/mg/studio/weatherappdesign/ExampleInstrumentedTest.java old mode 100644 new mode 100755 diff --git a/app/src/main/.DS_Store b/app/src/main/.DS_Store new file mode 100644 index 00000000..965650a7 Binary files /dev/null and b/app/src/main/.DS_Store differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml old mode 100644 new mode 100755 index ac739f17..137e2dde --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,11 +2,11 @@ - + { @Override protected String doInBackground(String... strings) { - String stringUrl = "http://mpianatra.com/Courses/info.txt"; + String stringUrl= "http://v.juhe.cn/weather/index?format=2&cityname=重庆&key=3f915b0cad6ae92729f8eb1f0446b66d"; HttpURLConnection urlConnection = null; BufferedReader reader; + mData.setText(getData()); + mWeek.setText(getWeek()); try { URL url = new URL(stringUrl); @@ -67,7 +125,7 @@ protected String doInBackground(String... strings) { return null; } //The temperature - return buffer.toString(); + return buffer.toString().substring(66,68); } catch (MalformedURLException e) { e.printStackTrace(); diff --git a/app/src/main/res/.DS_Store b/app/src/main/res/.DS_Store new file mode 100644 index 00000000..77805e89 Binary files /dev/null and b/app/src/main/res/.DS_Store differ diff --git a/app/src/main/res/drawable-v24/circular_shape.xml b/app/src/main/res/drawable-v24/circular_shape.xml new file mode 100644 index 00000000..7a9de96a --- /dev/null +++ b/app/src/main/res/drawable-v24/circular_shape.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable-v24/ring_shape.xml b/app/src/main/res/drawable-v24/ring_shape.xml new file mode 100644 index 00000000..67df94a4 --- /dev/null +++ b/app/src/main/res/drawable-v24/ring_shape.xml @@ -0,0 +1,19 @@ + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_selector.xml b/app/src/main/res/drawable/button_selector.xml old mode 100644 new mode 100755 index 915d05ce..687a2e8d --- a/app/src/main/res/drawable/button_selector.xml +++ b/app/src/main/res/drawable/button_selector.xml @@ -1,7 +1,7 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/button_shape.xml b/app/src/main/res/drawable/button_shape.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/button_shape_pressed.xml b/app/src/main/res/drawable/button_shape_pressed.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/design.png b/app/src/main/res/drawable/design.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/notification.png b/app/src/main/res/drawable/notification.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/partly_sunny_small.png b/app/src/main/res/drawable/partly_sunny_small.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/rainy_small.png b/app/src/main/res/drawable/rainy_small.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/rainy_up.png b/app/src/main/res/drawable/rainy_up.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/sunny_small.png b/app/src/main/res/drawable/sunny_small.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/drawable/windy_small.png b/app/src/main/res/drawable/windy_small.png old mode 100644 new mode 100755 diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml old mode 100644 new mode 100755 index c191667a..31bcafb9 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,6 +10,7 @@ tools:context="mg.studio.weatherappdesign.MainActivity"> @@ -99,6 +100,7 @@ android:id="@+id/tv_date" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:text="03/03/2018" android:textColor="@android:color/white" /> @@ -117,6 +119,9 @@ android:id="@+id/temperature_of_the_day" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_alignParentTop="true" android:gravity="right" android:text="28" android:textColor="@android:color/white" @@ -131,8 +136,21 @@ android:gravity="right" android:text="°C" android:textColor="@android:color/white" - android:textSize="22sp" /> - + android:textSize="22sp" + android:id="@+id/textView" /> + +