diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml deleted file mode 100644 index a649ee0..0000000 --- a/app/src/main/res/layout/include_case_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml deleted file mode 100644 index a649ee0..0000000 --- a/app/src/main/res/layout/include_case_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml deleted file mode 100644 index 560bede..0000000 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml deleted file mode 100644 index a649ee0..0000000 --- a/app/src/main/res/layout/include_case_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml deleted file mode 100644 index 560bede..0000000 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_option_title.xml b/app/src/main/res/layout/include_option_title.xml index 6141ca2..8f4a3f8 100644 --- a/app/src/main/res/layout/include_option_title.xml +++ b/app/src/main/res/layout/include_option_title.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml deleted file mode 100644 index a649ee0..0000000 --- a/app/src/main/res/layout/include_case_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml deleted file mode 100644 index 560bede..0000000 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_option_title.xml b/app/src/main/res/layout/include_option_title.xml index 6141ca2..8f4a3f8 100644 --- a/app/src/main/res/layout/include_option_title.xml +++ b/app/src/main/res/layout/include_option_title.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml deleted file mode 100644 index 238f64f..0000000 --- a/app/src/main/res/layout/include_package_base.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index fe31886..5bc967c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -49,7 +49,7 @@ - + @@ -68,6 +68,7 @@ + @@ -77,10 +78,28 @@ + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 1e04a82..a1e71e9 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -12,6 +12,7 @@ import android.view.MotionEvent; import android.view.View; import android.widget.ImageView; +import android.widget.LinearLayout; import android.widget.PopupWindow; import android.widget.TextView; @@ -119,6 +120,22 @@ uploadAudioPresenter = new UploadAudioPresenterImpl(this); uploadVideoPresenter = new UploadVideoPresenterImpl(this); + /** + * 计算+图标大小 + * + * CarrView水平外边距5dp + * RelativeLayout水平内边距10dp + * RecyclerView左边距100dp + * */ + int realWidth = QMUIDisplayHelper.getScreenWidth(this) - QMUIDisplayHelper.dp2px(this, 130); + int margins = QMUIDisplayHelper.dp2px(this, 3); + int itemSize = (realWidth - 4 * margins) / 2; + LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(itemSize, itemSize); + params.setMargins(margins, margins, margins, margins); + params.gravity = Gravity.LEFT; + viewBinding.addVideoView.setScaleType(ImageView.ScaleType.CENTER_CROP); + viewBinding.addVideoView.setLayoutParams(params); + //图片九宫格 imageAdapter = new NineGridImageAdapter(this); viewBinding.selectedGridViewView.setLayoutManager(new GridLayoutManager(this, 2)); diff --git a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java index d893931..a5b2ffa 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangePasswordActivity.java @@ -1,7 +1,10 @@ package com.casic.dcms.ui; +import android.text.Editable; import android.text.TextUtils; +import android.text.TextWatcher; import android.view.View; +import android.widget.EditText; import com.casic.dcms.base.AndroidxBaseActivity; import com.casic.dcms.bean.ActionResultBean; @@ -37,6 +40,52 @@ @Override protected void initData() { + EditText newPsdEditText = viewBinding.newPsdLayout.getEditText(); + assert newPsdEditText != null; + newPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.newPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.newPsdLayout.setError(null); + } + } + }); + + EditText confirmPsdEditText = viewBinding.confirmPsdLayout.getEditText(); + assert confirmPsdEditText != null; + confirmPsdEditText.addTextChangedListener(new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void onTextChanged(CharSequence charSequence, int i, int i1, int i2) { + + } + + @Override + public void afterTextChanged(Editable editable) { + if (editable.toString().trim().length() > 12) { + viewBinding.confirmPsdLayout.setError("密码长度超出限制"); + } else { + viewBinding.confirmPsdLayout.setError(null); + } + } + }); + changePasswordPresenter = new ChangePasswordPresenterImpl(this); } diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 5611110..fca0814 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,7 @@ android:layout_height="wrap_content" android:background="@color/mainThemeColor" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/activity_password.xml b/app/src/main/res/layout/activity_password.xml index 620ef81..c2efa94 100644 --- a/app/src/main/res/layout/activity_password.xml +++ b/app/src/main/res/layout/activity_password.xml @@ -1,5 +1,6 @@ @@ -8,82 +9,85 @@ android:id="@+id/titleBarLayout" layout="@layout/include_base_title" /> - + android:layout_height="match_parent" + android:orientation="vertical"> - + android:orientation="vertical" + android:padding="30dp"> - - - + - + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - + android:hint="请输入新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + - - - + - - + android:hint="请确认新密码" + android:imeOptions="actionDone" + android:inputType="textPassword" + android:paddingHorizontal="5dp" + android:singleLine="true" + android:textSize="@dimen/titleFontSize" + android:theme="@style/EditTextTheme" /> + + - + android:text="确认修改" /> + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_upload_case.xml b/app/src/main/res/layout/activity_upload_case.xml index 4a6f7dc..2538f75 100644 --- a/app/src/main/res/layout/activity_upload_case.xml +++ b/app/src/main/res/layout/activity_upload_case.xml @@ -257,9 +257,7 @@ android:id="@+id/addVideoView" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@drawable/bg_layout" - android:padding="@dimen/padding_10dp" - android:src="@drawable/ic_add_black" /> + android:src="@drawable/ic_add_pic" /> diff --git a/app/src/main/res/layout/include_case_base_layout.xml b/app/src/main/res/layout/include_case_base_layout.xml deleted file mode 100644 index 857a8aa..0000000 --- a/app/src/main/res/layout/include_case_base_layout.xml +++ /dev/null @@ -1,141 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml deleted file mode 100644 index 7780277..0000000 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_location.xml b/app/src/main/res/layout/include_case_location.xml deleted file mode 100644 index 6827cd5..0000000 --- a/app/src/main/res/layout/include_case_location.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml deleted file mode 100644 index a649ee0..0000000 --- a/app/src/main/res/layout/include_case_type.xml +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_dept_base_layout.xml b/app/src/main/res/layout/include_dept_base_layout.xml deleted file mode 100644 index 560bede..0000000 --- a/app/src/main/res/layout/include_dept_base_layout.xml +++ /dev/null @@ -1,191 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_option_title.xml b/app/src/main/res/layout/include_option_title.xml index 6141ca2..8f4a3f8 100644 --- a/app/src/main/res/layout/include_option_title.xml +++ b/app/src/main/res/layout/include_option_title.xml @@ -17,7 +17,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" android:gravity="center" - android:paddingVertical="15dp" + android:paddingVertical="@dimen/padding_10dp" android:text="@string/app_name" android:textColor="@color/white" android:textSize="@dimen/titleFontSize" /> diff --git a/app/src/main/res/layout/include_package_base.xml b/app/src/main/res/layout/include_package_base.xml deleted file mode 100644 index 238f64f..0000000 --- a/app/src/main/res/layout/include_package_base.xml +++ /dev/null @@ -1,134 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_top_bar.xml b/app/src/main/res/layout/include_top_bar.xml deleted file mode 100644 index 13de699..0000000 --- a/app/src/main/res/layout/include_top_bar.xml +++ /dev/null @@ -1,6 +0,0 @@ - - \ No newline at end of file