Browse Source

添加确定订单页面,添加优惠券选择dialog,

hy 3 years ago
parent
commit
59c1b20572

+ 3 - 0
app/src/main/AndroidManifest.xml

@ -523,6 +523,9 @@
523 523
            android:name=".activity.OderDetailsActivity"
524 524
            android:screenOrientation="portrait" />
525 525
        <activity
526
            android:name=".activity.ConfirmOrderActivity"
527
            android:screenOrientation="portrait" />
528
        <activity
526 529
            android:name=".activity.AccountRechargeActivity"
527 530
            android:screenOrientation="portrait" />
528 531
        <activity

+ 70 - 0
app/src/main/java/com/electric/chargingpile/activity/ConfirmOrderActivity.java

@ -0,0 +1,70 @@
1
package com.electric.chargingpile.activity;
2
3
import android.content.Context;
4
import android.content.Intent;
5
import android.os.Bundle;
6
import android.view.View;
7
import android.widget.RelativeLayout;
8
9
import androidx.annotation.Nullable;
10
import androidx.appcompat.app.AppCompatActivity;
11
import androidx.fragment.app.Fragment;
12
import androidx.fragment.app.FragmentManager;
13
import androidx.fragment.app.FragmentTransaction;
14
15
import com.electric.chargingpile.R;
16
import com.electric.chargingpile.view.PreferentialDialog;
17
18
/**
19
 * 确认订单
20
 * */
21
public class ConfirmOrderActivity extends AppCompatActivity implements View.OnClickListener {
22
23
    private RelativeLayout layoutRed;
24
25
    @Override
26
    protected void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
27
        super.onCreate(savedInstanceState);
28
        setContentView(R.layout.activity_submit_orders);
29
        initView();
30
    }
31
32
    private void initView() {
33
        layoutRed = findViewById(R.id.layoutRed);
34
        layoutRed.setOnClickListener(this);
35
    }
36
37
38
    @Override
39
    public void onClick(View v) {
40
        switch (v.getId()){
41
            case R.id.layoutRed:
42
                FragmentManager fragmentManager = getSupportFragmentManager();
43
                FragmentTransaction ft = fragmentManager.beginTransaction();
44
                Fragment prev = fragmentManager.findFragmentByTag(PreferentialDialog.class.getName());
45
                if (prev != null) {
46
                    ft.remove(prev);
47
                }
48
49
                PreferentialDialog dialog= PreferentialDialog.newInstance();
50
                dialog.show(fragmentManager,PreferentialDialog.class.getName());
51
52
                fragmentManager.executePendingTransactions();
53
54
                break;
55
            case R.id.tv_gocomment:
56
                Intent oderIntent = new Intent(this, OderDetailsActivity.class);
57
                startActivity(oderIntent);
58
                break;
59
            case R.id.iv_back:
60
                finish();
61
                break;
62
        }
63
    }
64
65
    public static void actionStart(Context context){
66
        Intent intent = new Intent(context, ConfirmOrderActivity.class);
67
        context.startActivity(intent);
68
    }
69
70
}

+ 2 - 1
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -966,7 +966,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
966 966
            }
967 967
        }, 2000);
968 968
969
        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
969
//        ConfirmOrderActivity.actionStart(this);
970
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
970 971
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
971 972
    }
972 973

+ 3 - 1
app/src/main/java/com/electric/chargingpile/activity/OderDetailsActivity.java

@ -48,7 +48,9 @@ import cn.sharesdk.framework.ShareSDK;
48 48
import cn.sharesdk.wechat.friends.Wechat;
49 49
import cn.sharesdk.wechat.moments.WechatMoments;
50 50
import okhttp3.Call;
51
51
/**
52
 * 订单详情页面
53
 * */
