change publicIP layout

bepass-org · Feb 25, 2024 · 7b88e02 · 7b88e02
1 parent 5e5e760
commit 7b88e02
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 36 deletions.
diff --git a/app/src/main/java/org/bepass/oblivion/MainActivity.java b/app/src/main/java/org/bepass/oblivion/MainActivity.java
@@ -1,14 +1,9 @@
 package org.bepass.oblivion;
 
 import android.Manifest;
-import android.content.ComponentName;
-import android.content.Context;
 import android.content.Intent;
-import android.content.ServiceConnection;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.IBinder;
-import android.os.Messenger;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.ProgressBar;
@@ -18,17 +13,15 @@
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.content.ContextCompat;
 
 import com.suke.widget.SwitchButton;
 
 public class MainActivity extends ConnectionAwareBaseActivity {
     // Views
     ImageView infoIcon, bugIcon, settingsIcon;
     TouchAwareSwitch switchButton;
-    TextView stateText, publicIP, ipDetails;
-    private ProgressBar ipProgressBar;
+    TextView stateText, publicIP;
+    ProgressBar ipProgressBar;
     FileManager fileManager;
     Boolean canShowNotification = false;
     private ActivityResultLauncher<String> pushNotificationPermissionLauncher;
@@ -100,13 +93,10 @@ private void getIPDetails() {
         int port = Integer.parseInt(fileManager.getString("USERSETTING_port"));
         PublicIPUtils.getIPDetails(port, (details) -> {
             ipProgressBar.setVisibility(View.GONE);
-            if (details.ip != null){
-                String ipString = "Your IP: " + details.ip;
-                String locationString = details.flag + " " + details.country + ", " + details.city;
+            if (details.ip != null && details.flag != null){
+                String ipString = details.ip  + " " + details.flag;
                 publicIP.setText(ipString);
-                ipDetails.setText(locationString);
                 publicIP.setVisibility(View.VISIBLE);
-                ipDetails.setVisibility(View.VISIBLE);
             }
         });
     }
@@ -120,14 +110,12 @@ private void connected() {
     private void connecting() {
         stateText.setText("در حال اتصال...");
         publicIP.setVisibility(View.GONE);
-        ipDetails.setVisibility(View.GONE);
         switchButton.setChecked(true, false);
     }
 
     private void disconnected() {
         stateText.setText("متصل نیستید");
         publicIP.setVisibility(View.GONE);
-        ipDetails.setVisibility(View.GONE);
         switchButton.setChecked(false, false);
     }
 
@@ -176,7 +164,6 @@ private void init() {
         switchButton = findViewById(R.id.switch_button);
         stateText = findViewById(R.id.state_text);
         publicIP = findViewById(R.id.publicIP);
-        ipDetails = findViewById(R.id.ipDetails);
         ipProgressBar = (ProgressBar)findViewById(R.id.ipProgressBar);
 
         infoIcon.setOnClickListener(v -> startActivity(new Intent(MainActivity.this, InfoActivity.class)));

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -85,7 +85,7 @@
       android:id="@+id/state_text"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="64dp"
+      android:layout_marginTop="96dp"
       android:fontFamily="@font/shabnammedium"
       android:text="متصل نیستید"
       android:textColor="@color/black"
@@ -98,22 +98,21 @@
       android:id="@+id/publicIP"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      android:layout_marginTop="48dp"
+      android:layout_marginTop="24dp"
       android:fontFamily="@font/shabnammedium"
       android:visibility="invisible"
       android:text="Public IP"
       android:textColor="@color/black"
-      android:textSize="16sp"
+      android:textSize="18sp"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/state_text" />
 
   <ProgressBar
       android:id="@+id/ipProgressBar"
-      style="?android:attr/progressBarStyleLarge"
-      android:layout_marginTop="48dp"
+      android:layout_marginTop="24dp"
       android:visibility="invisible"
-      android:layout_width="48dp"
+      android:layout_width="36dp"
       android:layout_height="wrap_content"
       android:indeterminate="true"
       android:indeterminateTint="#FFA200"
@@ -122,19 +121,6 @@
       app:layout_constraintStart_toStartOf="parent"
       app:layout_constraintTop_toBottomOf="@id/state_text"/>
 
-  <TextView
-      android:id="@+id/ipDetails"
-      android:layout_width="wrap_content"
-      android:layout_height="wrap_content"
-      android:fontFamily="@font/shabnammedium"
-      android:visibility="invisible"
-      android:text="Country, City"
-      android:textColor="@color/black"
-      android:textSize="16sp"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/publicIP" />
-
   <TextView
     android:id="@+id/app_name_1"
     android:layout_width="wrap_content"