进入暗门前添加引导界面

.idea/misc.xml

@@ -6,6 +6,9 @@
         <entry key="../../../.gradle/caches/transforms-3/816ef70ee883c3b31320bc09b1356673/transformed/xplibcommon/res/drawable/selector_seekbar_bg.xml" value="0.1" />
         <entry key="../../../.gradle/caches/transforms-3/dae954c5fd9608ef94a7528c5de015a2/transformed/xplibcommon/res/drawable/selector_switch_thumb.xml" value="0.12" />
         <entry key="../../../.gradle/caches/transforms-3/e72acc6db89adf91a5f1ea627e4e83d1/transformed/xplibcommon/res/drawable/selector_seekbar_bg.xml" value="0.156" />
+        <entry key="..\:/40877/Documents/workspace/XPSettings_gitlab/app/src/main/res/drawable/shape_button_black_round_stroke.xml" value="0.24" />
+        <entry key="..\:/40877/Documents/workspace/XPSettings_gitlab/app/src/main/res/layout/activity_alert.xml" value="0.6" />
+        <entry key="..\:/40877/Documents/workspace/XPSettings_gitlab/app/src/main/res/layout/activity_blackdoor_password.xml" value="0.4466666666666667" />
         <entry key="app/src/main/res/drawable-xhdpi/button_shape.xml" value="0.124" />
         <entry key="app/src/main/res/drawable-xhdpi/selector_seekbar_bg.xml" value="0.1" />
         <entry key="app/src/main/res/drawable/view_shape.xml" value="0.112" />

app/src/main/AndroidManifest.xml

@@ -233,6 +233,11 @@
             android:exported="false"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:launchMode="singleInstance" />
+        <activity
+            android:name=".Activity.AlertActivity"
+            android:exported="false"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:launchMode="singleInstance" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/xplora/xpsettings/Activity/AlertActivity.java

@@ -0,0 +1,26 @@
+package com.xplora.xpsettings.Activity;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.Button;
+
+import com.xplora.xpsettings.R;
+
+public class AlertActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_alert);
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN);
+        Button btnNext = (Button) findViewById(R.id.btn_next);
+        btnNext.setOnClickListener(view -> {
+            finish();
+            Intent i = new Intent(AlertActivity.this, BlackDoorPasswordActivity.class);
+            startActivity(i);
+        });
+
+    }
+}

app/src/main/java/com/xplora/xpsettings/Activity/SettingsActivity.java

@@ -118,7 +118,7 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
                     fragment7.show(this.getFragmentManager(), Constant.PACKAGE_NAME);
                     break;
                 case 11:
-                    intent = new Intent(this, BlackDoorPasswordActivity.class);
+                    intent = new Intent(this, AlertActivity.class);
                     startActivity(intent);
                     break;
                 case 12:
@@ -252,4 +252,4 @@ public class SettingsActivity extends BaseActivity implements Listener.SelectFra
         super.onResume();
         isLockClick = false;
     }
-}
+}

app/src/main/res/drawable/shape_button_black_round_stroke.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="#383838" />
+
+    <corners
+        android:bottomLeftRadius="14dp"
+        android:bottomRightRadius="14dp"
+        android:topLeftRadius="14dp"
+        android:topRightRadius="14dp" />
+
+    <stroke
+        android:color="@color/white"
+        android:width="1dp"/>
+</shape>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@+id/text_content"
+        android:layout_width="120dp"
+        android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="56dp"
+        android:textSize="10sp"
+        android:text="@string/ensure_guardian_summary"
+        android:textColor="#FFFFFFFF"
+        android:textAlignment="center"
+        />
+
+    <Button
+        android:id="@+id/btn_next"
+        style="@style/xp_style_button_all"
+        android:layout_width="80dp"
+        android:layout_height="28dp"
+        android:layout_marginTop="120dp"
+        android:layout_centerHorizontal="true"
+        android:background="@drawable/shape_button_black_round_stroke"
+        android:text="@string/next"
+        android:textAllCaps="false"
+        android:textSize="12dp"
+        android:textStyle="bold"/>
+
+
+</RelativeLayout>

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

@@ -6,16 +6,6 @@
     android:background="@color/black"
     >
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textColor="@color/white"
-        android:textSize="10sp"
-        android:layout_marginTop="5dp"
-        android:gravity="center"
-        android:layout_gravity="center_horizontal"
-        android:text="@string/ensure_guardian_summary"/>
-
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -24,7 +14,7 @@
         android:layout_marginStart="11dp"
         android:layout_marginEnd="11dp"
         android:layout_marginBottom="9dp"
-        android:layout_marginTop="41dp">
+        android:layout_marginTop="21dp">
     <LinearLayout
         android:id="@+id/mEditLayout"
         android:layout_width="match_parent"
@@ -247,4 +237,4 @@
             android:tag="101" />
     </LinearLayout>
     </LinearLayout>
-</FrameLayout>
+</FrameLayout>

app/src/main/res/values-b+sr+Latn/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">U redu</string>
     <string name="not_set">Није подешено</string>
     <string name="input_name">Унесите име</string>
-</resources>
+    <string name="next">Sledeće</string>
+    <string name="ensure_guardian_summary">Да бисмо били сигурни да сте ви старатељ, унесите шифру из Xplora-е</string>
+</resources>

app/src/main/res/values-da/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Ikke indstillet</string>
     <string name="input_name">Indtast navn</string>
-</resources>
+    <string name="next">Næste</string>
+    <string name="ensure_guardian_summary">For at sikre, at du er værgen, skal du indtaste koden fra Xplora</string>
+</resources>

