addGuidev2

appvpluss · Feb 7, 2025 · b3bb968 · b3bb968
1 parent b13814a
commit b3bb968
Show file tree

Hide file tree

Showing 17 changed files with 165 additions and 61 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -69,7 +69,9 @@
         <activity
             android:exported="false"
             android:name="com.v2plus.app.ui.SettingsActivity" />
-
+        <activity
+            android:exported="false"
+            android:name="com.v2plus.app.ui.FAQ" />
         <activity
             android:exported="false"
             android:name="com.v2plus.app.ui.LogcatActivity" />

diff --git a/app/src/main/kotlin/com/v2plus/app/ui/FAQ.kt b/app/src/main/kotlin/com/v2plus/app/ui/FAQ.kt
@@ -0,0 +1,17 @@
+package com.v2plus.app.ui
+import android.os.Bundle
+import android.widget.Button
+import androidx.appcompat.app.AppCompatActivity
+import com.v2plus.com.v2plus.app.R
+
+class FAQ : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_faq)
+        val btnClose = findViewById<Button>(R.id.btn_close)
+        btnClose.setOnClickListener {
+            finish()
+        }
+
+    }
+}
diff --git a/app/src/main/kotlin/com/v2plus/app/ui/MainActivity.kt b/app/src/main/kotlin/com/v2plus/app/ui/MainActivity.kt
@@ -98,7 +98,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         setContentView(view)
         title = getString(R.string.title_server)
         setSupportActionBar(binding.toolbar)
-
+        Toast.makeText(this@MainActivity,"اطلاع از راهنمای برنامه با انتخاب آیکون >؟< در بالای صفحه",Toast.LENGTH_LONG).show()
         binding.fab.setOnClickListener {
             if (mainViewModel.isRunning.value == true) {
                 Utils.stopVService(this)
@@ -134,16 +134,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
         mItemTouchHelper?.attachToRecyclerView(binding.recyclerView)
 
 
-        val toggle = ActionBarDrawerToggle(
-            this,
-            binding.drawerLayout,
-            binding.toolbar,
-            R.string.navigation_drawer_open,
-            R.string.navigation_drawer_close
-        )
-        binding.drawerLayout.addDrawerListener(toggle)
-        toggle.syncState()
-        binding.navView.setNavigationItemSelectedListener(this)
+
 
 
         setupViewModel()
@@ -273,6 +264,13 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
             true
         }
 
+        R.id.FAQ ->{
+            intent = Intent (this@MainActivity,FAQ::class.java)
+            startActivity(intent)
+
+            true
+        }
+
         R.id.support -> {
             openTelegram(this, "v2plussupport")
             true
@@ -595,20 +593,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList
     }
 
     override fun onNavigationItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.settings -> {
-                startActivity(Intent(this, SettingsActivity::class.java)
-                    .putExtra("isRunning", mainViewModel.isRunning.value == true))
-            }
-            R.id.user_asset_setting -> {
-                startActivity(Intent(this, UserAssetActivity::class.java))
-            }
-            R.id.logcat -> {
-                startActivity(Intent(this, LogcatActivity::class.java))
-            }
 
-        }
-        binding.drawerLayout.closeDrawer(GravityCompat.START)
         return true
     }
 }