52 54
public class OderDetailsActivity extends Activity implements View.OnClickListener, PlatformActionListener {
53 55
    private ImageView iv_back, iv_hongbao, iv;
54 56
    private PopupWindow popupWindow;

+ 62 - 0
app/src/main/java/com/electric/chargingpile/adapter/PreferentialAdapter.java

@ -0,0 +1,62 @@
1
package com.electric.chargingpile.adapter;
2
3
import android.view.LayoutInflater;
4
import android.view.View;
5
import android.view.ViewGroup;
6
import android.widget.CheckBox;
7
import android.widget.TextView;
8
9
import androidx.annotation.NonNull;
10
import androidx.recyclerview.widget.RecyclerView;
11
12
import com.electric.chargingpile.R;
13
14
import org.jetbrains.annotations.NotNull;
15
16
import java.util.ArrayList;
17
import java.util.List;
18
19
public class PreferentialAdapter extends RecyclerView.Adapter<PreferentialAdapter.ViewHodler> {
20
21
    private List<String> mDatas=new ArrayList<String>();
22
    @NonNull
23
    @NotNull
24
    @Override
25
    public ViewHodler onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
26
        View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_text_checkbox, parent, false);
27
        return new ViewHodler(view);
28
    }
29
30
    @Override
31
    public void onBindViewHolder(@NonNull @NotNull ViewHodler holder, int position) {
32
       holder.checkBox.setChecked(false);
33
       holder.name.setText("优惠券" + position);
34
35
       holder.checkBox.setOnClickListener(v->{
36
           selectPostioin(position);
37
       });
38
    }
39
40
    @Override
41
    public int getItemCount() {
42
        return 30;
43
    }
44
45
    private void selectPostioin(int postioin){
46
        for (int i = 0; i < mDatas.size(); i++) {
47
            //将下标对应的bean类修改为true,其他的bean修改为false即可。
48
        }
49
    }
50
51
    public static class ViewHodler extends RecyclerView.ViewHolder {
52
53
        private final TextView name;
54
        private final CheckBox checkBox;
55
56
        public ViewHodler(@NonNull @NotNull View itemView) {
57
            super(itemView);
58
            name = itemView.findViewById(R.id.name);
59
            checkBox = itemView.findViewById(R.id.checkBox);
60
        }
61
    }
62
}

+ 70 - 0
app/src/main/java/com/electric/chargingpile/view/PreferentialDialog.java

@ -0,0 +1,70 @@
1
package com.electric.chargingpile.view;
2
3
import android.os.Bundle;
4
import android.view.LayoutInflater;
5
import android.view.View;
6
import android.view.ViewGroup;
7
import android.widget.TextView;
8
9
import androidx.annotation.NonNull;
10
import androidx.annotation.Nullable;
11
import androidx.recyclerview.widget.LinearLayoutManager;
12
import androidx.recyclerview.widget.RecyclerView;
13
14
import com.electric.chargingpile.R;
15
import com.electric.chargingpile.adapter.PreferentialAdapter;
16
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
17
18
import org.jetbrains.annotations.NotNull;
19
/**
20
 * 选择优惠类型
21
 * */
22
public class PreferentialDialog extends BottomSheetDialogFragment {
23
24
    private RecyclerView recyclerView;
25
    private CompleteListener mListener;
26
27
    public static  PreferentialDialog newInstance(){
28
        PreferentialDialog dialog = new PreferentialDialog();
29
        Bundle arguments = dialog.getArguments();
30
        return dialog;
31
    }
32
33
34
    @Override
35
    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
36
        super.onCreate(savedInstanceState);
37
        setStyle(BottomSheetDialogFragment.STYLE_NORMAL, R.style.TransparentVideoDialogFragmentTheme);
38
39
    }
40
41
    @Nullable
42
    @org.jetbrains.annotations.Nullable
43
    @Override
44
    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
45
        View rootView=inflater.inflate(R.layout.dialog_preferential,container,false);
46
        return rootView;
47
    }
48
49
    @Override
50
    public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
51
        super.onViewCreated(view, savedInstanceState);
52
        TextView complete=view.findViewById(R.id.complete);
53
        recyclerView = view.findViewById(R.id.recyclerView);
54
        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
55
        PreferentialAdapter adapter=new PreferentialAdapter();
56
        recyclerView.setAdapter(adapter);
57
        complete.setOnClickListener(v->{
58
            //获取adapter被选中的数据,并且返回回调给
59
            mListener.onComplete();
60
        });
61
    }
62
63
    public void setListener(CompleteListener listener){
64
        mListener=listener;
65
    }
