Skip to content

T
TangKuPos
Commit 2e99bb73 authored by 陈前's avatar 陈前
Browse files
Options

UI

parent 8457f599
Show whitespace changes
Inline Side-by-side
Showing with 90 additions and 24 deletions
app/src/main/java/com/xingdata/zzdpos/ui/main/fragment/CasherFragment.java
View file @ 2e99bb73
......@@ -48,7 +48,7 @@ public class CasherFragment extends BaseFragment<MainPresenter, FragmentCasherBi
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration
(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/StatisticsPresenter.java
View file @ 2e99bb73
......@@ -44,9 +44,9 @@ public class StatisticsPresenter extends StatisticsContract.Presenter {
@Override
public void getOrderList(int pageNumber, int pageSize, long startDate, long endDate, OrderListFragment fragment) {
mView.isShowLoading(true);
ApiFactory.Test.getSaleOrderList("99", pageNumber, pageSize, startDate, endDate).doFinally(() -> {
mView.isShowLoading(false);
})
.subscribe(orderlist -> {
fragment.setData(orderlist, orderlist.isFirstPage());
......
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsFragment.java
View file @ 2e99bb73
......@@ -49,7 +49,7 @@ public class StatisticsFragment extends BaseFragment<StatisticsPresenter, Fragme
mMenuRecyclerAdapter = new MenuRecyclerAdapter(getActivity(), integers);
mMenuRecyclerAdapter.bindToRecyclerView(mViewBinding.fragmentCasherRecycler);
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 5, getResources().getColor(R.color.golden_yuji)));
mViewBinding.fragmentCasherRecycler.addItemDecoration(new MyMenuItemDecoration(getActivity(), 2, getResources().getColor(R.color.golden_yuji)));
mMenuRecyclerAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
......
app/src/main/res/drawable/singleline_white_gray.xml
View file @ 2e99bb73
......@@ -7,7 +7,7 @@
</shape>
</item>
<item android:bottom="1.5dp">
<item android:bottom="0.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
......
app/src/main/res/drawable/text_white_top_bottom_gray.xml 0 → 100644
View file @ 2e99bb73
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/gray_kongming"/>
</shape>
</item>
<item android:bottom="0.5dp" android:top="0.5dp">
<shape>
<solid android:color="@color/white"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_help.xml
View file @ 2e99bb73
......@@ -51,7 +51,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -74,7 +74,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -97,7 +97,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......@@ -120,7 +120,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:background="@color/white_caocao"
android:background="@drawable/text_white_top_bottom_gray"
android:weightSum="2">
<TextView
......
app/src/main/res/layout/fragment_service.xml
View file @ 2e99bb73
......@@ -20,8 +20,7 @@
android:id="@+id/tool_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L1"
android:background="@drawable/singleline_white_gray"
android:gravity="center"
android:minHeight="?attr/actionBarSize"
android:padding="0dp"
......
app/src/main/res/layout/item_menu_detail.xml
View file @ 2e99bb73
......@@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="0.8dp"
android:background="@color/white_caocao"
android:background="?android:attr/selectableItemBackground"
android:gravity="center"
android:orientation="vertical"
android:paddingBottom="25dp"
......
app/src/main/res/layout/item_myself_string.xml
View file @ 2e99bb73
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white_caocao"
android:padding="0dp">
<TextView
......@@ -11,16 +12,41 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginBottom="@dimen/all_padding"
android:background="@color/white_caocao"
android:background="?android:attr/selectableItemBackground"
android:drawablePadding="@dimen/all_padding"
android:elevation="@dimen/view_line_L050"
android:gravity="left"
android:padding="@dimen/vicescreen_shoppingcart_pandding"
android:singleLine="true"
android:textColor="@color/black"
android:textSize="@dimen/all_text_size" />
android:textSize="@dimen/all_text_size"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv"
app:layout_constraintTop_toTopOf="@id/item_tv" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_kongming"
app:layout_constraintBottom_toBottomOf="@id/item_tv"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv" />
<View
android:layout_width="0dp"
android:layout_height="@dimen/all_padding"
android:background="@color/gray_zhouyu"
app:layout_constraintTop_toBottomOf="@id/item_tv"
app:layout_constraintEnd_toEndOf="@id/item_tv"
app:layout_constraintStart_toStartOf="@id/item_tv" />
</FrameLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title.xml
View file @ 2e99bb73
<?xml version="1.0" encoding="utf-8"?>
<layout>
<layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data>
......@@ -10,7 +10,7 @@
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@drawable/singleline_white_gray"
......@@ -31,9 +31,14 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="标题"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/black_baozheng"
android:textSize="@dimen/big_text_size"/>
</RelativeLayout>
</android.support.constraint.ConstraintLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/title_order.xml
View file @ 2e99bb73
......@@ -13,7 +13,8 @@
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/white_caocao">
android:background="@color/white_caocao"
android:elevation="@dimen/view_line_L1">
<ImageButton
......@@ -77,8 +78,8 @@
android:layout_width="?attr/actionBarSize"
android:layout_height="match_parent"
android:background="@color/transparent"
android:visibility="visible"
android:src="@mipmap/ic_dates"
android:visibility="visible"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
......
app/src/main/res/layout/title_search.xml
View file @ 2e99bb73
......@@ -4,7 +4,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/bg"
android:background="@drawable/singleline_white_gray"
android:orientation="vertical">
<LinearLayout
......
app/src/main/res/values-v21/styles.xml 0 → 100644
View file @ 2e99bb73
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowFullscreen">true</item>
<item name="android:windowNoTitle">true</item>
<item name="windowActionBar">false</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:windowSharedElementEnterTransition">@android:transition/move</item>
<item name="android:windowSharedElementExitTransition">@android:transition/move</item>
</style>
</resources>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment