Updated to 1.5.2.1

Merge pull request #47 from TrueMLGPro/pre-1.5.2.1-hotfix

Author: TrueMLGPro

app/build.gradle

@@ -21,8 +21,8 @@ android {
 		applicationId "com.truemlgpro.wifiinfo"
 		minSdkVersion 21
 		targetSdkVersion 33
-		versionCode 1520
-		versionName "1.5.2"
+		versionCode 1521
+		versionName "1.5.2.1"
 	}
 	buildTypes {
 		release {

app/src/main/java/com/truemlgpro/wifiinfo/RouterSetupActivity.java

@@ -18,6 +18,7 @@
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.ProgressBar;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -34,7 +35,9 @@
 
 public class RouterSetupActivity extends AppCompatActivity {
 	private Toolbar toolbar;
+	private LinearLayout textview_nonetworkconn_container;
 	private TextView textview_nonetworkconn;
+	private LinearLayout webview_container;
 	private WebView webview_main;
 	private ProgressBar progressBarLoading;
 	private SwipeRefreshLayout swipeRefresh;
@@ -64,7 +67,9 @@ protected void onCreate(Bundle savedInstanceState)
 		setContentView(R.layout.router_setup_activity);
 
 		toolbar = (Toolbar) findViewById(R.id.toolbar);
+		textview_nonetworkconn_container = (LinearLayout) findViewById(R.id.textview_nonetworkconn_container);
 		textview_nonetworkconn = (TextView) findViewById(R.id.textview_nonetworkconn);
+		webview_container = (LinearLayout) findViewById(R.id.webview_container);
 		webview_main = (WebView) findViewById(R.id.webview_main);
 		progressBarLoading = (ProgressBar) findViewById(R.id.progressBarLoading);
 		swipeRefresh = (SwipeRefreshLayout) findViewById(R.id.swipe_refresh);
@@ -275,15 +280,19 @@ public void checkNetworkConnectivity() {
 	}
 
 	public void showWidgets() {
+		webview_container.setVisibility(View.VISIBLE);
 		webview_main.setVisibility(View.VISIBLE);
 		swipeRefresh.setVisibility(View.VISIBLE);
+		textview_nonetworkconn_container.setVisibility(View.GONE);
 		textview_nonetworkconn.setVisibility(View.GONE);
 	}
 
 	public void hideWidgets() {
+		webview_container.setVisibility(View.GONE);
 		webview_main.setVisibility(View.GONE);
 		progressBarLoading.setVisibility(View.GONE);
 		swipeRefresh.setVisibility(View.GONE);
+		textview_nonetworkconn_container.setVisibility(View.VISIBLE);
 		textview_nonetworkconn.setVisibility(View.VISIBLE);
 	}
 

app/src/main/java/com/truemlgpro/wifiinfo/URLtoIPActivity.java

@@ -188,6 +188,7 @@ public void checkNetworkConnectivity(Boolean calledFromToolbarAction) {
 	}
 
 	public void showWidgets() {
+		url_to_ip_scroll.setVisibility(View.VISIBLE);
 		textview_ipFromURL.setVisibility(View.VISIBLE);
 		mTextInputLayout.setVisibility(View.VISIBLE);
 		mEditText.setVisibility(View.VISIBLE);
@@ -196,6 +197,7 @@ public void showWidgets() {
 	}
 
 	public void hideWidgets() {
+		url_to_ip_scroll.setVisibility(View.GONE);
 		textview_ipFromURL.setVisibility(View.GONE);
 		mTextInputLayout.setVisibility(View.GONE);
 		mEditText.setVisibility(View.GONE);

app/src/main/java/com/truemlgpro/wifiinfo/WhoIsToolActivity.java

@@ -262,6 +262,7 @@ public void checkNetworkConnectivity(Boolean calledFromToolbarAction) {
 	}
 
 	public void showWidgets() {
+		who_is_scroll.setVisibility(View.VISIBLE);
 		textview_who_is_results.setVisibility(View.VISIBLE);
 		input_layout.setVisibility(View.VISIBLE);
 		edittext_main.setVisibility(View.VISIBLE);
@@ -270,6 +271,7 @@ public void showWidgets() {
 	}
 
 	public void hideWidgets() {
+		who_is_scroll.setVisibility(View.GONE);
 		textview_who_is_results.setVisibility(View.GONE);
 		input_layout.setVisibility(View.GONE);
 		edittext_main.setVisibility(View.GONE);

app/src/main/res/layout/router_setup_activity.xml

@@ -17,16 +17,23 @@
 		app:titleTextColor="?attr/TitleTextColor"
 		app:subtitleTextColor="?attr/SubtitleTextColor" />
 
-	<TextView
-		android:id="@+id/textview_nonetworkconn"
-		android:layout_width="wrap_content"
-		android:layout_height="wrap_content"
-		android:layout_margin="16dp"
-		android:textSize="18sp"
-		android:textColor="?TextColor"
-		android:layout_gravity="center"
-		android:visibility="gone"
-		android:text="No Connection" />
+	<LinearLayout
+		android:id="@+id/textview_nonetworkconn_container"
+		android:layout_width="match_parent"
+		android:layout_height="match_parent"
+		android:gravity="center"
+		android:visibility="gone">
+
+		<TextView
+			android:id="@+id/textview_nonetworkconn"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:textSize="18sp"
+			android:textColor="?TextColor"
+			android:visibility="gone"
+			android:text="No Wi-Fi Connection" />
+
+	</LinearLayout>
 
 	<ProgressBar
 		android:id="@+id/progressBarLoading"
@@ -37,6 +44,7 @@
 		android:visibility="gone" />
 
 	<LinearLayout
+		android:id="@+id/webview_container"
 		android:layout_width="match_parent"
 		android:layout_height="wrap_content"
 		android:gravity="center"

fastlane/metadata/android/en-US/changelogs/1521.txt

@@ -0,0 +1,2 @@
+Fixed some widgets in `URLToIPActivity` and `WhoIsToolActivity` not getting hidden if there was no network connection
+Fixed `No Wi-Fi Connection` text alignment in `RouterSetupActivity`