66
67
    public interface CompleteListener{
68
        void onComplete();
69
    }
70
}

BIN
app/src/main/res/drawable-xxhdpi/ic_default_orders.png


BIN
app/src/main/res/drawable-xxhdpi/ic_no_check.png


BIN
app/src/main/res/drawable-xxhdpi/ic_select_check.png


+ 5 - 0
app/src/main/res/drawable/bg_dialog_preferential.xml

@ -0,0 +1,5 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<shape xmlns:android="http://schemas.android.com/apk/res/android">
3
    <corners android:topRightRadius="20dp" android:topLeftRadius="20dp"/>
4
    <solid android:color="@color/white"/>
5
</shape>

+ 8 - 0
app/src/main/res/drawable/checkbox_style.xml

@ -0,0 +1,8 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
4
    <item android:drawable="@drawable/ic_select_check" android:state_checked="true"/>
5
    <item android:drawable="@drawable/ic_no_check" android:state_checked="false"/>
6
    <item android:drawable="@drawable/ic_no_check"/>
7
8
</selector>

+ 4 - 0
app/src/main/res/layout/activity_oder_details.xml

@ -38,6 +38,7 @@
38 38
39 39
    </RelativeLayout>
40 40
41
41 42
    <LinearLayout
42 43
        android:id="@+id/ll_order"
43 44
        android:layout_width="match_parent"
@ -45,6 +46,9 @@
45 46
        android:layout_below="@+id/rl_title"
46 47
        android:layout_alignParentStart="true"
47 48
        android:layout_alignParentLeft="true"
49
        android:layout_marginStart="-1dp"
50
        android:layout_marginLeft="-1dp"
51
        android:layout_marginTop="0dp"
48 52
        android:background="@color/white"
49 53
        android:orientation="vertical">
50 54

+ 307 - 0
app/src/main/res/layout/activity_submit_orders.xml

@ -0,0 +1,307 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:background="@color/white"
5
    android:layout_height="match_parent">
6
    <RelativeLayout
7
        android:id="@+id/rl_title"
8
        android:layout_width="match_parent"
9
        android:layout_height="44dp"
10
        android:layout_alignParentStart="true"
11
        android:layout_alignParentLeft="true"
12
        android:layout_alignParentTop="true"
13
        android:background="@color/white">
14
15
        <TextView
16
            android:id="@+id/tv_zhan_name"
17
            android:layout_width="wrap_content"
18
            android:layout_height="wrap_content"
19
            android:layout_centerInParent="true"
20
            android:text="订单详情"
21
            android:textColor="@color/ui_62"
22
            android:textSize="18sp" />
23
24
        <ImageView
25
            android:id="@+id/iv_back"
26
            android:layout_width="wrap_content"
27
            android:layout_height="match_parent"
28
            android:layout_alignParentLeft="true"
29
            android:layout_centerVertical="true"
30
            android:contentDescription="@null"
31
            android:paddingLeft="15dp"
32
            android:paddingRight="15dp"
33
            android:src="@drawable/icon_lvback1119" />
34
35
    </RelativeLayout>
36
    <LinearLayout
37
        android:id="@+id/ll_order"
38
        android:layout_width="match_parent"
39
        android:layout_height="wrap_content"
40
        android:layout_below="@+id/rl_title"
41
        android:layout_alignParentStart="true"
42
        android:layout_alignParentLeft="true"
43
        android:layout_marginStart="-1dp"
44
        android:layout_marginLeft="-1dp"
45
        android:layout_marginTop="0dp"
46
        android:background="@color/white"
47
        android:orientation="vertical">
48
49
        <TextView
50
            android:id="@+id/tv_name"
51
            android:layout_width="wrap_content"
52
            android:layout_height="wrap_content"
53
            android:layout_gravity="center_horizontal"
54
            android:layout_marginTop="27dp"
55
            android:drawableLeft="@drawable/icon_zhan_name"
56
            android:drawablePadding="8dp"
57
            android:gravity="center"
58
            android:text=""
59
            android:textColor="@color/ui_62"
60
            android:textSize="18sp" />
61
62
        <TextView
