diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 01c8f14..502ebf4 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -234,6 +234,7 @@ android:name=".ui.pointmeasure.measure.AddCodeActivity" android:exported="false"> () { } override fun initView() { + ImmersionBar.with(this) + .statusBarDarkFont(true) + .titleBarMarginTop(mBinding.ilToolBar.toolbar) + .init() + setSupportActionBar(mBinding.ilToolBar.toolbar) + initAdapter() diff --git a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt index c7e9153..00957e4 100644 --- a/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt +++ b/app/src/main/java/com/project/survey/ui/pointmeasure/PointMeasureListActivity.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.Intent import android.view.View import androidx.core.os.bundleOf +import com.gyf.immersionbar.ImmersionBar import com.project.survey.R import com.project.survey.databinding.ActivityPointMeasureListBinding import com.project.survey.ui.base.BaseBindingActivity @@ -29,6 +30,12 @@ class PointMeasureListActivity : BaseBindingActivity + + diff --git a/app/src/main/res/layout/activity_lofting_list.xml b/app/src/main/res/layout/activity_lofting_list.xml index 836ccfa..9603664 100644 --- a/app/src/main/res/layout/activity_lofting_list.xml +++ b/app/src/main/res/layout/activity_lofting_list.xml @@ -5,7 +5,9 @@ android:layout_height="match_parent" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/activity_point_measure_list.xml b/app/src/main/res/layout/activity_point_measure_list.xml index 5e38b93..3809bf1 100644 --- a/app/src/main/res/layout/activity_point_measure_list.xml +++ b/app/src/main/res/layout/activity_point_measure_list.xml @@ -4,7 +4,9 @@ android:layout_height="match_parent" android:orientation="vertical"> - + diff --git a/app/src/main/res/layout/sh_toolbar.xml b/app/src/main/res/layout/sh_toolbar.xml index bf9e07d..aa0c31d 100644 --- a/app/src/main/res/layout/sh_toolbar.xml +++ b/app/src/main/res/layout/sh_toolbar.xml @@ -4,8 +4,10 @@ android:id="@+id/toolbar" android:layout_width="match_parent" android:layout_height="?actionBarSize" - android:background="?colorPrimary" + android:background="@color/transparent" app:popupTheme="@style/ThemeOverlay.AppCompat.Light" app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" + app:titleTextAppearance="@style/ToolbarTextAppearance" + app:navigationIcon="@drawable/icon_toolbar_back" app:titleCentered="true" /> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index eabfbb0..551a61e 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -121,6 +121,7 @@