Merge branch 'master' of https://github.com/miguelf03kai/weatherApp

miguelf03kai · Jan 6, 2024 · 2e2b39a · 2e2b39a
2 parents 3816b23 + 5ee2fb3
commit 2e2b39a
Show file tree

Hide file tree

Showing 10 changed files with 94 additions and 206 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -6,7 +6,6 @@
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <!--<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />-->
 
     <application
         android:allowBackup="true"

diff --git a/app/src/main/ic_no_connection-web.png b/app/src/main/ic_no_connection-web.png
diff --git a/app/src/main/java/com/miguelf03kai/weatherapp/MainActivity.java b/app/src/main/java/com/miguelf03kai/weatherapp/MainActivity.java
diff --git a/app/src/main/java/com/miguelf03kai/weatherapp/utils/Connection.java b/app/src/main/java/com/miguelf03kai/weatherapp/utils/Connection.java
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -168,40 +168,4 @@
 
     </RelativeLayout>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/noConnectionRelativeLayout"
-        android:visibility="gone">
-
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:id="@+id/imageView"
-            android:background="@mipmap/ic_no_connection"
-            android:layout_centerVertical="true"
-            android:layout_centerHorizontal="true"
-            android:minHeight="80dp"
-            android:minWidth="80dp" />
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
-            android:text="Please check your connection!"
-            android:id="@+id/textView2"
-            android:layout_below="@+id/imageView"
-            android:layout_centerHorizontal="true"
-            android:textColor="#ffffff" />
-
-        <Button
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="Try Again"
-            android:id="@+id/button"
-            android:layout_below="@+id/textView2"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="48dp" />
-    </RelativeLayout>
-
 </RelativeLayout>
diff --git a/app/src/main/res/mipmap-hdpi/ic_no_connection.png b/app/src/main/res/mipmap-hdpi/ic_no_connection.png
diff --git a/app/src/main/res/mipmap-mdpi/ic_no_connection.png b/app/src/main/res/mipmap-mdpi/ic_no_connection.png
diff --git a/app/src/main/res/mipmap-xhdpi/ic_no_connection.png b/app/src/main/res/mipmap-xhdpi/ic_no_connection.png
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_no_connection.png b/app/src/main/res/mipmap-xxhdpi/ic_no_connection.png
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_no_connection.png b/app/src/main/res/mipmap-xxxhdpi/ic_no_connection.png