Merge pull request #4 from ReSo7200/Version-3

Version 3
xHookman · Oct 1, 2024 · 3f2478d · 3f2478d
2 parents 7a3e613 + c05e08a
commit 3f2478d
Show file tree

Hide file tree

Showing 10 changed files with 430 additions and 168 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,10 +6,10 @@ android {
         applicationId "com.chacha.igexperiments"
         minSdkVersion 26
         targetSdkVersion 34
-        versionCode 1
-        versionName '2.5.2'
+        versionName '3.0'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        versionCode 30
     }
 
     buildTypes {

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:tools="http://schemas.android.com/tools"
+    xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"
         android:maxSdkVersion="29" />
-    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <application

diff --git a/app/src/main/java/com/chacha/igexperiments/MainActivity.java b/app/src/main/java/com/chacha/igexperiments/MainActivity.java
diff --git a/app/src/main/java/com/chacha/igexperiments/Module.java b/app/src/main/java/com/chacha/igexperiments/Module.java
diff --git a/app/src/main/java/com/chacha/igexperiments/Utils.java b/app/src/main/java/com/chacha/igexperiments/Utils.java
@@ -6,5 +6,5 @@ public class Utils {
     public static final String PREFS_NAME = "IGExperiments";
     public static final String DEFAULT_CLASS_TO_HOOK = "X.1XX";
     public static final String DEFAULT_METHOD_TO_HOOK = "A00";
-    public static final String DEFAULT_SECOND_CLASS_TO_HOOK = "X.000";
+    public static final String DEFAULT_SECOND_CLASS_TO_HOOK = "com.instagram.common.session.UserSession";
 }
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -12,8 +12,8 @@
         android:id="@+id/linearLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintTop_toTopOf="parent"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        app:layout_constraintTop_toTopOf="parent">
 
     </LinearLayout>
 
@@ -51,8 +51,8 @@
             android:text="@string/error"
             android:textAlignment="center"
             android:textColor="@android:color/holo_red_dark"
-            android:visibility="gone"
-            android:textSize="@dimen/text_error_size" />
+            android:textSize="@dimen/text_error_size"
+            android:visibility="gone" />
 
     </LinearLayout>
 
@@ -62,18 +62,17 @@
         android:layout_height="wrap_content"
         android:layout_marginHorizontal="@dimen/default_marginHorizontal"
         android:layout_marginBottom="@dimen/default_marginBottom"
-        app:layout_constraintBottom_toTopOf="@+id/layoutHeckerMode">
+        android:orientation="horizontal"
+        app:layout_constraintBottom_toTopOf="@+id/layoutHeckerMode"
+        tools:ignore="ExtraText">
 
-        <androidx.appcompat.widget.SwitchCompat
-            android:id="@+id/useHeckerMode"
+        <Button
+            android:id="@+id/modeToggleButton"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginHorizontal="@dimen/switch_marginHorizontal"
             android:layout_weight="1"
-            android:text="@string/use_hecker_mode"
-            android:thumb="@drawable/thumb_layerlist"
-            app:track="@drawable/track_selector"
-            tools:ignore="TouchTargetSizeCheck" />
+            android:text="@string/normal_mode"
+        tools:ignore="TouchTargetSizeCheck" />
 
         <TextView
             android:id="@+id/textView3"
@@ -84,6 +83,7 @@
             android:textColor="@android:color/holo_green_light" />
     </LinearLayout>
 
+
     <LinearLayout
         android:id="@+id/layoutHeckerMode"
         android:layout_width="match_parent"
@@ -165,16 +165,16 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/spinner_height"
             android:entries="@array/ig_version"
-            android:spinnerMode="dropdown"
-            android:popupTheme="@style/SpinnerPopup"/>
+            android:popupTheme="@style/SpinnerPopup"
+            android:spinnerMode="dropdown" />
     </LinearLayout>
 
     <TextView
         android:id="@+id/textView2"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/default_marginTop"
         android:layout_marginHorizontal="@dimen/default_marginHorizontal"
+        android:layout_marginTop="@dimen/default_marginTop"
         android:autoLink="web"
         android:text="@string/infohook"
         app:layout_constraintTop_toBottomOf="@+id/btnKill" />

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,7 +2,7 @@
     <string name="app_name">IGexperiments</string>
     <string name="top_red_text">1. Choose you Instagram version\n2. Download and install the apk\n3. Kill and launch Instagram\n4. Long press the home button &amp; enjoy!</string>
     <string name="app_kill">Kill &amp; launch Instagram</string>
-    <string name="infohook">The last version is not supported? Contribute! Read the FAQ from the github repo.\nUse the HECKER mode to try what you found!</string>
+    <string name="infohook">The last version is not supported? Contribute! Read the FAQ from the github repo.\nUse the HECKER mode to try what you found!\nOr try your luck with Auto mode.</string>
     <string name="classname">Class name</string>
     <string name="methodname">Method name</string>
     <string name="use_hecker_mode">Use HECKER mode</string>
@@ -14,4 +14,7 @@
     <string name="donation_thanks">Thanks by advanced if you support my works! you\'re nice :)</string>
     <string name="ex_class">ex : X.8W4</string>
     <string name="ex_method">ex : A00</string>
+    <string name="normal_mode">Normal Mode</string>
+    <string name="hecker_mode">Hecker Mode</string>
+    <string name="auto_mode">Auto Mode</string>
 </resources>
diff --git a/gradle.properties b/gradle.properties
@@ -16,7 +16,7 @@ org.gradle.jvmargs=-Xmx2048m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=false
 android.nonFinalResIds=false