diff --git a/CloudKey/app/build.gradle b/CloudKey/app/build.gradle
index 99b987c..be1cceb 100644
--- a/CloudKey/app/build.gradle
+++ b/CloudKey/app/build.gradle
@@ -11,7 +11,7 @@ android {
minSdkVersion 16
targetSdkVersion 30
versionCode 1
- versionName "1.0.0"
+ versionName "1.0.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/AboutFragment.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/AboutFragment.java
index 4f8a696..4ef51de 100644
--- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/AboutFragment.java
+++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/AboutFragment.java
@@ -3,14 +3,20 @@ package com.thankvinci.CloudKey.Fragment;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.os.Bundle;
+import android.view.LayoutInflater;
import android.view.View;
+import android.widget.Button;
import android.widget.TextView;
+import android.widget.Toast;
import androidx.fragment.app.Fragment;
import com.thankvinci.CloudKey.R;
+import com.thankvinci.CloudKey.Utils.MyUtils;
public class AboutFragment extends Fragment {
+ private View view2;
+ private Button arthor,contact,thanks,checkVer;
public AboutFragment(){
super(R.layout.about_fragment);
@@ -20,6 +26,38 @@ public class AboutFragment extends Fragment {
super.onViewCreated(view,saveInstanceState);
TextView verText = view.findViewById(R.id.text_version);
verText.setText("v"+getAppInfo());
+ LayoutInflater inflater = requireActivity().getLayoutInflater();
+ //view2 = view.findViewById(R.id.)
+ arthor = view.findViewById(R.id.author);
+ arthor.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MyUtils.copyToClipboard(getActivity(),"https://gitee.com/thankvinci/android_final-project.git");
+ Toast.makeText(view.getContext(),"本项目地址已复制到剪贴板",Toast.LENGTH_SHORT).show();
+ }
+ });
+ contact = view.findViewById(R.id.contact);
+ contact.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ MyUtils.copyToClipboard(getActivity(),"thankvinci@163.com");
+ Toast.makeText(view.getContext(),"联系邮箱已复制到剪贴板",Toast.LENGTH_SHORT).show();
+ }
+ });
+ thanks = view.findViewById(R.id.thanks);
+ thanks.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(view.getContext(),"其实这是我哥",Toast.LENGTH_SHORT).show();
+ }
+ });
+ checkVer = view.findViewById(R.id.check_ver);
+ checkVer.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ Toast.makeText(view.getContext(),"🕊咕~~",Toast.LENGTH_SHORT).show();
+ }
+ });
}
//获取版本号
diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java
index 58ca882..39d77c7 100644
--- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java
+++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/FileManageFragment.java
@@ -83,7 +83,7 @@ public class FileManageFragment extends Fragment {
dir = Environment.getExternalStorageDirectory().getPath(); //获取根目录
}else{
dir = data.getString("dir");
- Toast.makeText(getActivity(),dir,Toast.LENGTH_SHORT).show();
+ //Toast.makeText(getActivity(),dir,Toast.LENGTH_SHORT).show();
}
path_edit.setText(dir);
path_edit.setSelection(dir.length());
diff --git a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java
index 8fec36d..4cbb26b 100644
--- a/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java
+++ b/CloudKey/app/src/main/java/com/thankvinci/CloudKey/Fragment/UnzipDialogFragment.java
@@ -128,7 +128,7 @@ public class UnzipDialogFragment extends DialogFragment {
public void onClick(View v) {
if((!("".equals(passwd_edit.getText().toString())))&&!(passwd_edit.getFocusable()==EditText.FOCUSABLE)){
MyUtils.copyToClipboard(getActivity(),passwd_edit.getText().toString());
- Toast.makeText(getActivity(),"已将密码复制到粘贴板",Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(),"已将密码复制到剪贴板",Toast.LENGTH_SHORT).show();
}
}
});
@@ -138,7 +138,7 @@ public class UnzipDialogFragment extends DialogFragment {
public void onClick(View v) {
if((!("".equals(md5_edit.getText().toString())))&&!(md5_edit.getFocusable()==EditText.FOCUSABLE)){
MyUtils.copyToClipboard(getActivity(),md5_edit.getText().toString());
- Toast.makeText(getActivity(),"已将MD5码复制到粘贴板",Toast.LENGTH_SHORT).show();
+ Toast.makeText(getActivity(),"已将MD5码复制到剪贴板",Toast.LENGTH_SHORT).show();
}
}
});
diff --git a/CloudKey/app/src/main/res/drawable/author_btn.xml b/CloudKey/app/src/main/res/drawable/author_btn.xml
new file mode 100644
index 0000000..449b266
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/author_btn.xml
@@ -0,0 +1,7 @@
+
+
+ -
+
+ -
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/between_btn.xml b/CloudKey/app/src/main/res/drawable/between_btn.xml
new file mode 100644
index 0000000..d8a4e73
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/between_btn.xml
@@ -0,0 +1,7 @@
+
+
+ -
+
+ -
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/check_btn.xml b/CloudKey/app/src/main/res/drawable/check_btn.xml
new file mode 100644
index 0000000..f970e6e
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/check_btn.xml
@@ -0,0 +1,7 @@
+
+
+ -
+
+ -
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner.xml b/CloudKey/app/src/main/res/drawable/shape_corner.xml
new file mode 100644
index 0000000..27cc449
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_down.xml b/CloudKey/app/src/main/res/drawable/shape_corner_down.xml
new file mode 100644
index 0000000..aa4b4b8
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_down.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_down_pressed.xml b/CloudKey/app/src/main/res/drawable/shape_corner_down_pressed.xml
new file mode 100644
index 0000000..59dcd74
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_down_pressed.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_normal.xml b/CloudKey/app/src/main/res/drawable/shape_corner_normal.xml
new file mode 100644
index 0000000..816e465
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_normal.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_normal_pressed.xml b/CloudKey/app/src/main/res/drawable/shape_corner_normal_pressed.xml
new file mode 100644
index 0000000..5fd9085
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_normal_pressed.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_up.xml b/CloudKey/app/src/main/res/drawable/shape_corner_up.xml
new file mode 100644
index 0000000..db4a216
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_up.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/drawable/shape_corner_up_pressed.xml b/CloudKey/app/src/main/res/drawable/shape_corner_up_pressed.xml
new file mode 100644
index 0000000..e76c621
--- /dev/null
+++ b/CloudKey/app/src/main/res/drawable/shape_corner_up_pressed.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/layout/about_author.xml b/CloudKey/app/src/main/res/layout/about_author.xml
new file mode 100644
index 0000000..9a9a1a3
--- /dev/null
+++ b/CloudKey/app/src/main/res/layout/about_author.xml
@@ -0,0 +1,42 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/layout/about_fragment.xml b/CloudKey/app/src/main/res/layout/about_fragment.xml
index 23e2e46..40b4157 100644
--- a/CloudKey/app/src/main/res/layout/about_fragment.xml
+++ b/CloudKey/app/src/main/res/layout/about_fragment.xml
@@ -14,7 +14,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
- android:layout_marginTop="50dp"/>
+ android:layout_marginTop="100dp"/>
+
+
+
+
+
+
\ No newline at end of file
diff --git a/CloudKey/app/src/main/res/values/style.xml b/CloudKey/app/src/main/res/values/style.xml
new file mode 100644
index 0000000..266a0cb
--- /dev/null
+++ b/CloudKey/app/src/main/res/values/style.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/开发历程.md b/开发历程.md
index 3e35c19..6e102e5 100644
--- a/开发历程.md
+++ b/开发历程.md
@@ -339,4 +339,12 @@ FileHandler负责将获取到的md5码发到NetThread,然后将得到的密码
添加一个查询密码专用的Dialog,用于给用户输入md5码手动查询密码
-界面上有三个TextView控件,一个是将密码复制到剪贴板,一个是清空EditView,一个是获取密码
\ No newline at end of file
+界面上有三个TextView控件,一个是将密码复制到剪贴板,一个是清空EditView,一个是获取密码
+
+**2021/6/13**
+
+添加关于界面的作者介绍,象征性地更新了一下软件版本号
+
+给界面写样式,实现圆角
+
+项目基本完成
\ No newline at end of file