diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml index bf3d115..ca88ee9 100644 --- a/src/main/AndroidManifest.xml +++ b/src/main/AndroidManifest.xml @@ -16,12 +16,10 @@ --> - @@ -36,55 +34,113 @@ + - + + + + + + + + + + + + + + + + + + + + + + + - - + + - - - - + + - + + + + + + + + android:exported="false" + android:multiprocess="true"> + + @@ -139,13 +196,6 @@ android:theme="@android:style/Theme.Holo.Light" > - - - @@ -154,5 +204,8 @@ + diff --git a/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java b/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java new file mode 100644 index 0000000..6cbc61e --- /dev/null +++ b/src/main/java/net/micode/notes/ui/ChangedLoginPassword.java @@ -0,0 +1,68 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class ChangedLoginPassword extends Activity{ + EditText OldPassword; + EditText NewPassword; + EditText AckPassword; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_change_loginpassword); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + OldPassword=(EditText) findViewById(R.id.old_password); + NewPassword=(EditText) findViewById(R.id.new_password); + AckPassword=(EditText) findViewById(R.id.ack_password); + Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged); + Acknowledged.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String old_password = OldPassword.getText().toString(); + String new_password = NewPassword.getText().toString(); + String ack_password = AckPassword.getText().toString(); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String login_password=pref.getString("password",""); + if(old_password.equals("")==true || new_password.equals("")==true || ack_password.equals("")==true) { + Toast.makeText(ChangedLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (new_password.equals(ack_password) == false) { + Toast.makeText(ChangedLoginPassword.this, "新建密码与重复密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + AckPassword.setText(""); + }else if(old_password.equals(login_password) == false){ + Toast.makeText(ChangedLoginPassword.this, "原有密码错误，请重新输入密码", Toast.LENGTH_SHORT).show(); + OldPassword.setText(""); + } + else if (new_password.equals(ack_password) == true && old_password.equals(login_password) == true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", MODE_PRIVATE).edit(); + editor.putString("password",new_password); + editor.apply(); + Toast.makeText(ChangedLoginPassword.this, "修改密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(ChangedLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} diff --git a/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java b/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java new file mode 100644 index 0000000..025ebf3 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/DeleteLoginPassword.java @@ -0,0 +1,62 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; + +public class DeleteLoginPassword extends Activity{ + EditText password01; + Button Acknowledged; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_delete_loginpassword); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + password01=(EditText) findViewById(R.id.old_password); + Acknowledged=(Button)findViewById(R.id.Bt_Acknowledged); + Acknowledged.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = password01.getText().toString(); + if(text02.equals("")==true) + Toast.makeText(DeleteLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password = pref.getString("password",""); + if(password.equals("")==false&&password.equals(text02)==true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", + MODE_PRIVATE).edit(); + editor.putBoolean("user",false);//false表示已经设置登录密码 + editor.putString("password",""); + editor.apply(); + + Toast.makeText(DeleteLoginPassword.this, "已经删除登录密码", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + else{ + Toast.makeText(DeleteLoginPassword.this, "密码错误", Toast.LENGTH_SHORT).show(); + password01.setText("");//把密码框内输入过的错误密码清空 + } + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(DeleteLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } +} diff --git a/src/main/java/net/micode/notes/ui/LoginActivity.java b/src/main/java/net/micode/notes/ui/LoginActivity.java new file mode 100644 index 0000000..2a5ae88 --- /dev/null +++ b/src/main/java/net/micode/notes/ui/LoginActivity.java @@ -0,0 +1,57 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; +import net.micode.notes.R; + + +public class LoginActivity extends Activity { + + EditText lg_password; + Button lg_login; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + boolean User_boolean = pref.getBoolean("user",false);//获取用户是否设置了密码 + if(!User_boolean) //User_boolean = false时，（没有设置密码），直接跳转到便签主界面 + { + Intent intent=new Intent(LoginActivity.this, NotesListActivity.class); + startActivity(intent); + finish(); + } + + setContentView(R.layout.activity_login); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE + | WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE); + lg_password=(EditText) findViewById(R.id.lg_password); + lg_login=(Button)findViewById(R.id.login); + lg_login.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + SharedPreferences pref=getSharedPreferences("user management",MODE_PRIVATE); + String password=pref.getString("password",""); + if(password.equals("")==false&&password.equals(lg_password.getText().toString())==true){ + Intent intent=new Intent(LoginActivity.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + else{ + Toast.makeText(LoginActivity.this, "密码错误", Toast.LENGTH_SHORT).show(); + lg_password.setText("");//把密码框内输入过的错误密码清空 + } + } + } + ); + + } +} \ No newline at end of file diff --git a/src/main/java/net/micode/notes/ui/NoteEditActivity.java b/src/main/java/net/micode/notes/ui/NoteEditActivity.java index ebff64d..189ddce 100644 --- a/src/main/java/net/micode/notes/ui/NoteEditActivity.java +++ b/src/main/java/net/micode/notes/ui/NoteEditActivity.java @@ -32,10 +32,7 @@ import android.content.SharedPreferences; import android.database.Cursor; import android.graphics.Bitmap; import android.graphics.BitmapFactory; -import android.graphics.Matrix; import android.graphics.Paint; -import android.graphics.drawable.BitmapDrawable; -import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Build; import android.os.Bundle; @@ -58,7 +55,6 @@ import android.view.MotionEvent; import android.view.View; import android.view.View.OnClickListener; import android.view.WindowManager; -import android.widget.Button; import android.widget.CheckBox; import android.widget.CompoundButton; import android.widget.CompoundButton.OnCheckedChangeListener; @@ -436,7 +432,9 @@ public class NoteEditActivity extends Activity implements OnClickListener, return true; } + private void initResources() { + mHeadViewPanel = findViewById(R.id.note_title); mNoteHeaderHolder = new HeadViewHolder(); mNoteHeaderHolder.tvModified = (TextView) findViewById(R.id.tv_modified_date); @@ -468,6 +466,8 @@ public class NoteEditActivity extends Activity implements OnClickListener, mFontSizeId = ResourceParser.BG_DEFAULT_FONT_SIZE; } mEditTextList = (LinearLayout) findViewById(R.id.note_edit_list); + + } @Override @@ -581,6 +581,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { + case R.id.menu_new_note: createNewNote(); break; @@ -620,6 +621,7 @@ public class NoteEditActivity extends Activity implements OnClickListener, case R.id.menu_delete_remind: mWorkingNote.setAlertDate(0, false); break; + default: break; } diff --git a/src/main/java/net/micode/notes/ui/NotesListActivity.java b/src/main/java/net/micode/notes/ui/NotesListActivity.java index 00f8ec1..259affa 100644 --- a/src/main/java/net/micode/notes/ui/NotesListActivity.java +++ b/src/main/java/net/micode/notes/ui/NotesListActivity.java @@ -82,6 +82,7 @@ import java.util.HashSet; public class NotesListActivity extends Activity implements OnClickListener, OnItemLongClickListener { private int mode = - 1; + private int login_mode=0; private static final int FOLDER_NOTE_LIST_QUERY_TOKEN = 0; private static final int FOLDER_LIST_QUERY_TOKEN = 1; @@ -788,6 +789,10 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt else if(mode == 2){ menu.findItem(R.id.menu_sea).setVisible(false); } + else if(mode == 3){ + menu.findItem(R.id.menu_sweet).setVisible(false); + } + return true; } @@ -795,17 +800,17 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt @Override public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { - case R.id.menu_girl:{ + case R.id.menu_girl: { mode = 1; getWindow().setBackgroundDrawableResource(R.drawable.menu_girl); break; } - case R.id.menu_sea:{ + case R.id.menu_sea: { mode = 2; getWindow().setBackgroundDrawableResource(R.drawable.menu_sea); break; } - case R.id.menu_sweet:{ + case R.id.menu_sweet: { mode = 3; getWindow().setBackgroundDrawableResource(R.drawable.menu_sweet); break; @@ -854,12 +859,55 @@ public class NotesListActivity extends Activity implements OnClickListener, OnIt NotesListActivity.this.finish(); break; } + + case R.id.menu_login: { //设置登录密码功能 + if (login_mode == 0) { + set_login_password(); + login_mode = 1; + } + else if (login_mode == 1) + change_login_password(); + } + + case R.id.menu_change_login: + { + if(login_mode==1) + change_login_password(); + //已经设置密码 + else if(login_mode==0) + set_login_password(); + break; + } + case R.id.menu_delete_login: + { + delete_login_password(); + break; + } default: break; } return true; } + /////////////////////设置登录密码//////////////////////// + private void set_login_password() { + Intent intent=new Intent(NotesListActivity.this, RegisterLoginPassword.class); + startActivity(intent); + finish(); + } + ////////////////////更改密码//////////////// + private void change_login_password() { + Intent intent=new Intent(NotesListActivity.this,ChangedLoginPassword.class); + startActivity(intent); + finish(); + } + + ///////////////删除登录密码/////////////////// + private void delete_login_password() { + Intent intent=new Intent(NotesListActivity.this, DeleteLoginPassword.class); + startActivity(intent); + finish(); + } @Override public boolean onSearchRequested() { startSearch(null, false, null /* appData */, false); diff --git a/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java b/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java new file mode 100644 index 0000000..e233a8b --- /dev/null +++ b/src/main/java/net/micode/notes/ui/RegisterLoginPassword.java @@ -0,0 +1,64 @@ +package net.micode.notes.ui; + +import android.app.Activity; +import android.content.Intent; +import android.content.SharedPreferences; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.view.WindowManager; +import android.widget.Button; +import android.widget.EditText; +import android.widget.Toast; + +import net.micode.notes.R; +public class RegisterLoginPassword extends Activity { + EditText password01; + EditText password02; + Button registered; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_set_loginpassword); + getWindow().setSoftInputMode( + WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE + | WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE); + password01=(EditText) findViewById(R.id.rg_password01); + password02=(EditText) findViewById(R.id.rg_password02); + registered=(Button)findViewById(R.id.rg_registered); + registered.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + String text02 = password01.getText().toString(); + String text03 = password02.getText().toString(); + if(text02.equals("")==true) { + Toast.makeText(RegisterLoginPassword.this, "密码不能为空", Toast.LENGTH_SHORT).show(); + }else if (text02.equals(text03) == false) { + Toast.makeText(RegisterLoginPassword.this, "密码不匹配，请重新输入密码", Toast.LENGTH_SHORT).show(); + password02.setText(""); + }else if (text02.equals(text03) == true){ + SharedPreferences.Editor editor=getSharedPreferences("user management", + MODE_PRIVATE).edit(); + editor.putBoolean("user",true);//true表示已经设置登录密码 + editor.putString("password",text02); + editor.apply(); + Log.d("RegisterLoginPassword","password is "+text02); + Toast.makeText(RegisterLoginPassword.this, "设置密码成功", Toast.LENGTH_SHORT).show(); + Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + + } + }); + } + + @Override + public void onBackPressed() { + Intent intent=new Intent(RegisterLoginPassword.this,NotesListActivity.class); + startActivity(intent); + finish(); + } + +} \ No newline at end of file diff --git a/src/main/res/drawable-hdpi/.idea/.gitignore b/src/main/res/drawable-hdpi/.idea/.gitignore deleted file mode 100644 index 26d3352..0000000 --- a/src/main/res/drawable-hdpi/.idea/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml diff --git a/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml b/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml deleted file mode 100644 index d6ebd48..0000000 --- a/src/main/res/drawable-hdpi/.idea/drawable-hdpi.iml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable-hdpi/.idea/misc.xml b/src/main/res/drawable-hdpi/.idea/misc.xml deleted file mode 100644 index 639900d..0000000 --- a/src/main/res/drawable-hdpi/.idea/misc.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable-hdpi/.idea/modules.xml b/src/main/res/drawable-hdpi/.idea/modules.xml deleted file mode 100644 index 370b9c9..0000000 --- a/src/main/res/drawable-hdpi/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/res/drawable-hdpi/menu_lover.png b/src/main/res/drawable-hdpi/menu_lover.png deleted file mode 100644 index a0e8a2c..0000000 Binary files a/src/main/res/drawable-hdpi/menu_lover.png and /dev/null differ diff --git a/src/main/res/drawable-hdpi/menu_young.png b/src/main/res/drawable-hdpi/menu_young.png deleted file mode 100644 index 3ecaa3d..0000000 Binary files a/src/main/res/drawable-hdpi/menu_young.png and /dev/null differ diff --git a/src/main/res/layout/activity_change_loginpassword.xml b/src/main/res/layout/activity_change_loginpassword.xml new file mode 100644 index 0000000..b9e854f --- /dev/null +++ b/src/main/res/layout/activity_change_loginpassword.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + +