暗黑第二版优化

app/build.gradle

@@ -15,7 +15,7 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        /*multiDexEnabled true
+       /* multiDexEnabled true
         applicationId "com.mhq.smartorder"*/
 
         minSdkVersion 26
@@ -57,21 +57,21 @@ android {
 
 
     /*=============================================================================================*/
-   /* signingConfigs {
+/*    signingConfigs {
 
         def appStoreFilePath = System.getProperty('StoreFilePath')
         def appStorePassword = System.getProperty('StorePassword')
         def appKeyAlias = System.getProperty('KeyAlias')
         def appKeyPassword = System.getProperty('KeyPassword')
 
-        *//*   Properties properties = new Properties()
+           Properties properties = new Properties()
            if (rootProject.file("local.properties").exists()) {
                properties.load(rootProject.file("local.properties").newDataInputStream())
                storeFilePath= properties.get("STOREFILE")
                storePassword= properties.get("STOREPASSWORD")
                keyAlias= properties.get("KEYALIAS")
                keyPassword= properties.get("KEYPASSWORD")
-           }*//*
+           }
 
         if (!appStoreFilePath || !appStorePassword || !appKeyAlias || !appKeyPassword) {
             //将.android下的debug.keystore放到app目录下

app/src/main/AndroidManifest.xml

@@ -285,7 +285,7 @@
         <activity
             android:name="cn.dankal.user.login.LanguageSelectActivity"
             android:screenOrientation="portrait">
-             <!--<intent-filter>
+           <!--  <intent-filter>
                  <action android:name="android.intent.action.MAIN" />
 
                  <category android:name="android.intent.category.LAUNCHER" />

app/src/main/java/cn/dankal/basiclib/base/fragment/BaseFragment.java

@@ -169,14 +169,14 @@ public abstract class BaseFragment extends Fragment implements BaseView {
         builder.setTitle(msg);
 
         if (isCancelButton) {
-            builder.setNegativeButton(getString(R.string.cancel), getResources().getColor(R.color.font_313131), new DKCallBackBoolean() {
+            builder.setNegativeButton(getString(R.string.cancel), new DKCallBackBoolean() {
                 @Override
                 public void action(int type) {
                     commonDialog.dismiss();
                 }
             });
         }
-        builder.setPositiveButton(getString(R.string.ok), getResources().getColor(R.color.font_313131), listener != null ? listener : new DKCallBackBoolean() {
+        builder.setPositiveButton(getString(R.string.ok),  listener != null ? listener : new DKCallBackBoolean() {
             @Override
             public void action(int type) {
                 commonDialog.dismiss();

app/src/main/java/cn/dankal/basiclib/widget/CommonDialog.java

@@ -126,6 +126,12 @@ public class CommonDialog extends Dialog {
             return this;
         }
 
+        public Builder setPositiveButton(CharSequence text, DKCallBackBoolean dkCallBack) {
+            mPositiveButtonText =text;
+            mPositiveButtonListener = dkCallBack;
+            return this;
+        }
+
 
         public Builder setNegativeButton(CharSequence text, int textColor, DKCallBackBoolean dkCallBack) {
             mNegativeButtonText = text;
@@ -134,6 +140,12 @@ public class CommonDialog extends Dialog {
             return this;
         }
 
+        public Builder setNegativeButton(CharSequence text, DKCallBackBoolean dkCallBack) {
+            mNegativeButtonText = text;
+            mNegativeButtonListener = dkCallBack;
+            return this;
+        }
+
 
         public boolean ismCancelable() {
             return mCancelable;
@@ -184,8 +196,10 @@ public class CommonDialog extends Dialog {
             btNegative.setText(mNegativeButtonText);
             btPositive.setText(mPositiveButtonText);
 
-            btNegative.setTextColor(mNegativeButtonColor);
-            btPositive.setTextColor(mPositiveButtonColor);
+            if (mNegativeButtonColor != 0)
+                btNegative.setTextColor(mNegativeButtonColor);
+            if (mPositiveButtonColor != 0)
+                btPositive.setTextColor(mPositiveButtonColor);
 
             btNegative.setVisibility(TextUtils.isEmpty(mNegativeButtonText) ? View.GONE : View.VISIBLE);
             btPositive.setVisibility(TextUtils.isEmpty(mPositiveButtonText) ? View.GONE : View.VISIBLE);

app/src/main/java/cn/dankal/client/ui/home/details/DetailsShopFragment.java

@@ -40,7 +40,7 @@ import java.util.List;
 import java.util.Map;
 
 
-
+import cn.dankal.basiclib.ModooApplication;
 import cn.dankal.basiclib.api.RestaurantServiceFactory;
 import cn.dankal.basiclib.base.fragment.BaseFragment;
 import cn.dankal.basiclib.rx.AbstractDialogSubscriber;
@@ -950,12 +950,20 @@ public class DetailsShopFragment extends BaseFragment implements OnRefreshLoadMo
 
     private void enabledButton() {
         tvBottomShopCount.setText(String.valueOf(0));
-        tvBottomShopButton.setBackgroundColor(getResources().getColor(R.color.bg_fff5f5f5));
+        if (ModooApplication.isDarkMode()){
+            tvBottomShopButton.setBackgroundColor(getResources().getColor(R.color.color_ff2f2f2f));
+        }else {
+            tvBottomShopButton.setBackgroundColor(getResources().getColor(R.color.bg_fff5f5f5));
+        }
         tvBottomShopButton.setTextColor(getResources().getColor(R.color.font_989898));
         tvBottomShopButton.setEnabled(false);
         tvBottomShopButton.setText(R.string.selected);
 
-        tvSettlement.setBackgroundColor(getResources().getColor(R.color.bg_fff5f5f5));
+        if (ModooApplication.isDarkMode()){
+            tvSettlement.setBackgroundColor(getResources().getColor(R.color.color_ff2f2f2f));
+        }else {
+            tvSettlement.setBackgroundColor(getResources().getColor(R.color.bg_fff5f5f5));
+        }
         tvSettlement.setTextColor(getResources().getColor(R.color.font_989898));
         tvSettlement.setEnabled(false);
         tvSettlement.setText(R.string.selected);

app/src/main/java/cn/dankal/client/ui/personal/order/food/OrderDetailsActivity.kt

@@ -141,6 +141,7 @@ class OrderDetailsActivity : BaseActivity(), View.OnClickListener, CallListDialo
         listDialog?.setOnCenterItemClickListener(this)
 
         showLoadingDialog()
+
     }
 
     override fun onResume() {

app/src/main/res/drawable/bg_search_gary_light.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/color_3d3d3d" />
+    <corners android:radius="5dp" />
+
+</shape>
\ No newline at end of file

app/src/main/res/drawable/label_text_selector_night.xml

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="@color/color_191919" android:state_checked="true" />
+    <item android:color="@color/white" android:state_checked="true" />
     <item android:color="@color/color_d3d3d3" />
 </selector>
\ No newline at end of file

app/src/main/res/layout-night/activity_merchant_details.xml

@@ -63,7 +63,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginRight="@dimen/dp_15"
-            android:src="@mipmap/ic_home_scanning_02"
+            android:src="@mipmap/ic_home_scanning_light"
             app:layout_constraintBottom_toBottomOf="@id/tv_merchant_title"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="@id/tv_merchant_title" />

app/src/main/res/layout-night/activity_order_details.xml

@@ -428,7 +428,7 @@
             android:background="@drawable/bg_button_order_apply_night"
             android:gravity="center"
             android:text="@string/cancellation_of_complaints"
-            android:textColor="@color/color_171717"
+            android:textColor="@color/white"
             android:visibility="gone" />
     </LinearLayout>
 

app/src/main/res/layout-night/activity_order_result.xml

@@ -60,7 +60,7 @@
                     android:paddingRight="@dimen/dp_10"
                     android:paddingBottom="@dimen/dp_5"
                     android:text="@string/change_table_number"
-                    android:textColor="@color/color00"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_12" />
             </LinearLayout>
 
@@ -236,7 +236,7 @@
                 android:id="@+id/btn_order"
                 android:layout_width="@dimen/dp_151"
                 android:layout_height="@dimen/dp_48"
-                android:textColor="@color/color_171717"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_17"
                 android:background="@drawable/bg_button_pay_light"
                 app:layout_constraintBottom_toBottomOf="parent"

app/src/main/res/layout-night/activity_queue.xml

@@ -95,7 +95,7 @@
             android:layout_marginRight="@dimen/dp_20"
             android:background="@drawable/bg_button_select_language_night"
             android:text="@string/queue_number"
-            android:textColor="@color/color_171717"
+            android:textColor="@color/white"
             android:textSize="16sp"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"

app/src/main/res/layout-night/activity_queue_result.xml

@@ -223,7 +223,7 @@
                 android:layout_height="@dimen/dp_48"
                 android:text="@string/i_would_like_to_order"
                android:background="@drawable/bg_button_select_language_night"
-                android:textColor="@color/color_171717"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_17"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_cancel"

app/src/main/res/layout-night/activity_result_page.xml

@@ -158,7 +158,7 @@
                 android:layout_width="@dimen/dp_90"
                 android:layout_height="@dimen/dp_34"
                 android:text="@string/continue_ordering"
-                android:textColor="@color/color_171717"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_14"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toRightOf="@id/btn_evaluate"

app/src/main/res/layout-night/activity_scan_result.xml

@@ -21,7 +21,7 @@
         android:layout_marginTop="@dimen/dp_23"
         android:text="@string/scanning_failure_tow"
         android:textStyle="bold"
-        android:textColor="@color/font_313131"
+        android:textColor="@color/white"
         android:textSize="@dimen/sp_13" />
 
     <TextView

app/src/main/res/layout-night/activity_search.xml

@@ -21,9 +21,11 @@
             android:layout_weight="1"
             android:imeOptions="actionSearch"
             android:inputType="text"
-            android:background="@drawable/bg_search_gary"
+            android:textColor="@color/white"
+            android:background="@drawable/bg_search_gary_light"
             android:drawableLeft="@mipmap/ic_home_search_1"
             android:drawablePadding="@dimen/dp_10"
+            android:textColorHint="@color/white"
             android:hint="@string/please_enter_the_name_merchant"
             android:paddingLeft="@dimen/dp_10" />
 
@@ -42,7 +44,7 @@
     <TextView
         android:layout_width="match_parent"
         android:layout_height="@dimen/dimen_1_dp"
-        android:background="#E5E5E5" />
+        android:background="@color/color_3d3d3d" />
 
     <FrameLayout
         android:layout_width="match_parent"

app/src/main/res/layout-night/adapter_layout_empty_data_one.xml

@@ -8,7 +8,8 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@mipmap/ic_order_confirmation" />
+        android:layout_marginTop="@dimen/dp_75"
+        android:src="@mipmap/ic_order_confirmation_light" />
 
     <TextView
         android:layout_width="wrap_content"

app/src/main/res/layout-night/adapter_layout_merchant_empty.xml

+<?xml version="1.0" encoding="utf-8"?>
+<android.support.v7.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:gravity="center_horizontal"
+    android:orientation="vertical">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_126"
+        android:src="@mipmap/ic_order_confirmation" />
+
+    <TextView
+        android:id="@+id/tv_text_tip"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_15"
+        android:text="@string/businessmen_currently_have_no_merchandise"
+        android:textColor="@color/color_d3d3d3"
+        android:textSize="@dimen/sp_13" />
+
+</android.support.v7.widget.LinearLayoutCompat>
\ No newline at end of file

app/src/main/res/layout-night/dialog_bottom_list.xml

@@ -88,7 +88,7 @@
                     android:id="@+id/tv_bottom_shop_button"
                     android:layout_width="@dimen/dp_134"
                     android:layout_height="@dimen/dp_55"
-                    android:background="@color/bg_fff5f5f5"
+                    android:background="@color/color_ff2f2f2f"
                     android:gravity="center"
                     android:text="@string/selected"
                     android:textColor="@color/font_989898"
@@ -102,7 +102,7 @@
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_15"
                 android:layout_marginBottom="@dimen/dp_10"
-                android:src="@mipmap/ic_home_mall_order"
+                android:src="@mipmap/ic_shopp"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintLeft_toLeftOf="parent" />
 

app/src/main/res/layout-night/dialog_common.xml

@@ -64,7 +64,7 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="0.5dp"
-            android:background="#FFE5E5E5" />
+            android:background="@color/color_3d3d3d" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -88,7 +88,7 @@
                 android:id="@+id/veri_divider"
                 android:layout_width="0.5dp"
                 android:layout_height="match_parent"
-                android:background="#FFE5E5E5" />
+                android:background="@color/color_3d3d3d" />
 
             <TextView
                 android:id="@+id/bt_positive"

app/src/main/res/layout-night/dialog_home_filter.xml

@@ -155,7 +155,7 @@
                 android:background="@color/color_ff7b836"
                 android:gravity="center"
                 android:text="@string/complete"
-                android:textColor="@color/color_171717"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_17" />
         </LinearLayout>
 

app/src/main/res/layout-night/dialog_input_remark.xml

@@ -78,7 +78,7 @@
             android:layout_height="@dimen/dp_38"
             android:background="@color/color_fbbc39"
             android:textSize="@dimen/sp_16"
-            android:textColor="@color/color_171717"
+            android:textColor="@color/white"
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginRight="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_26"

app/src/main/res/layout-night/dialog_item_call.xml

@@ -29,13 +29,13 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/dp_6"
             android:layout_marginBottom="@dimen/dp_15"
-            android:textColor="@color/black"
+            android:textColor="@color/white"
             android:textSize="@dimen/sp_19" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="@dimen/dimen_1_dp"
-            android:background="@color/colorE5" />
+            android:background="@color/color_3d3d3d" />
 
         <LinearLayout
             android:layout_width="match_parent"
@@ -55,7 +55,7 @@
             <TextView
                 android:layout_width="@dimen/dimen_1_dp"
                 android:layout_height="match_parent"
-                android:background="@color/colorE5" />
+                android:background="@color/color_3d3d3d" />
 
             <TextView
                 android:id="@+id/tv_item_call"

app/src/main/res/layout-night/dialog_item_list.xml

@@ -59,7 +59,7 @@
             android:layout_marginRight="@dimen/dp_21"
             android:background="@drawable/bg_dialog_btn_one_night"
             android:text="@string/commit"
-            android:textColor="@color/color_171717" />
+            android:textColor="@color/white" />
     </android.support.v7.widget.LinearLayoutCompat>
 
 

app/src/main/res/layout-night/dialog_item_list_take_number.xml

@@ -33,7 +33,7 @@
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_1"
         android:layout_marginTop="@dimen/dp_12"
-        android:background="@color/line_one"
+        android:background="@color/color_3d3d3d"
         app:layout_constraintTop_toBottomOf="@id/tv_dialog_title" />
 
     <android.support.v7.widget.LinearLayoutCompat
@@ -59,7 +59,7 @@
             android:layout_marginRight="@dimen/dp_21"
             android:background="@drawable/bg_dialog_btn_one_night"
             android:text="@string/commit"
-            android:textColor="@color/color_171717" />
+            android:textColor="@color/white" />
     </android.support.v7.widget.LinearLayoutCompat>
 
 

app/src/main/res/layout-night/dialog_select_format_tow.xml

@@ -128,6 +128,7 @@
                         android:id="@+id/tv_item_count"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
+                        android:textColor="@color/white"
                         android:text="1" />
 
                     <ImageView
@@ -144,7 +145,7 @@
                     android:layout_height="match_parent"
                     android:background="@color/color_fffbbc39"
                     android:text="@string/add_menu"
-                    android:textColor="@color/color_171717"
+                    android:textColor="@color/white"
                     android:textSize="@dimen/sp_17"
                     android:visibility="gone" />
             </FrameLayout>

app/src/main/res/layout-night/fragment_details_info.xml

@@ -25,6 +25,7 @@
                 android:layout_marginTop="@dimen/dp_4"
                  android:paddingLeft="@dimen/dp_4"
                 android:paddingRight="@dimen/dp_4"
+                android:visibility="gone"
                 android:src="@mipmap/ic_home_details_location_1" />
 
             <TextView

app/src/main/res/layout-night/fragment_details_shop.xml

@@ -76,7 +76,7 @@
                 android:background="@color/color_ff2f2f2f"
                 android:gravity="center"
                 android:text="@string/selected"
-                android:textColor="@color/color_a6a6a6"
+                android:textColor="@color/color_ff2f2f2f"
                 android:textSize="@dimen/sp_17" />
 
         </LinearLayout>
@@ -88,7 +88,7 @@
             android:layout_marginLeft="@dimen/dp_15"
             android:layout_marginBottom="@dimen/dp_10"
             android:visibility="gone"
-            android:src="@mipmap/ic_home_mall_order"
+            android:src="@mipmap/ic_shopp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintLeft_toLeftOf="parent" />
 
@@ -114,7 +114,7 @@
         android:layout_height="@dimen/dp_50"
         android:background="@color/btn_bg"
         android:text="@string/reserved_queue"
-        android:textColor="@color/color_171717"
+        android:textColor="@color/white"
         android:textSize="@dimen/sp_20"
         android:visibility="gone" />
 

app/src/main/res/layout-night/fragment_menu_item.xml

@@ -65,7 +65,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="@dimen/dp_15"
-                android:src="@mipmap/ic_home_location_new" />
+                android:src="@mipmap/ic_home_placeholder" />
 
             <TextView
                 android:layout_width="0dp"

app/src/main/res/layout-night/item_shop_details.xml

@@ -68,7 +68,7 @@
                 android:paddingRight="@dimen/dp_9"
                 android:paddingBottom="@dimen/dp_5"
                 android:text="@string/selection_of_specifications"
-                android:textColor="@color/color00"
+                android:textColor="@color/white"
                 android:textSize="@dimen/sp_12" />
         </LinearLayout>
 

app/src/main/res/layout/adapter_layout_empty_data_one.xml

@@ -8,6 +8,7 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_75"
         android:src="@mipmap/ic_order_confirmation" />
 
     <TextView

app/src/main/res/layout/adapter_layout_merchant_empty.xml

@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/dp_126"
-        android:src="@mipmap/pic_home_not_commodity" />
+        android:src="@mipmap/ic_order_confirmation" />
 
     <TextView
         android:id="@+id/tv_text_tip"