refactored for home page; notes only show user notes
This commit is contained in:
parent
2df29e39d4
commit
7dc3759ceb
|
|
@ -13,8 +13,8 @@
|
||||||
<activity
|
<activity
|
||||||
android:name=".notes.NotesActivity"
|
android:name=".notes.NotesActivity"
|
||||||
android:exported="false"
|
android:exported="false"
|
||||||
android:label="@string/title_activity_notes"
|
android:label="@string/title_activity_notes"/>
|
||||||
android:theme="@style/Theme.CpsAssist.NoActionBar" />
|
<activity android:name=".main.MainActivity"/>
|
||||||
<activity
|
<activity
|
||||||
android:name=".login.LoginActivity"
|
android:name=".login.LoginActivity"
|
||||||
android:exported="true">
|
android:exported="true">
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
package xyz.r0r5chach.cpsAssist;
|
||||||
|
|
||||||
|
public enum BtnID {
|
||||||
|
ADD_BUTTON,
|
||||||
|
EDIT_BUTTON,
|
||||||
|
DELETE_BUTTON,
|
||||||
|
NOTES_BUTTON,
|
||||||
|
QUIZ_BUTTON
|
||||||
|
}
|
||||||
|
|
@ -7,6 +7,7 @@ import android.widget.EditText;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
import xyz.r0r5chach.cpsAssist.ArrayTools;
|
import xyz.r0r5chach.cpsAssist.ArrayTools;
|
||||||
|
import xyz.r0r5chach.cpsAssist.main.MainActivity;
|
||||||
import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
|
import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
|
||||||
/**
|
/**
|
||||||
* This Class defines the definition of the OnCLickListener for the LoginActivity
|
* This Class defines the definition of the OnCLickListener for the LoginActivity
|
||||||
|
|
@ -53,7 +54,7 @@ public class BtnOnClickListener implements View.OnClickListener{
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isUser(inputs)) {
|
if (isUser(inputs)) {
|
||||||
Intent home = new Intent(view.getContext(), NotesActivity.class);
|
Intent home = new Intent(view.getContext(), MainActivity.class);
|
||||||
home.putExtra("username", inputs[0]);
|
home.putExtra("username", inputs[0]);
|
||||||
view.getContext().startActivity(home);
|
view.getContext().startActivity(home);
|
||||||
Activity login = (Activity) view.getContext();
|
Activity login = (Activity) view.getContext();
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
package xyz.r0r5chach.cpsAssist.main;
|
||||||
|
|
||||||
|
import android.app.Activity;
|
||||||
|
import android.content.Intent;
|
||||||
|
import android.view.View;
|
||||||
|
|
||||||
|
import java.util.Locale;
|
||||||
|
|
||||||
|
import xyz.r0r5chach.cpsAssist.BtnID;
|
||||||
|
import xyz.r0r5chach.cpsAssist.quiz.QuizActivity;
|
||||||
|
import xyz.r0r5chach.cpsAssist.notes.NotesActivity;
|
||||||
|
|
||||||
|
public class BtnOnClickListener implements View.OnClickListener{
|
||||||
|
@Override
|
||||||
|
public void onClick(View v) {
|
||||||
|
String id = v.getResources().getResourceName(v.getId()).split("/")[1];
|
||||||
|
Intent intent = null;
|
||||||
|
switch(BtnID.valueOf(id.toUpperCase(Locale.ROOT))) {
|
||||||
|
case NOTES_BUTTON:
|
||||||
|
intent = new Intent(v.getContext(), NotesActivity.class);
|
||||||
|
break;
|
||||||
|
case QUIZ_BUTTON:
|
||||||
|
intent = new Intent(v.getContext(), QuizActivity.class);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
Activity main = (Activity) v.getContext();
|
||||||
|
if (intent != null) {
|
||||||
|
intent.putExtra("username", main.getIntent().getStringExtra("username"));
|
||||||
|
main.startActivity(intent);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,23 @@
|
||||||
|
package xyz.r0r5chach.cpsAssist.main;
|
||||||
|
|
||||||
|
import android.os.Bundle;
|
||||||
|
|
||||||
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
|
||||||
|
import xyz.r0r5chach.cpsAssist.R;
|
||||||
|
import xyz.r0r5chach.cpsAssist.main.BtnOnClickListener;
|
||||||
|
|
||||||
|
public class MainActivity extends AppCompatActivity {
|
||||||
|
@Override
|
||||||
|
protected void onCreate(Bundle savedInstanceState) {
|
||||||
|
super.onCreate(savedInstanceState);
|
||||||
|
setContentView(R.layout.activity_main);
|
||||||
|
setTitle("Home- " + getIntent().getStringExtra("username"));
|
||||||
|
findViewById(R.id.notes_button).setOnClickListener(new BtnOnClickListener());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onBackPressed() {
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,7 +0,0 @@
|
||||||
package xyz.r0r5chach.cpsAssist.notes;
|
|
||||||
|
|
||||||
public enum BtnID {
|
|
||||||
ADD_BUTTON,
|
|
||||||
EDIT_BUTTON,
|
|
||||||
DELETE_BUTTON
|
|
||||||
}
|
|
||||||
|
|
@ -9,12 +9,11 @@ import android.widget.TextView;
|
||||||
import android.widget.Toast;
|
import android.widget.Toast;
|
||||||
|
|
||||||
|
|
||||||
import org.w3c.dom.Text;
|
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
import java.util.Scanner;
|
import java.util.Scanner;
|
||||||
|
|
||||||
|
import xyz.r0r5chach.cpsAssist.BtnID;
|
||||||
import xyz.r0r5chach.cpsAssist.R;
|
import xyz.r0r5chach.cpsAssist.R;
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,11 @@ public class Notes {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void getStoredNotes() {
|
private void getStoredNotes() {
|
||||||
notes.addAll(Arrays.asList(Objects.requireNonNull(rootDir.listFiles())));
|
for (File note: Objects.requireNonNull(rootDir.listFiles())) {
|
||||||
|
if (note.getName().contains(username)) {
|
||||||
|
notes.add(note);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void createNote() {
|
public void createNote() {
|
||||||
|
|
|
||||||
|
|
@ -17,6 +17,7 @@ public class NotesActivity extends AppCompatActivity {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
setContentView(R.layout.activity_notes);
|
setContentView(R.layout.activity_notes);
|
||||||
initRecycler();
|
initRecycler();
|
||||||
|
setTitle("Notes- " + getIntent().getStringExtra("username"));
|
||||||
findViewById(R.id.add_Button).setOnClickListener(new BtnOnClickListener(adapter));
|
findViewById(R.id.add_Button).setOnClickListener(new BtnOnClickListener(adapter));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,4 @@
|
||||||
|
package xyz.r0r5chach.cpsAssist.quiz;
|
||||||
|
|
||||||
|
public class QuizActivity {
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,18 @@
|
||||||
|
<?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="match_parent"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/notes_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/note_edit_hint" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/quiz_button"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/quiz_button_text" />
|
||||||
|
</LinearLayout>
|
||||||
Loading…
Reference in New Issue