63
            android:id="@+id/tv_charging_shifu"
64
            android:layout_width="wrap_content"
65
            android:layout_height="wrap_content"
66
            android:layout_gravity="center_horizontal"
67
            android:layout_marginTop="30dp"
68
            android:text="--"
69
            android:textColor="@color/ui_62"
70
            android:textSize="31sp" />
71
72
        <TextView
73
            android:layout_width="wrap_content"
74
            android:layout_height="wrap_content"
75
            android:layout_gravity="center_horizontal"
76
            android:layout_marginTop="14dp"
77
            android:text="实付金额(元)"
78
            android:textColor="@color/ui_68"
79
            android:textSize="14sp" />
80
81
        <RelativeLayout
82
            android:layout_width="match_parent"
83
            android:layout_height="wrap_content"
84
            android:layout_marginTop="21dp">
85
86
            <TextView
87
                android:layout_width="wrap_content"
88
                android:layout_height="wrap_content"
89
                android:layout_alignParentLeft="true"
90
                android:layout_marginLeft="15dp"
91
                android:text="充电费"
92
                android:textColor="@color/ui_62"
93
                android:textSize="14sp" />
94
95
            <TextView
96
                android:id="@+id/tv_charging_cost"
97
                android:layout_width="wrap_content"
98
                android:layout_height="wrap_content"
99
                android:layout_alignParentRight="true"
100
                android:layout_marginRight="15dp"
101
                android:text="--"
102
                android:textColor="@color/ui_62"
103
                android:textSize="14sp" />
104
105
        </RelativeLayout>
106
107
        <RelativeLayout
108
            android:layout_width="match_parent"
109
            android:layout_height="wrap_content"
110
            android:layout_marginTop="13dp">
111
112
            <TextView
113
                android:layout_width="wrap_content"
114
                android:layout_height="wrap_content"
115
                android:layout_alignParentLeft="true"
116
                android:layout_marginLeft="15dp"
117
                android:text="服务费"
118
                android:textColor="@color/ui_62"
119
                android:textSize="14sp" />
120
121
            <TextView
122
                android:id="@+id/tv_service_cost"
123
                android:layout_width="wrap_content"
124
                android:layout_height="wrap_content"
125
                android:layout_alignParentRight="true"
126
                android:layout_marginRight="15dp"
127
                android:text="--"
128
                android:textColor="@color/ui_62"
129
                android:textSize="14sp" />
130
131
        </RelativeLayout>
132
133
        <RelativeLayout
134
            android:id="@+id/layoutRed"
135
            android:layout_width="match_parent"
136
            android:layout_height="wrap_content"
137
            android:layout_marginTop="13dp">
138
139
            <TextView
140
                android:id="@+id/redEnvelope"
141
                android:layout_width="wrap_content"
142
                android:layout_height="wrap_content"
143
                android:layout_alignParentLeft="true"
144
                android:layout_marginLeft="15dp"
145
                android:text="红包/优惠券"
146
                android:textSize="14sp" />
147
            <ImageView
148
                android:layout_marginTop="8dp"
149
                android:layout_alignStart="@+id/redEnvelope"
150
                android:src="@drawable/ic_default_orders"
151
                android:layout_below="@+id/redEnvelope"
152
                android:layout_width="wrap_content"
153
                android:layout_height="wrap_content"/>
154
155
            <TextView
156
                android:layout_centerVertical="true"
157
                android:id="@+id/tv_charging_hongbao"
158
                android:layout_width="wrap_content"
159
                android:layout_height="wrap_content"
160
                android:layout_alignParentRight="true"
161
                android:layout_marginRight="15dp"
162
                android:text="--"
163
                android:textColor="@color/juhuang"
164
                android:textSize="14sp" />
165
166
        </RelativeLayout>
167
168
        <View
169
            android:layout_width="match_parent"
170
            android:layout_height="5dp"
171
            android:layout_marginTop="20dp"
172
            android:layout_marginBottom="20dp"
173
            android:background="#F6F6F6" />
174
175
        <RelativeLayout
176
            android:layout_width="match_parent"
177
            android:layout_height="wrap_content"
178
           >
179
180
            <TextView
