hanjing лет назад: 7
Родитель
Сommit
30943d8209

+ 2 - 0
app/src/main/AndroidManifest.xml

@@ -177,6 +177,7 @@
 
         <activity
             android:name="com.sheep.gamegroup.view.activity.PersonalInfoAct"
+            android:theme="@style/AppActionTheme"
             android:screenOrientation="portrait" />
 
         <!-- 2.0 -->
@@ -374,6 +375,7 @@
         <activity
             android:name="com.sheep.gamegroup.view.activity.ReNameActivity"
             android:screenOrientation="portrait"
+            android:theme="@style/AppActionTheme"
             android:windowSoftInputMode="stateVisible|adjustPan" />
         <activity
             android:name="me.iwf.photopicker.PhotoPickerActivity"

+ 3 - 1
app/src/main/java/com/sheep/gamegroup/absBase/BaseActivity.java

@@ -58,7 +58,9 @@ public abstract class BaseActivity extends RxAppCompatActivity {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
             Window window = getWindow();
             window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
-            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
+            window.getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN
+                    | View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
+                    | View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
             window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
             window.setStatusBarColor(Color.TRANSPARENT);
         }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/PersonalInfoAct.java

@@ -93,6 +93,7 @@ public class PersonalInfoAct extends AbsChooseImageActivity {
         setShowCamera(false);
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "个人资料")
                 .setTitleFinish(this);
     }

+ 1 - 0
app/src/main/java/com/sheep/gamegroup/view/activity/ReNameActivity.java

@@ -51,6 +51,7 @@ public class ReNameActivity extends BaseActivity implements ReNameContract.View
     public void initView() {
         TitleBarUtils
                 .getInstance()
+                .setShowOrHide(this, true)
                 .setTitle(this, "修改昵称")
                 .setTitleFinish(this);
         DaggerReNameComponent.builder()

+ 3 - 4
app/src/main/res/layout/activity_re_login_name.xml

@@ -3,10 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
     android:gravity="center_horizontal"
     android:orientation="vertical"
-    android:padding="@dimen/content_padding_24"
-    tools:context="com.sheep.gamegroup.module.login.fragments.OldPasswordFgt">
+    android:padding="@dimen/content_padding_24">
 
     <TextView
         android:layout_width="match_parent"
@@ -26,9 +26,9 @@
 
         <EditText
             android:id="@+id/login_name_box"
+            style="@style/login_edit_style"
             android:layout_weight="1"
             android:gravity="center"
-            style="@style/login_edit_style"
             android:hint="(如邮件地支、英文名等唯一标识)" />
 
     </LinearLayout>
@@ -36,7 +36,6 @@
     <View style="@style/login_separetor_line_style" />
 
 
-
     <Button
         android:id="@+id/submit_btn"
         style="@style/login_theme_round_button"

+ 9 - 12
app/src/main/res/layout/x_rename_act_layout.xml

@@ -1,27 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              android:layout_width="match_parent"
-              android:layout_height="match_parent"
-              android:orientation="vertical"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
     android:background="@color/white_light"
-    android:baselineAligned="false">
-
-    <include layout="@layout/title" />
+    android:fitsSystemWindows="true"
+    android:orientation="vertical">
 
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="50dp"
-        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:layout_margin="12dp"
-        android:padding="10dp"
+        android:background="@drawable/x_shap_shadow_bg_rectgangle_white"
         android:orientation="vertical"
-        >
+        android:padding="10dp">
+
         <EditText
+            android:id="@+id/et"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@null"
-            android:id="@+id/et"
-            />
+            android:background="@null" />
 
     </LinearLayout>
 

+ 1 - 2
app/src/main/res/layout/xpersion_info_act_layout.xml

@@ -3,14 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/bg_gray"
+    android:fitsSystemWindows="true"
     android:scrollbars="none">
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="@color/white_light"
         android:orientation="vertical">
-        <include layout="@layout/title" />
-
 
         <LinearLayout
             android:layout_width="match_parent"