From 3e90f405016b04830e80c2f808fa4abc633bceda Mon Sep 17 00:00:00 2001
From: drop <writeups@n0w>
Date: Fri, 8 Nov 2024 14:57:41 +0100
Subject: [PATCH 1/3] Colors update

---
 .../main/res/color/thumb_color_selector.xml   |  5 ++
 .../main/res/color/track_color_selector.xml   |  5 ++
 app/src/main/res/layout/activity_main.xml     | 73 ++++++++++++-------
 app/src/main/res/values-night/themes.xml      |  9 +--
 app/src/main/res/values/colors.xml            |  1 -
 app/src/main/res/values/themes.xml            |  4 +-
 gradle/libs.versions.toml                     |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 8 files changed, 65 insertions(+), 36 deletions(-)
 create mode 100644 app/src/main/res/color/thumb_color_selector.xml
 create mode 100644 app/src/main/res/color/track_color_selector.xml

diff --git a/app/src/main/res/color/thumb_color_selector.xml b/app/src/main/res/color/thumb_color_selector.xml
new file mode 100644
index 0000000..750a1bb
--- /dev/null
+++ b/app/src/main/res/color/thumb_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#EF6456" android:state_checked="true" />
+    <item android:color="#BDBDBD" /> <!-- Default color when off -->
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/color/track_color_selector.xml b/app/src/main/res/color/track_color_selector.xml
new file mode 100644
index 0000000..b58bebe
--- /dev/null
+++ b/app/src/main/res/color/track_color_selector.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#FFB3AB" android:state_checked="true" />
+    <item android:color="#E0E0E0" /> <!-- Default color when off -->
+</selector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bdb8bc1..3501eca 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -9,49 +9,55 @@
     tools:context=".MainActivity">
 
     <TextView
-        android:id="@+id/frida_server_state"
+        android:id="@+id/frida_version"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="@string/frida_server_state_label"
+        android:text="@string/frida_version"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.498"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.139" />
+        app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
+        app:layout_constraintVertical_bias="0.98" />
+
 
     <Button
         android:id="@+id/btn_install_update_server"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="#EF6456"
         android:text="@string/btn_update_frida"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/frida_server_state"
-        app:layout_constraintVertical_bias="0.07999998" />
+        app:layout_constraintVertical_bias="0.116" />
 
     <Button
         android:id="@+id/btn_toggle_server"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:backgroundTint="#EF6456"
         android:text="@string/btn_kill_frida_server"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_install_update_server"
-        app:layout_constraintVertical_bias="0.04000002" />
+        app:layout_constraintVertical_bias="0.046" />
 
-    <TextView
-        android:id="@+id/frida_version"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/frida_version"
-        app:layout_constraintBottom_toBottomOf="parent"
+    <com.google.android.material.materialswitch.MaterialSwitch
+        android:id="@+id/switch_start_on_boot"
+        android:layout_width="260dp"
+        android:layout_height="48dp"
+        android:text="@string/start_on_boot"
+        app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
-        app:layout_constraintVertical_bias="0.98" />
+        app:layout_constraintVertical_bias="0.274"
+        app:trackTint="@color/track_color_selector" />
 
     <com.google.android.material.materialswitch.MaterialSwitch
         android:id="@+id/switch_listen_on_network"
@@ -60,35 +66,50 @@
         android:text="@string/listen_on_network_interface"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.50"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/switch_start_on_boot"
-        app:layout_constraintVertical_bias="0" />
+        app:layout_constraintVertical_bias="0.021"
+        app:trackTint="@color/track_color_selector" />
 
-    <com.google.android.material.materialswitch.MaterialSwitch
-        android:id="@+id/switch_start_on_boot"
-        android:layout_width="260dp"
-        android:layout_height="48dp"
-        android:text="@string/start_on_boot"
-        app:layout_constraintBottom_toTopOf="@+id/frida_version"
+    <TextView
+        android:id="@+id/frida_server_state"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/frida_server_state_label"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
-        app:layout_constraintVertical_bias="0.18" />
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.342" />
 
     <com.google.android.material.textfield.TextInputEditText
         android:id="@+id/input_port_number"
-        android:imeOptions="actionDone"
         android:layout_width="270dp"
         android:layout_height="48dp"
         android:hint="@string/port_number_hint"
+        android:imeOptions="actionDone"
         android:inputType="number"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/switch_listen_on_network"