181
                android:layout_width="wrap_content"
182
                android:layout_height="wrap_content"
183
                android:layout_alignParentLeft="true"
184
                android:layout_marginLeft="15dp"
185
                android:text="充电桩编号"
186
                android:textColor="@color/ui_68"
187
                android:textSize="14sp" />
188
189
            <TextView
190
                android:id="@+id/tv_zhuang_no"
191
                android:layout_width="wrap_content"
192
                android:layout_height="wrap_content"
193
                android:layout_alignParentRight="true"
194
                android:layout_marginRight="15dp"
195
                android:text="--"
196
                android:textColor="@color/ui_68"
197
                android:textSize="14sp" />
198
199
        </RelativeLayout>
200
201
        <RelativeLayout
202
            android:layout_width="match_parent"
203
            android:layout_height="wrap_content"
204
            android:layout_marginTop="13dp">
205
206
            <TextView
207
                android:layout_width="wrap_content"
208
                android:layout_height="wrap_content"
209
                android:layout_alignParentLeft="true"
210
                android:layout_marginLeft="15dp"
211
                android:text="充电时长"
212
                android:textColor="@color/ui_68"
213
                android:textSize="14sp" />
214
215
            <TextView
216
                android:id="@+id/tv_charging_time"
217
                android:layout_width="wrap_content"
218
                android:layout_height="wrap_content"
219
                android:layout_alignParentRight="true"
220
                android:layout_marginRight="15dp"
221
                android:text="--"
222
                android:textColor="@color/ui_68"
223
                android:textSize="14sp" />
224
225
        </RelativeLayout>
226
227
        <RelativeLayout
228
            android:layout_width="match_parent"
229
            android:layout_height="wrap_content"
230
            android:layout_marginTop="13dp">
231
232
            <TextView
233
                android:layout_width="wrap_content"
234
                android:layout_height="wrap_content"
235
                android:layout_alignParentLeft="true"
236
                android:layout_marginLeft="15dp"
237
                android:text="充电度数"
238
                android:textColor="@color/ui_68"
239
                android:textSize="14sp" />
240
241
            <TextView
242
                android:id="@+id/tv_charging_liang"
243
                android:layout_width="wrap_content"
244
                android:layout_height="wrap_content"
245
                android:layout_alignParentRight="true"
246
                android:layout_marginRight="15dp"
247
                android:text="--"
248
                android:textColor="@color/ui_68"
249
                android:textSize="14sp" />
250
251
        </RelativeLayout>
252
253
        <RelativeLayout
254
            android:id="@+id/rl_end_info"
255
            android:layout_width="match_parent"
256
            android:layout_height="wrap_content"
257
            android:layout_marginTop="13dp">
258
259
            <TextView
260
                android:layout_width="wrap_content"
261
                android:layout_height="wrap_content"
262
                android:layout_alignParentLeft="true"
263
                android:layout_marginLeft="15dp"
264
                android:text="结束原因"
265
                android:textColor="@color/ui_68"
266
                android:textSize="14sp" />
267
268
            <TextView
269
                android:id="@+id/tv_tishi"
270
                android:layout_width="wrap_content"
271
                android:layout_height="wrap_content"
272
                android:layout_alignParentRight="true"
273
                android:layout_marginRight="15dp"
274
                android:text="--"
275
                android:textColor="@color/ui_68"
276
                android:textSize="14sp" />
277
278
        </RelativeLayout>
279
    </LinearLayout>
280
281
    <TextView
282
        android:layout_centerHorizontal="true"
283
        android:layout_above="@+id/tv_gocomment"
284
        android:layout_width="wrap_content"
285
        android:layout_height="wrap_content"
286
        android:text="注:结束充电半小时没有提交结算订单系统默认按最大折扣结算"
287
        android:textColor="#ff707070"
288
        android:textSize="12sp"
289
        />
290
291
    <TextView
292
        android:id="@+id/tv_gocomment"
293
        android:layout_width="match_parent"
294
        android:layout_height="39dp"
295
        android:layout_alignParentBottom="true"
296
        android:layout_marginLeft="15dp"
297
        android:layout_marginTop="15dp"