app/src/main/res/values-de/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">Okay</string>
     <string name="not_set">Nicht festgelegt</string>
     <string name="input_name">Name eingeben</string>
-</resources>
+    <string name="next">Weiter</string>
+    <string name="ensure_guardian_summary">Um sicherzustellen, dass Sie der Administrator sind, geben Sie bitte den Code von Xplora ein</string>
+</resources>

app/src/main/res/values-es/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">Aceptar</string>
     <string name="not_set">no establecido</string>
     <string name="input_name">Nombre de entrada</string>
-</resources>
+    <string name="next">Siguiente</string>
+    <string name="ensure_guardian_summary">Para asegurarnos de que eres el guardián, introduce el código de Xplora</string>
+</resources>

app/src/main/res/values-et/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Pole määratud</string>
     <string name="input_name">Sisestage nimi</string>
-</resources>
+    <string name="next">Edasi</string>
+    <string name="ensure_guardian_summary">Kinnita, et oled eestkostja. Selleks sisesta Xplora kood</string>
+</resources>

app/src/main/res/values-fi/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Ei valittu</string>
     <string name="input_name">Syötä nimi</string>
-</resources>
+    <string name="next">Seuraava</string>
+    <string name="ensure_guardian_summary">Syötä Xploran koodi vahvistaaksesi, että olet huoltaja</string>
+</resources>

app/src/main/res/values-fr/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Pas encore défini</string>
     <string name="input_name">Nom d\'entrée</string>
-</resources>
+    <string name="next">Suivant</string>
+    <string name="ensure_guardian_summary">Pour vous assurer que vous êtes bien le gardien, veuillez saisir le code de Xplora</string>
+</resources>

app/src/main/res/values-hu/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">Rendben</string>
     <string name="not_set">Nincs beállítva</string>
     <string name="input_name">Adja meg a nevet</string>
-</resources>
+    <string name="next">Tovább</string>
+    <string name="ensure_guardian_summary">Annak bizonyítására, hogy Ön a gondviselő, írja be a kódot az Xplorából</string>
+</resources>

app/src/main/res/values-is/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">allt í lagi</string>
     <string name="not_set">Ekki stillt</string>
     <string name="input_name">Inntaksheiti</string>
-</resources>
+    <string name="next">Næsta</string>
+    <string name="ensure_guardian_summary">Til að ganga úr skugga um að þú sért forráðamaðurinn sláðu inn kóðann frá Xplora</string>
+</resources>

app/src/main/res/values-it/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Non impostato</string>
     <string name="input_name">Immettere il nome</string>
-</resources>
+    <string name="next">Successivo</string>
+    <string name="ensure_guardian_summary">Per assicurarti di essere il guardiano, inserisci il codice di Xplora</string>
+</resources>

app/src/main/res/values-lt/strings.xml

@@ -70,4 +70,6 @@
     <string name="not_set">Nenustatyta</string>
 
     <string name="input_name">Įvesti pavadinimą</string>
-</resources>
+    <string name="next">Kitas</string>
+    <string name="ensure_guardian_summary">Patvirtinimui, kad tikrai esate globėjas, įveskite kodą iš Xplora</string>
+</resources>

app/src/main/res/values-nb/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Ikke satt</string>
     <string name="input_name">Inndatanavn</string>
-</resources>
+    <string name="next">Neste</string>
+    <string name="ensure_guardian_summary">For å være sikre på at du er administrator, ber vi deg skrive inn koden fra Xplora</string>
+</resources>

app/src/main/res/values-nl/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Niet ingesteld</string>
     <string name="input_name">Naam invoeren</string>
-</resources>
+    <string name="next">Volgende</string>
+    <string name="ensure_guardian_summary">Voer de code van Xplora in om er voor te zorgen dat je de voogd bent</string>
+</resources>

app/src/main/res/values-pl/strings.xml

@@ -70,4 +70,6 @@
     <string name="not_set">Nie ustawiono</string>
 
     <string name="input_name">Wpisz nazwę</string>
-</resources>
+    <string name="next">Dalej</string>
+    <string name="ensure_guardian_summary">Aby potwierdzić, że jesteś opiekunem, wprowadź kod z zegarka Xplora</string>
+</resources>

app/src/main/res/values-pt/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Não configurado</string>
     <string name="input_name">Nome de entrada</string>
-</resources>
+    <string name="next">Seguinte</string>
+    <string name="ensure_guardian_summary">Para garantir que é o responsável, introduza o código do Xplora</string>
+</resources>

app/src/main/res/values-sl/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">V redu</string>
     <string name="not_set">Ni nastavljeno</string>
     <string name="input_name">Vnesite ime</string>
-</resources>
+    <string name="next">Naprej</string>
+    <string name="ensure_guardian_summary">Če želite zagotoviti, da ste skrbnik, vnesite kodo iz Xplore</string>
+</resources>

app/src/main/res/values-sv/strings.xml

@@ -59,4 +59,6 @@
     <string name="ok">OK</string>
     <string name="not_set">Inte inställd</string>
     <string name="input_name">Inmatningsnamn</string>
-</resources>
+    <string name="next">Nästa</string>
+    <string name="ensure_guardian_summary">Ange koden från Xplora för att säkerställa att du är vårdnadshavare</string>
+</resources>

app/src/main/res/values/strings.xml

@@ -70,5 +70,6 @@
     <string name="not_set">Not set</string>
 
     <string name="input_name">Input name</string>
-    <string name="ensure_guardian_summary">To ensure you are the guardian,\nplease input the code from Xplora</string>
-</resources>
+    <string name="ensure_guardian_summary">To ensure you are the guardian, please input the code from Xplora</string>
+    <string name="next">Next</string>
+</resources>