notatki bez del/edit
This commit is contained in:
parent
e96f619e46
commit
44b13e4377
@ -62,7 +62,7 @@ public class Login extends AppCompatActivity {
|
||||
String email, hashedEmail, password;
|
||||
email = String.valueOf(editTextEmail.getText());
|
||||
|
||||
hashedEmail = hashEmail(email);
|
||||
hashedEmail = Utility.hashEmail(email);
|
||||
password = String.valueOf(editTextPassword.getText());
|
||||
|
||||
if (TextUtils.isEmpty(email)){
|
||||
@ -91,13 +91,6 @@ public class Login extends AppCompatActivity {
|
||||
return sharedPreferences.contains("user_" + hashedemail);
|
||||
}
|
||||
|
||||
private String hashEmail(String email){
|
||||
byte[] emailSalt = new byte[16];
|
||||
emailSalt = getFirst16BytesOfHash(email);
|
||||
|
||||
return hashCredential(email, emailSalt);
|
||||
}
|
||||
|
||||
private void login(String hashedemail, String password){
|
||||
SharedPreferences sharedPreferences = getSharedPreferences(SHARED_NAME_CREDENTIALS, MODE_PRIVATE);
|
||||
String passwordHashFromData = sharedPreferences.getString("user_" + hashedemail, "err");
|
||||
@ -105,7 +98,7 @@ public class Login extends AppCompatActivity {
|
||||
|
||||
byte[] salt = getSaltForUser(hashedemail);
|
||||
|
||||
String inputPasswordHash = hashCredential(password, salt);
|
||||
String inputPasswordHash = Utility.hashCredential(password, salt);
|
||||
|
||||
assert inputPasswordHash != null;
|
||||
|
||||
@ -129,43 +122,4 @@ public class Login extends AppCompatActivity {
|
||||
return Base64.getDecoder().decode(saltFromData);
|
||||
}
|
||||
|
||||
private static String hashCredential(String credential, byte[] salt){
|
||||
int iteratiions = 1000;
|
||||
int keyLen = 256;
|
||||
|
||||
KeySpec keySpec = new PBEKeySpec(credential.toCharArray(), salt, iteratiions, keyLen);
|
||||
try{
|
||||
SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
|
||||
SecretKey secretKey = secretKeyFactory.generateSecret(keySpec);
|
||||
byte[] hashedCredential = secretKey.getEncoded();
|
||||
return Base64.getEncoder().encodeToString(hashedCredential);
|
||||
|
||||
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private byte[] getFirst16BytesOfHash(String input){
|
||||
try {
|
||||
// Create MessageDigest instance for SHA-256
|
||||
MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||
|
||||
// Get the hash value by updating the digest with the input bytes
|
||||
byte[] hashBytes = digest.digest(input.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
// Truncate the hash to the first 16 bytes
|
||||
byte[] truncatedHash = new byte[16];
|
||||
System.arraycopy(hashBytes, 0, truncatedHash, 0, 16);
|
||||
|
||||
return truncatedHash;
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
// Handle the exception (e.g., print an error message)
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
@ -1,39 +1,39 @@
|
||||
package com.example.bsm_notatnik;
|
||||
import android.content.DialogInterface;
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.text.TextUtils;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.EditText;
|
||||
import android.widget.LinearLayout;
|
||||
import android.widget.TextView;
|
||||
import android.widget.Toast;
|
||||
|
||||
import androidx.appcompat.app.AlertDialog;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
import java.security.spec.KeySpec;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Base64;
|
||||
import java.util.List;
|
||||
import java.util.regex.Matcher;
|
||||
import java.util.regex.Pattern;
|
||||
|
||||
import javax.crypto.SecretKey;
|
||||
import javax.crypto.SecretKeyFactory;
|
||||
import javax.crypto.spec.PBEKeySpec;
|
||||
|
||||
|
||||
public class MainActivity extends AppCompatActivity {
|
||||
|
||||
Button buttonLogout, buttonChangePassword;
|
||||
|
||||
Button buttonLogout, buttonChangePassword, buttonAddNewNote;
|
||||
private static final String SHARED_NAME_CREDENTIALS = "Credentials";
|
||||
private static final String SHARED_NOTES_NAME = "Notes";
|
||||
|
||||
private static final String KEY_NOTE_COUNT = "NoteCount";
|
||||
|
||||
private static String HASHED_EMAIL = "";
|
||||
|
||||
private List<Note> noteList;
|
||||
private LinearLayout notesContainer;
|
||||
|
||||
|
||||
@Override
|
||||
@ -43,28 +43,38 @@ public class MainActivity extends AppCompatActivity {
|
||||
|
||||
Intent intent = getIntent();
|
||||
String current_username_hashed = intent.getStringExtra("CURRENT_USER_EMAIL_HASH");
|
||||
HASHED_EMAIL = current_username_hashed;
|
||||
|
||||
notesContainer = findViewById(R.id.notesContainer);
|
||||
noteList = new ArrayList<>();
|
||||
loadNotesFromPreferences();
|
||||
displayNotes();
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
buttonLogout = findViewById(R.id.btn_logout);
|
||||
buttonChangePassword = findViewById(R.id.btn_change_password);
|
||||
buttonAddNewNote = findViewById(R.id.btn_add_note);
|
||||
|
||||
|
||||
buttonLogout.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
logOut();
|
||||
}
|
||||
});
|
||||
buttonLogout.setOnClickListener(view -> logOut());
|
||||
|
||||
buttonChangePassword.setOnClickListener(view -> showPasswordChangeDialog(current_username_hashed));
|
||||
|
||||
buttonChangePassword.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View view) {
|
||||
showPasswordChangeDialog(current_username_hashed);
|
||||
}
|
||||
buttonAddNewNote.setOnClickListener(view -> {
|
||||
showAddNewNoteDialog();
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private void logOut(){
|
||||
Toast.makeText(getApplicationContext(), "Logout Successful!", Toast.LENGTH_SHORT).show();
|
||||
|
||||
@ -87,9 +97,7 @@ public class MainActivity extends AppCompatActivity {
|
||||
builder.setTitle("Change Password");
|
||||
|
||||
// Set up the positive (OK) button
|
||||
builder.setPositiveButton("Change", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
builder.setPositiveButton("Change", (dialogInterface, i) -> {
|
||||
// Handle password change logic here
|
||||
EditText editTextOldPassword = dialogView.findViewById(R.id.editTextOldPassword);
|
||||
EditText editTextNewPassword = dialogView.findViewById(R.id.editTextNewPassword);
|
||||
@ -120,24 +128,56 @@ public class MainActivity extends AppCompatActivity {
|
||||
Toast.makeText(MainActivity.this, "Password Changed", Toast.LENGTH_SHORT).show();
|
||||
} else {
|
||||
Toast.makeText(MainActivity.this, "New passwords don't match!", Toast.LENGTH_SHORT).show();
|
||||
return;
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Set up the negative (Cancel) button
|
||||
builder.setNegativeButton("Cancel", new DialogInterface.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(DialogInterface dialogInterface, int i) {
|
||||
dialogInterface.dismiss();
|
||||
}
|
||||
});
|
||||
builder.setNegativeButton("Cancel", (dialogInterface, i) -> dialogInterface.dismiss());
|
||||
|
||||
// Create and show the AlertDialog
|
||||
AlertDialog alertDialog = builder.create();
|
||||
alertDialog.show();
|
||||
}
|
||||
|
||||
private void showAddNewNoteDialog(){
|
||||
LayoutInflater inflater = getLayoutInflater();
|
||||
View dialogView = inflater.inflate(R.layout.create_note_dialog, null);
|
||||
AlertDialog.Builder builder = new AlertDialog.Builder(this);
|
||||
builder.setView(dialogView);
|
||||
builder.setTitle("Create new note");
|
||||
|
||||
builder.setPositiveButton("Save", (dialogInterface, i) -> {
|
||||
EditText noteTitleEditText = dialogView.findViewById(R.id.noteTitleEditText);
|
||||
EditText noteContentEditText = dialogView.findViewById(R.id.noteContentEditText);
|
||||
|
||||
String title = noteTitleEditText.getText().toString();
|
||||
String content = noteContentEditText.getText().toString();
|
||||
|
||||
if (!title.isEmpty() && !content.isEmpty()){
|
||||
Note note = new Note();
|
||||
note.setTitle(title);
|
||||
note.setContent(content);
|
||||
|
||||
noteList.add(note);
|
||||
|
||||
saveNotesToPreferences();
|
||||
createNoteView(note);
|
||||
}
|
||||
|
||||
Toast.makeText(MainActivity.this, "Note saved!", Toast.LENGTH_SHORT).show();
|
||||
});
|
||||
|
||||
builder.setNegativeButton("Cancel", (dialogInterface, i) -> dialogInterface.dismiss());
|
||||
|
||||
AlertDialog alertDialog = builder.create();
|
||||
alertDialog.show();
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
private boolean validatePassword(String password){
|
||||
final String PASSWORD_PATTERN = "^.{6,}$";
|
||||
@ -151,26 +191,22 @@ public class MainActivity extends AppCompatActivity {
|
||||
SharedPreferences sharedPreferences = getSharedPreferences(SHARED_NAME_CREDENTIALS, MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sharedPreferences.edit();
|
||||
|
||||
byte[] newSalt = generateSalt();
|
||||
byte[] newSalt = Utility.generateSalt();
|
||||
String newSaltString = Base64.getEncoder().encodeToString(newSalt);
|
||||
editor.putString("salt_" + hashedEmail, newSaltString);
|
||||
|
||||
String hashedNewPassword = hashCredential(newPassword, newSalt);
|
||||
String hashedNewPassword = Utility.hashCredential(newPassword, newSalt);
|
||||
editor.putString("user_" + hashedEmail, hashedNewPassword);
|
||||
editor.apply();
|
||||
}
|
||||
|
||||
private boolean validateOldPassword(String hashedEmail, String oldPassword){
|
||||
byte[] salt = getSaltForUser(hashedEmail);
|
||||
String hashedOldPassword = hashCredential(oldPassword, salt);
|
||||
String hashedOldPassword = Utility.hashCredential(oldPassword, salt);
|
||||
String hashedCorrectPassword = getPasswordFromShared(hashedEmail);
|
||||
|
||||
assert hashedOldPassword != null;
|
||||
if (hashedOldPassword.equals(hashedCorrectPassword)){
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
return hashedOldPassword.equals(hashedCorrectPassword);
|
||||
}
|
||||
|
||||
private byte[] getSaltForUser(String hashedEmail){
|
||||
@ -184,29 +220,78 @@ public class MainActivity extends AppCompatActivity {
|
||||
return sharedPreferences.getString("user_" + hashedEmail, "err");
|
||||
}
|
||||
|
||||
private static byte[] generateSalt(){
|
||||
SecureRandom random = new SecureRandom();
|
||||
byte[] salt = new byte[16];
|
||||
random.nextBytes(salt);
|
||||
return salt;
|
||||
}
|
||||
private void saveNote(){
|
||||
EditText noteTitleEditText = findViewById(R.id.noteTitleEditText);
|
||||
EditText noteContentEditText = findViewById(R.id.noteContentEditText);
|
||||
|
||||
private static String hashCredential(String credential, byte[] salt){
|
||||
int iteratiions = 1000;
|
||||
int keyLen = 256;
|
||||
String title = noteTitleEditText.getText().toString();
|
||||
String content = noteContentEditText.getText().toString();
|
||||
|
||||
KeySpec keySpec = new PBEKeySpec(credential.toCharArray(), salt, iteratiions, keyLen);
|
||||
try{
|
||||
SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
|
||||
SecretKey secretKey = secretKeyFactory.generateSecret(keySpec);
|
||||
byte[] hashedCredential = secretKey.getEncoded();
|
||||
return Base64.getEncoder().encodeToString(hashedCredential);
|
||||
if (!title.isEmpty() && !content.isEmpty()){
|
||||
Note note = new Note();
|
||||
note.setTitle(title);
|
||||
note.setContent(content);
|
||||
|
||||
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
noteList.add(note);
|
||||
saveNotesToPreferences();
|
||||
|
||||
//createNoteView(note);
|
||||
}
|
||||
}
|
||||
|
||||
private void saveNotesToPreferences(){
|
||||
SharedPreferences sharedPreferences = getSharedPreferences(SHARED_NOTES_NAME, MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sharedPreferences.edit();
|
||||
|
||||
editor.putInt("notecount_" + HASHED_EMAIL, noteList.size());
|
||||
for(int i=0; i<noteList.size(); i++){
|
||||
Note note = noteList.get(i);
|
||||
editor.putString(i + "_title_" + HASHED_EMAIL, note.getTitle());
|
||||
editor.putString(i + "_content_" + HASHED_EMAIL, note.getContent());
|
||||
}
|
||||
editor.apply();
|
||||
}
|
||||
|
||||
private void loadNotesFromPreferences(){
|
||||
SharedPreferences sharedPreferences = getSharedPreferences(SHARED_NOTES_NAME, MODE_PRIVATE);
|
||||
int noteCount = sharedPreferences.getInt("notecount_" + HASHED_EMAIL, 0);
|
||||
|
||||
for(int i=0; i<noteCount; i++){
|
||||
String title = sharedPreferences.getString(i + "_title_" + HASHED_EMAIL, "");
|
||||
String content = sharedPreferences.getString(i + "_content_" + HASHED_EMAIL, "");
|
||||
|
||||
Note note = new Note();
|
||||
note.setTitle(title);
|
||||
note.setContent(content);
|
||||
|
||||
noteList.add(note);
|
||||
}
|
||||
}
|
||||
|
||||
private void createNoteView(final Note note){
|
||||
View noteView = getLayoutInflater().inflate(R.layout.note_item, null);
|
||||
TextView noteTitleTextView = noteView.findViewById(R.id.noteTitleTextView);
|
||||
TextView noteContentTextView = noteView.findViewById(R.id.noteContentTextView);
|
||||
|
||||
noteTitleTextView.setText(note.getTitle());
|
||||
noteContentTextView.setText(note.getContent());
|
||||
|
||||
notesContainer.addView(noteView);
|
||||
|
||||
}
|
||||
|
||||
private void refreshNotesView(){
|
||||
notesContainer.removeAllViews();
|
||||
displayNotes();
|
||||
}
|
||||
|
||||
private void displayNotes(){
|
||||
for(Note note : noteList){
|
||||
createNoteView(note);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
|
31
app/src/main/java/com/example/bsm_notatnik/Note.java
Normal file
31
app/src/main/java/com/example/bsm_notatnik/Note.java
Normal file
@ -0,0 +1,31 @@
|
||||
package com.example.bsm_notatnik;
|
||||
|
||||
public class Note {
|
||||
private String title;
|
||||
private String content;
|
||||
|
||||
public Note(){
|
||||
|
||||
}
|
||||
|
||||
public Note(String title, String content){
|
||||
this.title = title;
|
||||
this.content = content;
|
||||
}
|
||||
|
||||
public String getTitle() {
|
||||
return title;
|
||||
}
|
||||
|
||||
public void setTitle(String title) {
|
||||
this.title = title;
|
||||
}
|
||||
|
||||
public String getContent() {
|
||||
return content;
|
||||
}
|
||||
|
||||
public void setContent(String content) {
|
||||
this.content = content;
|
||||
}
|
||||
}
|
@ -83,7 +83,7 @@ public class Register extends AppCompatActivity {
|
||||
return;
|
||||
}
|
||||
|
||||
hashedEmail = hashEmail(email);
|
||||
hashedEmail = Utility.hashEmail(email);
|
||||
|
||||
//checks if given username is already registered in database
|
||||
if (checkIfUserExists(hashedEmail)){
|
||||
@ -106,10 +106,10 @@ public class Register extends AppCompatActivity {
|
||||
|
||||
|
||||
|
||||
byte[] salt = generateSalt();
|
||||
byte[] salt = Utility.generateSalt();
|
||||
saveSaltForUser(hashedEmail, salt);
|
||||
|
||||
hashedPassword = hashCredential(password, salt);
|
||||
hashedPassword = Utility.hashCredential(password, salt);
|
||||
|
||||
saveNewUser(hashedEmail, hashedPassword);
|
||||
|
||||
@ -143,20 +143,6 @@ public class Register extends AppCompatActivity {
|
||||
return matcher.matches();
|
||||
}
|
||||
|
||||
private String hashEmail(String email){
|
||||
byte[] emailSalt;
|
||||
emailSalt = getFirst16BytesOfHash(email);
|
||||
|
||||
return hashCredential(email, emailSalt);
|
||||
}
|
||||
|
||||
private static byte[] generateSalt(){
|
||||
SecureRandom random = new SecureRandom();
|
||||
byte[] salt = new byte[16];
|
||||
random.nextBytes(salt);
|
||||
return salt;
|
||||
}
|
||||
|
||||
private void saveSaltForUser(String hashedemail, byte[] salt){
|
||||
SharedPreferences sharedPreferences = getSharedPreferences(SHARED_NAME_CREDENTIALS, MODE_PRIVATE);
|
||||
SharedPreferences.Editor editor = sharedPreferences.edit();
|
||||
@ -172,45 +158,4 @@ public class Register extends AppCompatActivity {
|
||||
editor.putString("user_" + hashedemail, password);
|
||||
editor.apply();
|
||||
}
|
||||
|
||||
|
||||
|
||||
private static String hashCredential(String credential, byte[] salt){
|
||||
int iteratiions = 1000;
|
||||
int keyLen = 256;
|
||||
|
||||
KeySpec keySpec = new PBEKeySpec(credential.toCharArray(), salt, iteratiions, keyLen);
|
||||
try{
|
||||
SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
|
||||
SecretKey secretKey = secretKeyFactory.generateSecret(keySpec);
|
||||
byte[] hashedCredential = secretKey.getEncoded();
|
||||
return Base64.getEncoder().encodeToString(hashedCredential);
|
||||
|
||||
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
private byte[] getFirst16BytesOfHash(String input){
|
||||
try {
|
||||
// Create MessageDigest instance for SHA-256
|
||||
MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||
|
||||
// Get the hash value by updating the digest with the input bytes
|
||||
byte[] hashBytes = digest.digest(input.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
// Truncate the hash to the first 16 bytes
|
||||
byte[] truncatedHash = new byte[16];
|
||||
System.arraycopy(hashBytes, 0, truncatedHash, 0, 16);
|
||||
|
||||
return truncatedHash;
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
// Handle the exception (e.g., print an error message)
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
66
app/src/main/java/com/example/bsm_notatnik/Utility.java
Normal file
66
app/src/main/java/com/example/bsm_notatnik/Utility.java
Normal file
@ -0,0 +1,66 @@
|
||||
package com.example.bsm_notatnik;
|
||||
|
||||
import java.nio.charset.StandardCharsets;
|
||||
import java.security.MessageDigest;
|
||||
import java.security.NoSuchAlgorithmException;
|
||||
import java.security.SecureRandom;
|
||||
import java.security.spec.InvalidKeySpecException;
|
||||
import java.security.spec.KeySpec;
|
||||
import java.util.Base64;
|
||||
|
||||
import javax.crypto.SecretKey;
|
||||
import javax.crypto.SecretKeyFactory;
|
||||
import javax.crypto.spec.PBEKeySpec;
|
||||
|
||||
public class Utility {
|
||||
|
||||
protected static byte[] generateSalt(){
|
||||
SecureRandom random = new SecureRandom();
|
||||
byte[] salt = new byte[16];
|
||||
random.nextBytes(salt);
|
||||
return salt;
|
||||
}
|
||||
|
||||
protected static String hashEmail(String email){
|
||||
byte[] emailSalt;
|
||||
emailSalt = getFirst16BytesOfHash(email);
|
||||
|
||||
return hashCredential(email, emailSalt);
|
||||
}
|
||||
protected static String hashCredential(String credential, byte[] salt){
|
||||
int iteratiions = 1000;
|
||||
int keyLen = 256;
|
||||
|
||||
KeySpec keySpec = new PBEKeySpec(credential.toCharArray(), salt, iteratiions, keyLen);
|
||||
try{
|
||||
SecretKeyFactory secretKeyFactory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256");
|
||||
SecretKey secretKey = secretKeyFactory.generateSecret(keySpec);
|
||||
byte[] hashedCredential = secretKey.getEncoded();
|
||||
return Base64.getEncoder().encodeToString(hashedCredential);
|
||||
|
||||
} catch (NoSuchAlgorithmException | InvalidKeySpecException e) {
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
protected static byte[] getFirst16BytesOfHash(String input){
|
||||
try {
|
||||
// Create MessageDigest instance for SHA-256
|
||||
MessageDigest digest = MessageDigest.getInstance("SHA-256");
|
||||
|
||||
// Get the hash value by updating the digest with the input bytes
|
||||
byte[] hashBytes = digest.digest(input.getBytes(StandardCharsets.UTF_8));
|
||||
|
||||
// Truncate the hash to the first 16 bytes
|
||||
byte[] truncatedHash = new byte[16];
|
||||
System.arraycopy(hashBytes, 0, truncatedHash, 0, 16);
|
||||
|
||||
return truncatedHash;
|
||||
} catch (NoSuchAlgorithmException e) {
|
||||
// Handle the exception (e.g., print an error message)
|
||||
e.printStackTrace();
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
@ -5,14 +5,14 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical"
|
||||
tools:context=".MainActivity">
|
||||
tools:context=".MainActivity"
|
||||
android:padding="10dp">
|
||||
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal"
|
||||
android:padding="5dp">
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/btn_logout"
|
||||
@ -20,7 +20,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/rectangular_button_background"
|
||||
android:text="Log Out" />
|
||||
|
||||
@ -30,7 +29,6 @@
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:layout_marginEnd="8dp"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/rectangular_button_background"
|
||||
android:text="Change Password" />
|
||||
|
||||
@ -39,11 +37,31 @@
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="1"
|
||||
android:padding="5dp"
|
||||
android:background="@drawable/rectangular_button_background"
|
||||
android:text="Add Note" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="18dp"
|
||||
android:layout_marginTop="15dp"
|
||||
android:text="Notes:"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<ScrollView
|
||||
android:id="@+id/notesScrollView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/notesContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"/>
|
||||
|
||||
</ScrollView>
|
||||
|
||||
|
||||
</LinearLayout>
|
23
app/src/main/res/layout/create_note_dialog.xml
Normal file
23
app/src/main/res/layout/create_note_dialog.xml
Normal file
@ -0,0 +1,23 @@
|
||||
<!-- password_change_dialog.xml -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="16dp">
|
||||
|
||||
<EditText
|
||||
android:id="@+id/noteTitleEditText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="Note Title"/>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/noteContentEditText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="Note Content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:inputType="textMultiLine"
|
||||
android:minLines="5"/>
|
||||
|
||||
</LinearLayout>
|
25
app/src/main/res/layout/note_item.xml
Normal file
25
app/src/main/res/layout/note_item.xml
Normal file
@ -0,0 +1,25 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:padding="8dp">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/noteTitleTextView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:textSize="18sp"
|
||||
android:textStyle="bold"
|
||||
android:text="Note Title"
|
||||
/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/noteContentTextView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="4dp"
|
||||
android:text="Note Content"
|
||||
/>
|
||||
|
||||
</LinearLayout>
|
@ -1,4 +1,4 @@
|
||||
<!-- password_change_dialog.xml -->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
Loading…
Reference in New Issue
Block a user