298
        android:layout_marginRight="15dp"
299
        android:layout_marginBottom="7dp"
300
        android:background="@drawable/textview_greenstyle"
301
        android:gravity="center"
302
        android:text="提交订单并结算"
303
        android:textColor="@color/white"
304
        android:textSize="16sp" />
305
306
307
</RelativeLayout>

+ 45 - 0
app/src/main/res/layout/dialog_preferential.xml

@ -0,0 +1,45 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:orientation="vertical"
5
    android:background="@drawable/bg_dialog_preferential"
6
    android:layout_height="444dp">
7
8
    <TextView
9
        android:layout_marginBottom="15dp"
10
        android:layout_marginTop="20dp"
11
        android:layout_gravity="center_horizontal"
12
        android:layout_width="wrap_content"
13
        android:layout_height="wrap_content"
14
        android:text="优惠类型"
15
        android:textColor="#ff0e0e0e"
16
        android:textSize="18sp"
17
        />
18
    <androidx.recyclerview.widget.RecyclerView
19
        android:id="@+id/recyclerView"
20
        android:layout_width="match_parent"
21
        android:layout_height="320dp"/>
22
    <TextView
23
        android:visibility="gone"
24
        android:gravity="center"
25
        android:text="暂无优惠券~"
26
        android:textColor="#ff9b9b9b"
27
        android:textSize="18sp"
28
        android:id="@+id/noPreferential"
29
        android:layout_width="match_parent"
30
        android:layout_height="320dp"/>
31
    <TextView
32
        android:id="@+id/complete"
33
        android:layout_width="match_parent"
34
        android:layout_height="39dp"
35
        android:layout_marginLeft="12dp"
36
        android:layout_marginTop="15dp"
37
        android:layout_marginRight="12dp"
38
        android:layout_marginBottom="7dp"
39
        android:background="@drawable/textview_greenstyle"
40
        android:gravity="center"
41
        android:text="完成"
42
        android:textColor="@color/white"
43
        android:textSize="16sp" />
44
45
</LinearLayout>

+ 26 - 0
app/src/main/res/layout/item_text_checkbox.xml

@ -0,0 +1,26 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:padding="10dp"
5
    android:layout_height="wrap_content">
6
7
    <TextView
8
        android:layout_gravity="center"
9
        android:id="@+id/name"
10
        android:layout_weight="1"
11
        android:layout_width="0dp"
12
        android:layout_height="wrap_content"
13
        android:text="不使用"
14
        android:textColor="@color/color_ff333333"
15
        android:textSize="14sp" />
16
    <CheckBox
17
        android:layout_gravity="center"
18
        android:padding="5dp"
19
        style="@style/CustomCheckboxTheme"
20
        android:src="@drawable/ic_no_check"
21
        android:id="@+id/checkBox"
22
        android:layout_width="wrap_content"
23
        android:layout_height="wrap_content"
24
      />
25
26
</LinearLayout>

+ 1 - 0
app/src/main/res/values/color.xml

@ -198,6 +198,7 @@
198 198
    <color name="sv_white">#FFFFFF</color>
199 199
    <color name="color_3ec34c">#3EC34C</color>
200 200
    <color name="color_f08f4b">#F08F4B</color>
201
    <color name="color_ff333333">#ff333333</color>
201 202

202 203

203 204


+ 11 - 0
app/src/main/res/values/styles.xml

@ -366,4 +366,15 @@
366 366
        <attr name="drawableBottomWidth" format="dimension" />
367 367
        <attr name="drawableBottomHeight" format="dimension" />
368 368
    </declare-styleable>
369

370
    <style name="TransparentVideoDialogFragmentTheme" parent="Theme.Design.Light.BottomSheetDialog">
371
        <item name="bottomSheetStyle">@style/CustomBottomSheetDialogFragmentStyle</item>
372

373
    </style>
374
    <style name="CustomBottomSheetDialogFragmentStyle" parent="Widget.Design.BottomSheet.Modal">
375
        <item name="android:background">@android:color/transparent</item>
376
    </style>
377
    <style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
378
        <item name="android:button">@drawable/checkbox_style</item>
379
    </style>
369 380
</resources>