liuzhenxing1118 1 سال پیش
والد
کامیت
fc12ec7520

+ 1 - 0
.idea/misc.xml

@@ -69,6 +69,7 @@
         <entry key="app/src/main/res/layout/view_content.xml" value="0.19300911854103345" />
         <entry key="app/src/main/res/layout/view_empty.xml" value="0.1" />
         <entry key="app/src/main/res/layout/view_empty2.xml" value="0.379981884057971" />
+        <entry key="app/src/main/res/layout/view_keyboard.xml" value="0.1889564336372847" />
         <entry key="app/src/main/res/layout/view_message_text.xml" value="0.1" />
         <entry key="app/src/main/res/layout/view_sure.xml" value="0.33498922857490865" />
         <entry key="app/src/main/res/layout/view_textview.xml" value="0.1" />

+ 2 - 0
app/src/main/java/com/xplora/xpsettings/Activity/WifiLoginActivity.java

@@ -3,6 +3,7 @@ package com.xplora.xpsettings.Activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Window;
 import android.widget.EditText;
 import android.widget.FrameLayout;
 
@@ -17,6 +18,7 @@ public class WifiLoginActivity extends BaseActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        getWindow().requestFeature(Window.FEATURE_SWIPE_TO_DISMISS);
         setContentView(R.layout.activity_wifi_login);
         password = findViewById(R.id.password);
         password.requestFocus();

+ 1 - 1
app/src/main/res/layout/activity_privacy_policy.xml

@@ -9,7 +9,7 @@
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="10dp"
+        android:layout_marginTop="25dp"
         android:layout_marginBottom="5dp"
         android:layout_marginStart="5dp"
         android:layout_marginEnd="5dp"

+ 2 - 2
app/src/main/res/layout/item_privacy_policy.xml

@@ -9,7 +9,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAlignment="textStart"
-        android:textSize="10sp"
+        android:textSize="12sp"
         android:textStyle="bold"
         android:textColor="#FFFFFFFF"
         />
@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textAlignment="textStart"
-        android:textSize="9sp"
+        android:textSize="11sp"
         android:textColor="#FFFFFFFF"
         />
 </LinearLayout>

+ 2 - 0
app/src/main/res/layout/view_keyboard.xml

@@ -13,11 +13,13 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="6dp"
         android:layout_marginEnd="6dp"
+        android:fadeScrollbars="false"
         >
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="7dp"
             android:orientation="vertical"
             >
             <com.xplora.xpsettings.SKKeyboard.SKKeyboardView

+ 1 - 1
app/src/main/res/xml/sk_keyboard_switch_123.xml

@@ -2,7 +2,7 @@
     android:horizontalGap="3dip"
     android:verticalGap="0dip"
     android:keyWidth="25%p"
-    android:keyHeight="12%p">
+    android:keyHeight="20%p">
 
     <Row android:rowEdgeFlags="top" android:keyHeight="0.5dp">
     </Row>

+ 2 - 2
app/src/main/res/xml/sk_keyboard_switch_abc.xml

@@ -2,10 +2,10 @@
     android:horizontalGap="3dip"
     android:verticalGap="0dip"
     android:keyWidth="25%p"
-    android:keyHeight="12%p">
+    android:keyHeight="20%p">
 
     <Row android:rowEdgeFlags="bottom">
-        <Key android:codes="-9001" android:keyEdgeFlags="left" android:keyIcon="@drawable/keyboard_switch_abc" />
+        <Key android:codes="-9001" android:keyEdgeFlags="left" android:keyLabel="a b c" />
         <Key android:codes="-10002" android:keyLabel="1 2 3" />
         <Key android:codes="-10003" android:keyLabel="! ? #" />
         <Key android:codes="127" android:isRepeatable="true" android:keyEdgeFlags="right" android:keyIcon="@drawable/keyboard_del" />

+ 2 - 2
app/src/main/res/xml/sk_keyboard_switch_abc_shift.xml

@@ -2,13 +2,13 @@
     android:horizontalGap="3dip"
     android:verticalGap="0dip"
     android:keyWidth="25%p"
-    android:keyHeight="12%p">
+    android:keyHeight="20%p">
 
     <Row android:rowEdgeFlags="top" android:keyHeight="0.5dp">
     </Row>
 
     <Row android:rowEdgeFlags="bottom">
-        <Key android:codes="-9000" android:keyEdgeFlags="left" android:keyIcon="@drawable/keyboard_switch_abc_shift" />
+        <Key android:codes="-9000" android:keyEdgeFlags="left" android:keyLabel="A B C" />
         <Key android:codes="-10002" android:keyLabel="1 2 3" />
         <Key android:codes="-10003" android:keyLabel="! ? #" />
         <Key android:codes="127" android:isRepeatable="true" android:keyEdgeFlags="right" android:keyIcon="@drawable/keyboard_del" />

+ 1 - 1
app/src/main/res/xml/sk_keyboard_switch_symbols.xml

@@ -2,7 +2,7 @@
     android:horizontalGap="3dip"
     android:verticalGap="0dip"
     android:keyWidth="25%p"
-    android:keyHeight="12%p">
+    android:keyHeight="20%p">
 
     <Row android:rowEdgeFlags="top" android:keyHeight="0.5dp">
     </Row>