Sfoglia il codice sorgente

Apex Mobile
修改导航栏,支持点击

Ray Zhang 8 anni fa
parent
commit
77bb20f922

+ 1 - 1
Apex Mobile/app/src/main/AndroidManifest.xml

@@ -184,7 +184,7 @@
             android:configChanges="fontScale"
             android:launchMode="singleTop"
             android:screenOrientation="portrait"
-            android:theme="@style/FixedActionbarTheme">
+            android:theme="@style/ToolbarTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

+ 21 - 5
Apex Mobile/app/src/main/java/com/usai/apex/mainframe/RootActivity.java

@@ -15,10 +15,11 @@ import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import com.usai.apex.ContainerSearchActivity;
 import com.usai.apex.R;
@@ -51,6 +52,9 @@ public class RootActivity extends AppCompatActivity {
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
+            case android.R.id.home:
+                Toast.makeText(this, "switch mode", Toast.LENGTH_SHORT).show();
+                break;
             case R.id.quick_search:
 
                 Intent intent = new Intent();
@@ -113,16 +117,28 @@ public class RootActivity extends AppCompatActivity {
             login = savedInstanceState.getBoolean("login");
         }
 
+
+
+
+
+
+        Toolbar toolbar = (Toolbar) findViewById(R.id.tool_bar);
+        setSupportActionBar(toolbar);
+
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
+        /*
         ActionBar actionBar = getSupportActionBar();
-        actionBar.setLogo(R.drawable.apexlogo);
+//        actionBar.setLogo(R.drawable.apexlogo);
+        actionBar.setIcon(R.drawable.apexlogo);
 //        actionBar.setIcon(R.drawable.ic_launcher);
 
-        actionBar.setDisplayUseLogoEnabled(true);
+//        actionBar.setDisplayUseLogoEnabled(true);
         actionBar.setDisplayShowHomeEnabled(true);
+        actionBar.setHomeButtonEnabled(true);
 //        actionBar.setHomeAsUpIndicator(R.drawable.ic_launcher);
-        actionBar.setDisplayHomeAsUpEnabled(false);
+//        actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setDisplayShowTitleEnabled(false);
-
+*/
 
         viewPager = (NoScrollViewPager) findViewById(R.id.viewpager);
         bottomNavigationView = (BottomNavigationView) findViewById(R.id.bottom_navigation);

+ 43 - 10
Apex Mobile/app/src/main/res/layout/activity_root.xml

@@ -1,27 +1,58 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/activity_main"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <android.support.v7.widget.Toolbar
+        android:id="@+id/tool_bar"
+        android:layout_width="0dp"
+        android:layout_height="?attr/actionBarSize"
+
+
+        android:background="@color/colorPrimary"
+
+
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:navigationIcon="@drawable/apexlogo"
+
+
+        />
+
+    <View
+        android:id="@+id/view0"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="@drawable/bottom_shadow"
+
+        app:layout_constraintBottom_toTopOf="@+id/viewpager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
     <com.usai.apex.mainframe.NoScrollViewPager
         android:id="@+id/viewpager"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_above="@+id/bottom_navigation" />
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toTopOf="@+id/view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tool_bar" />
 
     <android.support.design.widget.BottomNavigationView
         android:id="@+id/bottom_navigation"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_alignParentBottom="true"
-
 
 
         android:background="@color/tab_bg"
-        app:itemTextColor="@drawable/bottom_navigation_selector">
+        app:itemTextColor="@drawable/bottom_navigation_selector"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
 
     </android.support.design.widget.BottomNavigationView>
 
@@ -29,8 +60,10 @@
         android:id="@+id/view"
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_above="@id/bottom_navigation"
-        android:background="@drawable/bottom_shadow" />
+        android:background="@drawable/bottom_shadow"
+        app:layout_constraintBottom_toTopOf="@+id/bottom_navigation"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
     <!--app:itemIconTint="@drawable/bottom_navigation_selector"-->
     <!--app:itemTextColor="@drawable/bottom_navigation_selector"-->
 
@@ -40,4 +73,4 @@
         <!--android:layout_above="@id/bottom_navigation"-->
         <!--android:background="@drawable/bottom_shadow" />-->
 
-</RelativeLayout>
+</android.support.constraint.ConstraintLayout>

+ 23 - 0
Apex Mobile/app/src/main/res/values/styles.xml

@@ -68,6 +68,28 @@
 
     <!--</style>-->
 
+
+    <style name="toolbar_nav_button" parent="Widget.AppCompat.Toolbar.Button.Navigation">
+        <item name="android:minWidth">0dp</item>
+        <item name="android:paddingLeft">16dp</item>
+        <item name="android:paddingRight">16dp</item>
+    </style>
+
+    <style name="ToolbarTheme" parent="FixedActionbarTheme">
+
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+        <item name="toolbarNavigationButtonStyle">@style/toolbar_nav_button</item>
+        <!--<item name="actionBarSize">39dp</item>-->
+        <!--<item name="colorPrimary">@color/colorPrimary</item>-->
+        <!--&lt;!&ndash;<item name="windowBackground">@color/white</item>&ndash;&gt;-->
+        <!--<item name="colorAccent">@color/icon_red</item>-->
+        <!--&lt;!&ndash;<item name="colorPrimaryDark">@color/colorPrimaryDark</item>&ndash;&gt;-->
+        <!--&lt;!&ndash;<item name="statusBarColor">@color/icon_red</item>&ndash;&gt;-->
+        <!--&lt;!&ndash;<item name="android:windowLightStatusBar">true</item>&ndash;&gt;-->
+        <!--<item name="actionOverflowButtonStyle">@style/OverflowButtonStyleSetting</item>-->
+    </style>
+
     <style name="FixedActionbarTheme" parent="Theme.AppCompat.Light">
         <item name="android:screenOrientation">portrait</item>
         <item name="actionBarSize">39dp</item>
@@ -75,6 +97,7 @@
         <!--<item name="windowBackground">@color/white</item>-->
         <item name="colorAccent">@color/icon_red</item>
         <item name="actionOverflowMenuStyle">@style/OverflowMenuStyle</item>
+        <!--<item name="windowActionBar">false</item>-->
         <!--<item name="toolbarStyle">@style/ToolBarMenu</item>>-->
         <!--<item name="colorPrimaryDark">@color/colorPrimaryDark</item>-->
         <!--<item name="statusBarColor">@color/icon_red</item>-->