-        app:layout_constraintVertical_bias="0.0">
+        app:layout_constraintVertical_bias="0.032">
 
     </com.google.android.material.textfield.TextInputEditText>
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="154dp"
+        android:layout_height="130dp"
+        app:layout_constraintBottom_toTopOf="@+id/frida_server_state"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_bias="0.504"
+        app:srcCompat="@mipmap/ic_launcher" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index ab7b5a8..8a338c6 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,7 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <!-- Base application theme. -->
-    <style name="Base.Theme.FridaManager" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your dark theme here. -->
-        <!-- <item name="colorPrimary">@color/my_dark_primary</item> -->
+<resources>
+    <!-- Optional: You can leave this empty or match the light theme -->
+    <style name="Base.Theme.FridaManager" parent="Theme.Material3.Light.NoActionBar">
+        <item name="android:forceDarkAllowed">false</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 4f00339..7bdaac4 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="accent">#FFEF6456</color>
-
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 00cd3c4..a808b1a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,8 +1,8 @@
 <resources xmlns:tools="http://schemas.android.com/tools">
     <!-- Base application theme. -->
     <style name="Base.Theme.FridaManager" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Customize your light theme here. -->
-        <!-- <item name="colorPrimary">@color/my_light_primary</item> -->
+        <!-- Disable dark mode -->
+        <item name="android:forceDarkAllowed">false</item>
     </style>
 
     <style name="Theme.FridaManager" parent="Base.Theme.FridaManager" />
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index e13773b..311bb56 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.6.0"
+agp = "8.7.1"
 junit = "4.13.2"
 junitVersion = "1.2.1"
 espressoCore = "3.6.1"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 237d588..a975906 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Tue Sep 10 22:25:34 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

From 99cb718ff8695df8ed51fdd022198c9b4580557a Mon Sep 17 00:00:00 2001
From: drop <writeups@n0w>
Date: Fri, 8 Nov 2024 20:59:18 +0100
Subject: [PATCH 2/3] Correcting Dark Mode

---
 app/src/main/res/layout/activity_main.xml | 8 ++++++--
 app/src/main/res/values-night/colors.xml  | 4 ++++
 app/src/main/res/values-night/themes.xml  | 7 ++++++-
 app/src/main/res/values/colors.xml        | 4 ++++
 app/src/main/res/values/themes.xml        | 5 +----
 5 files changed, 21 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/values-night/colors.xml

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3501eca..020862e 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,10 +15,10 @@
         android:text="@string/frida_version"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
-        app:layout_constraintVertical_bias="0.98" />
-
+        app:layout_constraintVertical_bias="0.82" />
 
     <Button
         android:id="@+id/btn_install_update_server"
@@ -51,6 +51,7 @@
         android:layout_width="260dp"
         android:layout_height="48dp"
         android:text="@string/start_on_boot"
+        android:textColor="@color/text_color"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -64,6 +65,7 @@
         android:layout_width="260dp"
         android:layout_height="48dp"
         android:text="@string/listen_on_network_interface"
+        android:textColor="@color/text_color"
         app:layout_constraintBottom_toTopOf="@+id/frida_version"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
@@ -98,12 +100,14 @@
         app:layout_constraintTop_toBottomOf="@+id/switch_listen_on_network"
         app:layout_constraintVertical_bias="0.032">
 
+
     </com.google.android.material.textfield.TextInputEditText>
 
     <ImageView
         android:id="@+id/imageView"
         android:layout_width="154dp"
         android:layout_height="130dp"
+        android:contentDescription="@string/main_logo"
         app:layout_constraintBottom_toTopOf="@+id/frida_server_state"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
new file mode 100644
index 0000000..615be88
--- /dev/null
+++ b/app/src/main/res/values-night/colors.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="text_color">@color/white</color>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 8a338c6..b5e0940 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,11 @@
 <resources>
     <!-- Optional: You can leave this empty or match the light theme -->
     <style name="Base.Theme.FridaManager" parent="Theme.Material3.Light.NoActionBar">
-        <item name="android:forceDarkAllowed">false</item>
+        <item name="android:windowBackground">@color/dark_background</item>
+        <item name="android:textColor">@color/white</item>
+        <item name="android:textColorPrimary">@color/white</item>
+        <item name="android:textColorSecondary">@color/white</item>
+        <item name="android:textColorTertiary">@color/white</item>
+        <item name="android:textColorHint">@color/white_50_percent</item>
     </style>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 7bdaac4..bc83ec6 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -3,4 +3,8 @@
     <color name="accent">#FFEF6456</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
+    <color name="dark_background">#FF121212</color>
+    <color name="white_50_percent">#80FFFFFF</color>
+    <color name="text_color">@color/black</color>
+
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index a808b1a..8ef547f 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,9 +1,6 @@
-<resources xmlns:tools="http://schemas.android.com/tools">
+<resources>
     <!-- Base application theme. -->
     <style name="Base.Theme.FridaManager" parent="Theme.Material3.DayNight.NoActionBar">
-        <!-- Disable dark mode -->
-        <item name="android:forceDarkAllowed">false</item>
     </style>
-
     <style name="Theme.FridaManager" parent="Base.Theme.FridaManager" />
 </resources>
\ No newline at end of file

