Google Play(18)

TMessagesProj/src/main/java/org/telegram/cricdit/adapter/MoreGroupAdapter.java

@@ -36,11 +36,7 @@ public class MoreGroupAdapter extends BaseQuickAdapter<MoreGroupBean.ListDTO, Ba
         titleTv.setTypeface(AndroidUtilities.getNormalTypefaceMedium());
         titleTv.setContentAndTag(item.name, tagList);
 
-        System.out.println("rqqewrwerq   " + item.group_id);
-
-//        helper.setText(R.id.more_group_item_bio,item.introduction);
-
-//        helper.setVisible(R.id.more_group_item_bio,false);
+        helper.setText(R.id.more_group_item_type2, item.type.equals("0") ? "Group" : "Channel");
 
         Glide.with(mContext)
                 .load(Base64Utils.base64ToBitmap(item.face_url))

TMessagesProj/src/main/java/org/telegram/cricdit/adapter/PointsRecordAdapter.java

@@ -8,17 +8,20 @@ import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
 
 import org.telegram.cricdit.bean.PointsRecordBean;
+import org.telegram.messenger.R;
 
 import java.util.List;
 
-public class PointsRecordAdapter extends BaseQuickAdapter<PointsRecordBean,BaseViewHolder> {
+public class PointsRecordAdapter extends BaseQuickAdapter<PointsRecordBean.Data.ListDTO, BaseViewHolder> {
 
-    public PointsRecordAdapter(int layoutResId, @Nullable List<PointsRecordBean> data) {
+    public PointsRecordAdapter(int layoutResId, @Nullable List<PointsRecordBean.Data.ListDTO> data) {
         super(layoutResId, data);
     }
 
     @Override
-    protected void convert(@NonNull BaseViewHolder helper, PointsRecordBean item) {
-
+    protected void convert(@NonNull BaseViewHolder helper, PointsRecordBean.Data.ListDTO item) {
+        helper.setText(R.id.points_record_item_score, item.score);
+        helper.setText(R.id.points_record_item_type, item.type);
+        helper.setText(R.id.points_record_item_time, item.time);
     }
 }

TMessagesProj/src/main/java/org/telegram/cricdit/bean/MoreGroupBean.java

@@ -18,6 +18,7 @@ public class MoreGroupBean {
             public String introduction;
             public String private_link;
             public String public_link;
+            public String type;
     }
 //        public Integer limit;
 //        public List<ListDTO> list;

TMessagesProj/src/main/java/org/telegram/cricdit/bean/PointsRecordBean.java

@@ -8,6 +8,17 @@ public class PointsRecordBean {
     public String errMsg;
 
     public static class Data {
+        public Integer limit;
+        public List<ListDTO> list;
+        public Integer start;
+        public Integer total;
+
+        public static class ListDTO{
+            public String time;
+            public String score;
+            public String type;
+
+        }
 
     }
 }

TMessagesProj/src/main/java/org/telegram/cricdit/mvp/PointsRecordPresenter.java

@@ -11,7 +11,7 @@ import org.telegram.messenger.UserConfig;
 
 public class PointsRecordPresenter extends BasePresenter<PointsRecordView> {
 
-    public void getNormalRecord(int start, int limit, String type, String time) {
+    public void getNormalRecord(int start, int limit, String type, String time,int refreshType) {
         Parameter parameter = new Parameter();
         parameter.add("operationID", ParamsUtil.buildOperationID());
         parameter.add("limit", limit);
@@ -21,13 +21,13 @@ public class PointsRecordPresenter extends BasePresenter<PointsRecordView> {
         addSubscribe(create(ApiService.class).getPointsRecord(parameter.buildJsonBody()), new BaseObserver<PointsRecordBean.Data>(getView()) {
             @Override
             protected void onSuccess(PointsRecordBean.Data data) {
-                getView().getRecordListSuccess(data);
+                getView().getRecordListSuccess(data,refreshType);
             }
 
             @Override
             public void onError(Throwable e) {
                 super.onError(e);
-                getView().loadDataFailed();
+                getView().loadDataFailed(refreshType);
             }
         });
     }

TMessagesProj/src/main/java/org/telegram/cricdit/mvp/PointsRecordView.java

@@ -3,12 +3,10 @@ package org.telegram.cricdit.mvp;
 import org.telegram.cricdit.base.IView;
 import org.telegram.cricdit.bean.PointsRecordBean;
 
-import java.util.List;
-
 public interface PointsRecordView extends IView {
 
-    void getRecordListSuccess(PointsRecordBean.Data data);
+    void getRecordListSuccess(PointsRecordBean.Data data, int refreshType);
 
-    void loadDataFailed();
+    void loadDataFailed(int refreshType);
 
 }

TMessagesProj/src/main/java/org/telegram/cricdit/ui/PointsRecordActivity.java

@@ -1,46 +1,39 @@
 package org.telegram.cricdit.ui;
 
-import android.app.AlertDialog;
-import android.app.DatePickerDialog;
-import android.content.res.Resources;
-import android.graphics.Color;
-import android.os.Build;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.DatePicker;
 import android.widget.ImageView;
 import android.widget.TextView;
-import android.widget.Toast;
 
+import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.lxj.xpopup.XPopup;
 import com.lxj.xpopup.util.XPopupUtils;
 import com.scwang.smart.refresh.layout.SmartRefreshLayout;
+import com.scwang.smart.refresh.layout.api.RefreshLayout;
+import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
-import org.jetbrains.annotations.NotNull;
 import org.telegram.cricdit.adapter.PointsRecordAdapter;
 import org.telegram.cricdit.base.BaseActivity;
-import org.telegram.cricdit.base.IPresenter;
 import org.telegram.cricdit.bean.PointsRecordBean;
 import org.telegram.cricdit.mvp.PointsRecordPresenter;
+import org.telegram.cricdit.mvp.PointsRecordView;
 import org.telegram.cricdit.view.CustomBubbleAttachPopup;
 import org.telegram.cricdit.view.CustomDateDialog;
 import org.telegram.messenger.R;
 
-import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.List;
 
 
-public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
+public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> implements PointsRecordView {
 
     private RecyclerView mRecyclerView;
     private SmartRefreshLayout mRefreshLayout;
-    private List<PointsRecordBean> mPointsRecordBeanList;
+    private List<PointsRecordBean.Data.ListDTO> mPointsRecordBeanList;
     private PointsRecordAdapter mAdapter;
     private TextView mFilterType;
     private TextView mFilterTime;
@@ -49,6 +42,11 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
     private int year;
     private int month;
     private int day;
+    private int mLimit = 40;
+    private int mStart = 1;
+    public static final int TYPE_REFRESH = 1;
+    public static final int TYPE_LOADMORE = 2;
+
 
     @Override
     protected int getLayoutResId() {
@@ -81,6 +79,15 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
 
         mRecyclerView.setLayoutManager(new LinearLayoutManager(getContext()));
 
+
+//        for (int i = 0; i < 5; i++) {
+//            PointsRecordBean.Data.ListDTO listDTO = new PointsRecordBean.Data.ListDTO();
+//            listDTO.score="+5";
+//            listDTO.time = "2022-12-26 15:35:21";
+//            listDTO.type = "Type of: Like";
+//            mPointsRecordBeanList.add(listDTO);
+//        }
+
         mAdapter = new PointsRecordAdapter(R.layout.item_points_record, mPointsRecordBeanList);
 
         View inflate = LayoutInflater.from(getContext()).inflate(R.layout.layout_empty_view, null, false);
@@ -102,7 +109,17 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
             getDate();
         });
 
+        mRefreshLayout.setOnRefreshLoadMoreListener(new OnRefreshLoadMoreListener() {
+            @Override
+            public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
 
+            }
+
+            @Override
+            public void onRefresh(@NonNull RefreshLayout refreshLayout) {
+//                presenter.getNormalRecord(mStart,mLimit,);
+            }
+        });
     }
 
     public void getDate() {
@@ -110,7 +127,7 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
         CustomDateDialog dialog = new CustomDateDialog(getContext());
         Calendar calendar = Calendar.getInstance();
         dialog.setDate(calendar.get(Calendar.YEAR), calendar.get(Calendar.MONTH), (year, month) -> {
-            mFilterTime.setText(year +"-"+ month + "");
+            mFilterTime.setText(year + "-" + month + "");
         });
         dialog.show();
     }
@@ -132,4 +149,30 @@ public class PointsRecordActivity extends BaseActivity<PointsRecordPresenter> {
                 .show();
     }
 
+    @Override
+    public void getRecordListSuccess(PointsRecordBean.Data data, int refreshType) {
+        mRefreshLayout.finishRefresh();
+        mRefreshLayout.finishLoadMore();
+
+        if (refreshType == TYPE_REFRESH) {
+
+        } else {
+
+        }
+
+    }
+
+    @Override
+    public void loadDataFailed(int refreshType) {
+        mRefreshLayout.finishRefresh();
+        mRefreshLayout.finishLoadMore();
+
+        if (refreshType == TYPE_REFRESH) {
+
+        } else {
+
+
+        }
+
+    }
 }

TMessagesProj/src/main/java/org/telegram/cricdit/utils/DialogUtils.java

@@ -83,7 +83,7 @@ public class DialogUtils {
 
     //初始化Dialog
     @NonNull
-    private static Dialog initDialog(Context context) {
+    public static Dialog initDialog(Context context) {
         Dialog dialog = new Dialog(context, R.style.ConfirmDialog);
         dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
         dialog.getWindow().setBackgroundDrawable(new ColorDrawable(Color.TRANSPARENT));

TMessagesProj/src/main/java/org/telegram/cricdit/view/CustomDateDialog.java

@@ -10,9 +10,16 @@ import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.DatePicker;
 import android.widget.LinearLayout;
+import android.widget.NumberPicker;
 import android.widget.TextView;
 
+import androidx.constraintlayout.widget.ConstraintLayout;
+
+import org.telegram.cricdit.utils.DensityUtil;
+import org.telegram.cricdit.utils.DialogUtils;
 import org.telegram.messenger.R;
+import org.telegram.onecric.utils.DialogUtil;
+import org.telegram.ui.Components.LayoutHelper;
 
 import java.lang.reflect.Field;
 import java.util.Calendar;
@@ -22,18 +29,32 @@ public class CustomDateDialog implements View.OnClickListener, DatePicker.OnDate
     private TextView titleTv;//标题
     private DatePicker datePicker;//日期选择控件
     private TextView confirmTv;//底部的“确认”
+    private TextView cancelTv;//底部的“取消”
     private View dialogView;
     private OnDateSetListener onDateSetListener;
+    String months[] = {"1", "2", "3", "4", "5", "6",
+            "7", "8", "9", "10", "11", "12"};
 
     /**
      * 构造器
+     *
      * @param context 上下文
      */
-    public CustomDateDialog(Context context){
+    public CustomDateDialog(Context context) {
         dialogView = LayoutInflater.from(context).inflate(R.layout.date_dialog, null);
-        dialog=new Dialog(context,R.style.CustomDateDialog);
-        titleTv=dialogView.findViewById(R.id.titleTv);
-        datePicker=dialogView.findViewById(R.id.datePicker);
+//        dialog=new Dialog(context,R.style.CustomDateDialog);
+
+        dialog = DialogUtils.initDialog(context);
+
+//        LinearLayout.LayoutParams layoutParams = LayoutHelper.createLinear(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT);
+
+        ConstraintLayout.LayoutParams layoutParams = new ConstraintLayout.LayoutParams(LayoutHelper.MATCH_PARENT, LayoutHelper.WRAP_CONTENT);
+
+        dialog.setContentView(dialogView, layoutParams);
+
+
+        titleTv = dialogView.findViewById(R.id.titleTv);
+        datePicker = dialogView.findViewById(R.id.datePicker);
 //        ViewGroup viewGroup1= (ViewGroup) datePicker.getChildAt(0);
 //        ViewGroup viewGroup2= (ViewGroup) viewGroup1.getChildAt(0);//获取年月日的下拉列表项
 //        if(viewGroup2.getChildCount()==3){//有的机型没有竖线，只有年、月、日
@@ -42,17 +63,22 @@ public class CustomDateDialog implements View.OnClickListener, DatePicker.OnDate
 //            viewGroup2.getChildAt(3).setVisibility(View.GONE);
 //            viewGroup2.getChildAt(4).setVisibility(View.GONE);
 //        }
-        confirmTv=dialogView.findViewById(R.id.confirmTv);
+        confirmTv = dialogView.findViewById(R.id.confirmTv);
+        cancelTv = dialogView.findViewById(R.id.cancelTv);
         confirmTv.setOnClickListener(this);
+        cancelTv.setOnClickListener(this);
+
+//        Dialog dialog = DialogUtils.initDialog(context);
+
     }
 
     /**
      * 显示对话框
      */
-    public void show(){
-        Window window = dialog.getWindow();
-        window.setContentView(dialogView);//设置对话框窗口的内容视图(这里有个坑，参数不要传R.layout.date_dialog，否则会出现各种问题，比如按钮响应不了点击事件)
-        window.setLayout(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);//设置对话框窗口的布局参数
+    public void show() {
+//        Window window = dialog.getWindow();
+//        window.setContentView(dialogView);//设置对话框窗口的内容视图(这里有个坑，参数不要传R.layout.date_dialog，否则会出现各种问题，比如按钮响应不了点击事件)
+//        window.setLayout(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.MATCH_PARENT);//设置对话框窗口的布局参数
         dialog.show();
         dialog.setCancelable(false);
     }
@@ -60,49 +86,52 @@ public class CustomDateDialog implements View.OnClickListener, DatePicker.OnDate
     /**
      * 关闭对话框
      */
-    public void dismiss(){
-        if(dialog!=null&&dialog.isShowing()){
+    public void dismiss() {
+        if (dialog != null && dialog.isShowing()) {
             dialog.dismiss();
         }
     }
 
     /**
      * 设置标题
+     *
      * @param title 标题
      */
-    public void setTitle(String title){
+    public void setTitle(String title) {
         titleTv.setText(title);
     }
 
-    public void setDate(int year,int month,OnDateSetListener onDateSetListener){
+    public void setDate(int year, int month, OnDateSetListener onDateSetListener) {
         Calendar calendar = Calendar.getInstance();
         hideDay(datePicker);
-        datePicker.init(year,month,calendar.get(Calendar.DAY_OF_MONTH),this);
-        this.onDateSetListener=onDateSetListener;
+        datePicker.init(year, month, calendar.get(Calendar.DAY_OF_MONTH), this);
+//        ((NumberPicker) ((ViewGroup) ((ViewGroup) datePicker.getChildAt(0)).getChildAt(0)).getChildAt(0)).setDisplayedValues(months);
+        this.onDateSetListener = onDateSetListener;
     }
 
     @Override
     public void onClick(View v) {
-        if(v.getId()== R.id.confirmTv){
+        if (v.getId() == R.id.confirmTv) {
             dialog.dismiss();
-            if(onDateSetListener!=null){
+            if (onDateSetListener != null) {
                 datePicker.clearFocus();
                 int year = datePicker.getYear();
                 int month = datePicker.getMonth();
                 int day = datePicker.getDayOfMonth();
-                onDateSetListener.onDateSet(year,month+1);
+                onDateSetListener.onDateSet(year, month + 1);
             }
+        } else if (v.getId() == R.id.cancelTv) {
+            dialog.dismiss();
         }
     }
 
     @Override
     public void onDateChanged(DatePicker view, int year, int monthOfYear, int dayOfMonth) {
-        System.out.println("weqrweqrwer   " + year + "  :  " + monthOfYear);
-        datePicker.init(year,monthOfYear,dayOfMonth,this);
+        datePicker.init(year, monthOfYear, dayOfMonth, this);
     }
 
-    public interface OnDateSetListener{
-        void onDateSet(int year,int month);
+    public interface OnDateSetListener {
+        void onDateSet(int year, int month);
     }
 
     private void hideDay(DatePicker mDatePicker) {

TMessagesProj/src/main/java/org/telegram/ui/ContactsActivity.java

@@ -783,26 +783,26 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         if (listViewAdapter != null) {
             listViewAdapter.notifyDataSetChanged();
         }
-        if (checkPermission && Build.VERSION.SDK_INT >= 23) {
-            Activity activity = getParentActivity();
-            if (activity != null) {
-                checkPermission = false;
-                if (activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
-                    if (activity.shouldShowRequestPermissionRationale(Manifest.permission.READ_CONTACTS)) {
-                        AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
-                            askAboutContacts = param != 0;
-                            if (param == 0) {
-                                return;
-                            }
-                            askForPermissons(false);
-                        });
-                        showDialog(permissionDialog = builder.create());
-                    } else {
-                        askForPermissons(true);
-                    }
-                }
-            }
-        }
+//        if (checkPermission && Build.VERSION.SDK_INT >= 23) {
+//            Activity activity = getParentActivity();
+//            if (activity != null) {
+//                checkPermission = false;
+//                if (activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
+//                    if (activity.shouldShowRequestPermissionRationale(Manifest.permission.READ_CONTACTS)) {
+//                        AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
+//                            askAboutContacts = param != 0;
+//                            if (param == 0) {
+//                                return;
+//                            }
+//                            askForPermissons(false);
+//                        });
+//                        showDialog(permissionDialog = builder.create());
+//                    } else {
+//                        askForPermissons(true);
+//                    }
+//                }
+//            }
+//        }
     }
 
     protected RecyclerListView getListView() {
@@ -836,32 +836,32 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
 
     @TargetApi(Build.VERSION_CODES.M)
     private void askForPermissons(boolean alert) {
-        Activity activity = getParentActivity();
-        if (activity == null || !UserConfig.getInstance(currentAccount).syncContacts || activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
-            return;
-        }
-        if (alert && askAboutContacts) {
-            AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
-                askAboutContacts = param != 0;
-                if (param == 0) {
-                    return;
-                }
-                askForPermissons(false);
-            });
-            showDialog(builder.create());
-            return;
-        }
-        permissionRequestTime = SystemClock.elapsedRealtime();
-        ArrayList<String> permissons = new ArrayList<>();
-        permissons.add(Manifest.permission.READ_CONTACTS);
-        permissons.add(Manifest.permission.WRITE_CONTACTS);
-        permissons.add(Manifest.permission.GET_ACCOUNTS);
-        String[] items = permissons.toArray(new String[0]);
-        try {
-            activity.requestPermissions(items, 1);
-        } catch (Exception e) {
-            FileLog.e(e);
-        }
+//        Activity activity = getParentActivity();
+//        if (activity == null || !UserConfig.getInstance(currentAccount).syncContacts || activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) == PackageManager.PERMISSION_GRANTED) {
+//            return;
+//        }
+//        if (alert && askAboutContacts) {
+//            AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
+//                askAboutContacts = param != 0;
+//                if (param == 0) {
+//                    return;
+//                }
+//                askForPermissons(false);
+//            });
+//            showDialog(builder.create());
+//            return;
+//        }
+//        permissionRequestTime = SystemClock.elapsedRealtime();
+//        ArrayList<String> permissons = new ArrayList<>();
+//        permissons.add(Manifest.permission.READ_CONTACTS);
+//        permissons.add(Manifest.permission.WRITE_CONTACTS);
+//        permissons.add(Manifest.permission.GET_ACCOUNTS);
+//        String[] items = permissons.toArray(new String[0]);
+//        try {
+//            activity.requestPermissions(items, 1);
+//        } catch (Exception e) {
+//            FileLog.e(e);
+//        }
     }
 
     @Override

TMessagesProj/src/main/java/org/telegram/ui/DialogsActivity.java

@@ -7400,20 +7400,20 @@ public class DialogsActivity extends BaseFragment implements NotificationCenter.
             return;
         }
         ArrayList<String> permissons = new ArrayList<>();
-        if (getUserConfig().syncContacts && askAboutContacts && activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
-            if (alert) {
-                AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
-                    askAboutContacts = param != 0;
-                    MessagesController.getGlobalNotificationsSettings().edit().putBoolean("askAboutContacts", askAboutContacts).commit();
-                    askForPermissons(false);
-                });
-                showDialog(permissionDialog = builder.create());
-                return;
-            }
-            permissons.add(Manifest.permission.READ_CONTACTS);
-            permissons.add(Manifest.permission.WRITE_CONTACTS);
-            permissons.add(Manifest.permission.GET_ACCOUNTS);
-        }
+//        if (getUserConfig().syncContacts && askAboutContacts && activity.checkSelfPermission(Manifest.permission.READ_CONTACTS) != PackageManager.PERMISSION_GRANTED) {
+//            if (alert) {
+//                AlertDialog.Builder builder = AlertsCreator.createContactsPermissionDialog(activity, param -> {
+//                    askAboutContacts = param != 0;
+//                    MessagesController.getGlobalNotificationsSettings().edit().putBoolean("askAboutContacts", askAboutContacts).commit();
+//                    askForPermissons(false);
+//                });
+//                showDialog(permissionDialog = builder.create());
+//                return;
+//            }
+//            permissons.add(Manifest.permission.READ_CONTACTS);
+//            permissons.add(Manifest.permission.WRITE_CONTACTS);
+//            permissons.add(Manifest.permission.GET_ACCOUNTS);
+//        }
         if ((Build.VERSION.SDK_INT <= 28 || BuildVars.NO_SCOPED_STORAGE) && activity.checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
             permissons.add(Manifest.permission.READ_EXTERNAL_STORAGE);
             permissons.add(Manifest.permission.WRITE_EXTERNAL_STORAGE);

TMessagesProj/src/main/res/drawable/dialog_bg.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="@color/colorWhite"/>
-    <corners android:radius="16dp"/>
+    <corners android:radius="10dp"/>
 </shape>

TMessagesProj/src/main/res/layout/activity_points_record.xml

@@ -84,7 +84,7 @@
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/points_record_recycler_view"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="match_parent"
             android:overScrollMode="never" />
 
         <include layout="@layout/base_head_loadmore" />

TMessagesProj/src/main/res/layout/date_dialog.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center">
@@ -7,10 +8,13 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="40dp"
-        android:layout_marginRight="40dp"
+        android:layout_marginStart="10dp"
+        android:layout_marginEnd="10dp"
         android:background="@drawable/dialog_bg"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
 
         <TextView
             android:id="@+id/titleTv"
@@ -32,16 +36,41 @@
         <View
             android:layout_width="match_parent"
             android:layout_height="1dp"
-            android:background="#ddd" />
+            android:background="#ddd"
+            android:visibility="gone" />
 
-        <TextView
-            android:id="@+id/confirmTv"
+        <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="50dp"
-            android:gravity="center"
-            android:text="Confirm"
-            android:textColor="@color/colorBlack"
-            android:textSize="16sp" />
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="10dp"
+            android:gravity="center|end"
+            android:orientation="horizontal">
+
+            <TextView
+                android:id="@+id/cancelTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="@string/cancel_upper"
+                android:textColor="@color/colorBlue"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+            <TextView
+                android:id="@+id/confirmTv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginEnd="10dp"
+                android:gravity="center"
+                android:padding="10dp"
+                android:text="@string/confirm_upper"
+                android:textColor="@color/colorBlue"
+                android:textSize="14sp"
+                android:textStyle="bold" />
+
+        </LinearLayout>
+
     </LinearLayout>
 
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/layout/item_points_record.xml

@@ -1,6 +1,53 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
+    <TextView
+        android:id="@+id/points_record_item_type"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:text="Type of: Like"
+        android:textColor="@color/colorBlack"
+        android:textSize="16sp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/points_record_item_score"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="+5"
+        android:textColor="@color/colorBlack"
+        android:textSize="16sp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/points_record_item_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="3dp"
+        android:text="2022-03-05 10:35:14"
+        android:textColor="@color/colorGray2"
+        android:textSize="13sp"
+        app:layout_constraintStart_toStartOf="@id/points_record_item_type"
+        app:layout_constraintTop_toBottomOf="@id/points_record_item_type" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="@color/line_color"
+        app:layout_constraintTop_toBottomOf="@id/points_record_item_time" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

TMessagesProj/src/main/res/values/strings.xml

@@ -285,8 +285,10 @@
     <string name="setting">Settings</string>
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
+    <string name="cancel_upper">CANCEL</string>
     <string name="save">Save</string>
     <string name="confirm">Confirm</string>
+    <string name="confirm_upper">CONFIRM</string>
     <string name="please_login">Please login</string>
     <string name="please_join_writer">requires creator to publish</string>
     <string name="empty_data">No data yet</string>

gradle.properties

@@ -15,8 +15,8 @@
 #Sat Mar 12 05:53:50 MSK 2016
 #APP_VERSION_NAME=9.0.2
 #APP_VERSION_CODE=2808
-APP_VERSION_NAME=0.1.6
-APP_VERSION_CODE=17
+APP_VERSION_NAME=0.1.7
+APP_VERSION_CODE=18
 #APP_PACKAGE=org.telegram.messenger
 APP_PACKAGE=com.cricdit.cricdit
 RELEASE_KEY_PASSWORD=123456