Skip to content

T
TangKuPos
Commit 8fef851e authored by 陈前's avatar 陈前
Browse files
Options

UI

parent a799dab0
Show whitespace changes
Inline Side-by-side
Showing with 83 additions and 43 deletions
app/src/main/java/com/xingdata/zzdpos/ui/statistics/fragment/StatisticsTitleFragment.java
View file @ 8fef851e
...@@ -96,6 +96,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F ...@@ -96,6 +96,9 @@ public class StatisticsTitleFragment extends BaseFragment<StatisticsPresenter, F
return false; return false;
}); });
mViewBinding.icTitle.edTitle.setVisibility(View.GONE);
mViewBinding.icTitle.tvTitle.setVisibility(View.VISIBLE);
mViewBinding.icTitle.tvTitle.setText("订单记录");
mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() { mViewBinding.icTitle.ivRight.setOnClickListener(new OnClickListener() {
@Override @Override
protected void myOnClickListener(View v) { protected void myOnClickListener(View v) {
......
app/src/main/res/drawable/shape_gray_r2.xml
View file @ 8fef851e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/settle_btn_radius" /> <corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/gray_kongming" /> <solid android:color="@color/gray_kongming" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/layout/dialog_prompt.xml
View file @ 8fef851e
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout> <layout xmlns:app="http://schemas.android.com/apk/res-auto">
<data> <data>
<variable <variable
name="onClickListener" name="onClickListener"
type="android.view.View.OnClickListener"/> type="android.view.View.OnClickListener" />
</data> </data>
...@@ -21,10 +21,10 @@ ...@@ -21,10 +21,10 @@
<RelativeLayout <RelativeLayout
android:layout_width="@dimen/prompt_dialog_width" android:layout_width="@dimen/prompt_dialog_width"
android:layout_height="@dimen/prompt_dialog_height" android:layout_height="@dimen/prompt_dialog_height"
android:background="@color/store_back" android:background="@color/white_caocao"
android:gravity="center" android:gravity="center"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="@dimen/all_margin"> >
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -33,74 +33,92 @@ ...@@ -33,74 +33,92 @@
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<com.github.ybq.android.spinkit.SpinKitView <com.github.ybq.android.spinkit.SpinKitView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/spin_kit" android:id="@+id/spin_kit"
style="@style/SpinKitView.Circle" style="@style/SpinKitView.Circle"
android:layout_width="@dimen/prompt_dialog_logo_size" android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size" android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_padding_left_right"
android:visibility="gone" android:visibility="gone"
app:SpinKit_Color="@color/black"/> app:SpinKit_Color="@color/black" />
<ImageView <ImageView
android:id="@+id/iv_logo" android:id="@+id/iv_logo"
android:layout_width="@dimen/prompt_dialog_logo_size" android:layout_width="@dimen/prompt_dialog_logo_size"
android:layout_height="@dimen/prompt_dialog_logo_size" android:layout_height="@dimen/prompt_dialog_logo_size"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:src="@mipmap/prompt_dialog_success"/> android:src="@mipmap/prompt_dialog_success" />
<ScrollView <ScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="70dp"> android:layout_height="@dimen/list2_height">
<TextView <TextView
android:id="@+id/tv_text" android:id="@+id/tv_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin" android:layout_marginTop="@dimen/all_padding_left_right"
android:gravity="center" android:gravity="center"
android:text="正在处理，请稍后." android:text="正在处理，请稍后."
android:textColor="@color/succ" android:textColor="@color/black_baozheng"
android:textSize="@dimen/text_secondary_title"/> android:textSize="@dimen/all_text_size" />
</ScrollView> </ScrollView>
<Button <Button
android:id="@+id/btn_custom" android:id="@+id/btn_custom"
style="@style/button_positive_allradius" style="@style/button_positive_allradius"
android:layout_width="@dimen/dialog_button_width" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/all_margin" android:text="重新获取" />
android:text="重新获取"/>
</LinearLayout> </LinearLayout>
<LinearLayout <android.support.constraint.ConstraintLayout
android:id="@+id/ll_bottom" android:id="@+id/ll_bottom"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="@dimen/list2_height"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:orientation="horizontal" android:orientation="horizontal"
android:visibility="gone"> android:visibility="gone">
<Button <Button
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
style="@style/button_positive_bg_gray_noradius" style="@style/button_passive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_weight="1" android:text="取消"
android:text="取消"/> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/btn_ok"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button <Button
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
style="@style/button_positive_noradius" style="@style/button_positive"
android:layout_width="0dp" android:layout_width="@dimen/button1_width"
android:layout_height="wrap_content" android:layout_height="@dimen/button1_height"
android:layout_weight="1" android:text="确认"
android:text="确认"/> app:layout_constraintBottom_toBottomOf="parent"
</LinearLayout> app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btn_cancel"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:background="@color/gray_huanggai"
app:layout_constraintTop_toTopOf="parent" />
<View
android:layout_width="@dimen/view_line_L050"
android:layout_height="match_parent"
android:background="@color/gray_huanggai"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
</RelativeLayout> </RelativeLayout>
</LinearLayout> </LinearLayout>
......
app/src/main/res/layout/fragment_order_main.xml
View file @ 8fef851e
...@@ -5,11 +5,26 @@ ...@@ -5,11 +5,26 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/gray_zhouyu" android:background="@color/white_caocao"
tools:context="com.example.administrator.tangkupos.CasherFragment"> tools:context="com.example.administrator.tangkupos.CasherFragment">
<!-- TODO: Update blank fragmfragment_integral_indexyout --> <!-- TODO: Update blank fragmfragment_integral_indexyout -->
<EditText
android:id="@+id/ed_title"
style="@style/searchBarEditor"
android:layout_width="match_parent"
android:layout_marginEnd="@dimen/all_padding_left_right"
android:layout_marginStart="@dimen/all_padding_left_right"
android:layout_marginTop="@dimen/padding_small"
android:layout_marginBottom="@dimen/padding_small"
android:layout_height="30dp"
android:drawablePadding="@dimen/all_padding"
android:hint="@string/statistics_order_edit_hint"
android:inputType="number"
android:textColor="@color/black_likui"
android:textSize="@dimen/all_text_size_low"
android:layout_below="@id/tab_layout"
/>
<android.support.design.widget.TabLayout <android.support.design.widget.TabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
...@@ -26,7 +41,7 @@ ...@@ -26,7 +41,7 @@
android:id="@+id/viewPager_data" android:id="@+id/viewPager_data"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/tab_layout" android:layout_below="@id/ed_title"
android:layout_marginTop="-1dp" android:layout_marginTop="-1dp"
android:background="@color/gray"> android:background="@color/gray">
...@@ -38,6 +53,10 @@ ...@@ -38,6 +53,10 @@
android:layout_height="@dimen/view_line_L050" android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/viewPager_data" android:layout_above="@id/viewPager_data"
android:background="@color/gray_huanggai" /> android:background="@color/gray_huanggai" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/view_line_L050"
android:layout_above="@id/ed_title"
android:background="@color/gray_huanggai" />
</RelativeLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/values/dimens.xml
View file @ 8fef851e
...@@ -65,8 +65,8 @@ ...@@ -65,8 +65,8 @@
<dimen name="dialog_button_width">190dp</dimen> <dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框--> <!--提示对话框-->
<dimen name="prompt_dialog_width">300dp</dimen> <dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">250dp</dimen> <dimen name="prompt_dialog_height">200dp</dimen>
<dimen name="prompt_dialog_logo_size">64dp</dimen> <dimen name="prompt_dialog_logo_size">48dp</dimen>
<!--商品页面--> <!--商品页面-->
<integer name="fragment_store_product_item_span_count">4</integer> <integer name="fragment_store_product_item_span_count">4</integer>
<integer name="fragment_store_group_item_span_count">7</integer> <integer name="fragment_store_group_item_span_count">7</integer>
......
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