diff --git a/app/src/main/res/drawable/baseline_question_mark_24.xml b/app/src/main/res/drawable/baseline_question_mark_24.xml
@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#595959" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+
+    <path android:fillColor="@android:color/white" android:pathData="M11.07,12.85c0.77,-1.39 2.25,-2.21 3.11,-3.44c0.91,-1.29 0.4,-3.7 -2.18,-3.7c-1.69,0 -2.52,1.28 -2.87,2.34L6.54,6.96C7.25,4.83 9.18,3 11.99,3c2.35,0 3.96,1.07 4.78,2.41c0.7,1.15 1.11,3.3 0.03,4.9c-1.2,1.77 -2.35,2.31 -2.97,3.45c-0.25,0.46 -0.35,0.76 -0.35,2.24h-2.89C10.58,15.22 10.46,13.95 11.07,12.85zM14,20c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2c0,-1.1 0.9,-2 2,-2S14,18.9 14,20z"/>
+
+</vector>
diff --git a/app/src/main/res/layout/activity_faq.xml b/app/src/main/res/layout/activity_faq.xml
@@ -0,0 +1,99 @@
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    android:layoutDirection="rtl"
+    android:orientation="vertical">
+
+    <TextView
+        android:id="@+id/tv_title"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="راهنمایی:"
+        android:textSize="18sp"
+        android:textStyle="bold"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_update"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="دکمه به روز رسانی: لیست سرورها را به‌روزرسانی می‌کند."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_guide"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="دکمه راهنمایی: بخش‌های مختلف برنامه را توضیح می‌دهد."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_support"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="دکمه پشتیبانی: شما را به بخش پشتیبانی تلگرام هدایت می‌کند."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_restart"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="شروع دوباره سرویس: سرویس را مجدداً فعال می‌کند."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_test"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="تست همه کانفیگ‌ها: سرعت هر آیتم را محاسبه و نمایش می‌دهد."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_sort"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="مرتب‌سازی بر اساس سرعت: آیتم‌ها را از سریع‌ترین به کندترین مرتب می‌کند."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_vpn_warning"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="⚠️ اگر لیست سرورها نمایش داده نشد، فیلترشکن خود را خاموش کرده و دکمه به‌روزرسانی را بزنید."
+        android:textSize="16sp"
+        android:textColor="#FF0000"
+        android:layout_marginBottom="8dp"/>
+
+    <TextView
+        android:id="@+id/tv_speed_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text=" کنار هر آیتم یک عدد نمایش داده می‌شود. اگر مقدار -1 باشد، یعنی آن کانفیگ کار نمی‌کند. اگر مقدار دیگری باشد، کمترین عدد به معنی بهترین سرعت است."
+        android:textSize="16sp"
+        android:textColor="#000"
+        android:layout_marginBottom="16dp"/>
+
+    <Button
+        android:id="@+id/btn_close"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="بستن صفحه"
+        android:onClick="closeFAQ"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/menu/menu_drawer.xml b/app/src/main/res/menu/menu_drawer.xml
@@ -3,39 +3,4 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:showIn="navigation_view">
 
-    <group
-        android:id="@+id/group_main">
-        <!--<item
-            android:id="@+id/sub_setting"
-            android:icon="@drawable/ic_subscriptions_24dp"
-            android:title="@string/title_sub_setting" />-->
-        <item
-            android:id="@+id/settings"
-            android:icon="@drawable/ic_settings_24dp"
-            android:title="@string/title_settings" />
-        <item
-                android:id="@+id/user_asset_setting"
-                android:icon="@drawable/ic_file_24dp"
-                android:title="@string/title_user_asset_setting" />
-    </group>
-
-    <group android:id="@+id/group_id2">
-        <!--<item
-            android:id="@+id/promotion"
-            android:icon="@drawable/ic_promotion_24dp"
-            android:title="@string/title_pref_promotion" />-->
-        <item
-            android:id="@+id/logcat"
-            android:icon="@drawable/ic_logcat_24dp"
-            android:title="@string/title_logcat" />
-        <!--<item
-            android:id="@+id/about"
-            android:icon="@drawable/ic_about_24dp"
-            android:title="@string/title_about" />
-        &lt;!&ndash; place holder for version text at the bottom &ndash;&gt;-->
-        <item
-            android:id="@+id/placeholder"
-            android:enabled="false"
-            android:title="" />
-    </group>
 </menu>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
@@ -8,8 +8,13 @@
         app:showAsAction="always"/>
     <item
         android:id="@+id/support"
-        android:title="@string/title_sub_update"
+        android:title="@string/support"
         android:icon="@drawable/baseline_support_agent_24"
+        app:showAsAction="ifRoom"/>
+    <item
+        android:id="@+id/FAQ"
+        android:title="@string/faq"
+        android:icon="@drawable/baseline_question_mark_24"
         app:showAsAction="always">
         <!--<menu>
             <item

diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
@@ -271,6 +271,8 @@
     <string name="title_pref_fragment_length">طول الجزء (الحد الأدنى - الحد الأقصى)</string>
     <string name="title_pref_fragment_interval">فاصل الجزء (الحد الأدنى - الحد الأقصى)</string>
     <string name="title_pref_fragment_enabled">تفعيل الجزء</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
     <string-array name="share_method">
         <item>رمز استجابة سريعة (QRcode)</item>

diff --git a/app/src/main/res/values-bn/strings.xml b/app/src/main/res/values-bn/strings.xml
@@ -268,6 +268,8 @@
     <string name="title_pref_fragment_length">ফ্র্যাগমেন্ট দৈর্ঘ্য (ন্যূনতম-সর্বাধিক)</string>
     <string name="title_pref_fragment_interval">ফ্র্যাগমেন্ট ইন্টারভ্যাল (ন্যূনতম-সর্বাধিক)</string>
     <string name="title_pref_fragment_enabled">ফ্র্যাগমেন্ট সক্রিয় করুন</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
     <string-array name="share_method">
         <item>QR কোড</item>
         <item>ক্লিপবোর্ডে রপ্তানি করুন</item>

diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
@@ -299,6 +299,8 @@
     </string-array>
     <string name="menu_item_add_asset">افزودن</string>
     <string name="menu_item_add_url">افزودن لینک</string>
+    <string name="support">پشتیبانی</string>
+    <string name="faq">سوالات متداول</string>
 
     <string-array name="ui_mode_night">
         <item>Follow system</item>

diff --git a/app/src/main/res/values-night/strings.xml b/app/src/main/res/values-night/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
+</resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
@@ -272,6 +272,8 @@
     <string name="title_pref_fragment_length">Длина фрагмента (от - до)</string>
     <string name="title_pref_fragment_interval">Интервал фрагментов (от - до)</string>
     <string name="title_pref_fragment_enabled">Использовать фрагментирование</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
     <string-array name="share_method">
         <item>QR-код</item>

diff --git a/app/src/main/res/values-sw360dp-v13/strings.xml b/app/src/main/res/values-sw360dp-v13/strings.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
+</resources>
diff --git a/app/src/main/res/values-vi/strings.xml b/app/src/main/res/values-vi/strings.xml
@@ -309,5 +309,7 @@
     <string name="title_pref_fragment_length">Fragment Length (min-max)</string>
     <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
     <string name="title_pref_fragment_enabled">Enable Fragment</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
 </resources>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -271,6 +271,8 @@
     <string name="title_pref_fragment_length">分片包长（最小-最大）</string>
     <string name="title_pref_fragment_interval">分片间隔（最小-最大）</string>
     <string name="title_pref_fragment_enabled">启用分片（Fragment）</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
     <string-array name="share_method">
         <item>二维码</item>

diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
@@ -272,6 +272,8 @@
     <string name="title_pref_fragment_length">分片包長（最小-最大）</string>
     <string name="title_pref_fragment_interval">分片間隔（最小-最大）</string>
     <string name="title_pref_fragment_enabled">啟用分片（Fragment）</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
     <string-array name="share_method">
         <item>QR Code</item>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -274,6 +274,8 @@
     <string name="title_pref_fragment_length">Fragment Length (min-max)</string>
     <string name="title_pref_fragment_interval">Fragment Interval (min-max)</string>
     <string name="title_pref_fragment_enabled">Enable Fragment</string>
+    <string name="support">support</string>
+    <string name="faq">FAQ</string>
 
     <string-array name="share_method">
         <item>QRcode</item>