From 8ab62733d717cde466b76c6db889a8f90188ad1a Mon Sep 17 00:00:00 2001
From: drop <writeups@n0w>
Date: Fri, 8 Nov 2024 22:37:51 +0100
Subject: [PATCH 3/3] Adding Server PID information

---
 .../main/java/sh/damon/fridamgr/FridaServer.java | 16 +++++++++++++---
 .../java/sh/damon/fridamgr/MainActivity.java     |  7 +++++++
 app/src/main/res/layout/activity_main.xml        | 16 ++++++++++++++--
 app/src/main/res/values/strings.xml              |  3 +++
 4 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/sh/damon/fridamgr/FridaServer.java b/app/src/main/java/sh/damon/fridamgr/FridaServer.java
index 3394f7b..52abc6a 100644
--- a/app/src/main/java/sh/damon/fridamgr/FridaServer.java
+++ b/app/src/main/java/sh/damon/fridamgr/FridaServer.java
@@ -89,6 +89,8 @@ public enum State {
     private final DownloadState mDownloadState = new DownloadState();
     private State mState = State.UNKNOWN;
 
+    private int mPid = -1;
+
     public FridaServer(File baseDir) {
         mName = "frida-server";
         mBinary = new File(baseDir, mName);
@@ -309,7 +311,7 @@ public void updateState() {
         try {
             if (ShellUtil.runAsSuperuser(String.format("test -e %s", mBinary)).isFail()) {
                 mState = State.NOT_INSTALLED;
-
+                mPid = -1;
                 return;
             }
 
@@ -318,16 +320,24 @@ public void updateState() {
             final ShellUtil.ProcessResponse res = ShellUtil.runAsSuperuser(String.format("pgrep %s", mName));
             if (res.isFail()) {
                 mState = State.STOPPED;
+                mPid = -1;
             }
             else {
                 mState = State.RUNNING;
+                try {
+                    mPid = Integer.parseInt(res.out.trim());
+                } catch (NumberFormatException e) {
+                    mPid = -1;
+                }
             }
-        }
-        finally {
+        } finally {
             emit();
         }
     }
 
+    public int getPid() {
+        return mPid;
+    }
 
     private static FridaServer instance = null;
     public static FridaServer init(File baseDir) {
diff --git a/app/src/main/java/sh/damon/fridamgr/MainActivity.java b/app/src/main/java/sh/damon/fridamgr/MainActivity.java
index b968ec9..e3c2f51 100644
--- a/app/src/main/java/sh/damon/fridamgr/MainActivity.java
+++ b/app/src/main/java/sh/damon/fridamgr/MainActivity.java
@@ -185,6 +185,13 @@ private void updateElements() {
         fridaStateLbl.setText(String.format(getString(R.string.frida_server_state_label), getString(server.getStateStringId())));
         fridaVersionLbl.setText(String.format(getString(R.string.frida_version), server.getVersion()));
 
+        TextView fridaPidLbl = findViewById(R.id.frida_pid);
+        if (server.getState() == FridaServer.State.RUNNING && server.getPid() != -1) {
+            fridaPidLbl.setText(String.format(getString(R.string.frida_server_pid), String.valueOf(server.getPid())));
+        } else {
+            fridaPidLbl.setText(String.format(getString(R.string.frida_server_pid), getString(R.string.not_running)));
+        }
+
         btnUpdateInstallFrida.setEnabled(true);
         btnServerStateSwitch.setEnabled(true);
         btnUpdateInstallFrida.setText(R.string.btn_update_frida);
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 020862e..74fda77 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -20,6 +20,18 @@
         app:layout_constraintTop_toBottomOf="@+id/btn_toggle_server"
         app:layout_constraintVertical_bias="0.82" />
 
+    <TextView
+        android:id="@+id/frida_pid"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/frida_server_pid"
+        app:layout_constraintBottom_toTopOf="@+id/btn_install_update_server"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.498"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/frida_server_state"
+        app:layout_constraintVertical_bias="0.321" />
+
     <Button
         android:id="@+id/btn_install_update_server"
         android:layout_width="wrap_content"
@@ -28,10 +40,10 @@
         android:text="@string/btn_update_frida"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.5"
+        app:layout_constraintHorizontal_bias="0.497"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/frida_server_state"
-        app:layout_constraintVertical_bias="0.116" />
+        app:layout_constraintVertical_bias="0.166" />
 
     <Button
         android:id="@+id/btn_toggle_server"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8dc136b..f34b7c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -25,4 +25,7 @@
     <string name="port_number_hint">Port Number</string>
 
     <string name="tile_toggle_server">Toggle Frida</string>
+    <string name="main_logo">Logo</string>
+    <string name="frida_server_pid">Server PID: <b>%s</b></string>
+    <string name="not_running">None</string>
 </resources>
\ No newline at end of file