diff --git a/.idea/misc.xml b/.idea/misc.xml index 1d225cc..504d18c 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -10,7 +10,7 @@ diff --git a/app/build.gradle b/app/build.gradle index fd0f767..f792b54 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -26,6 +26,9 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + buildFeatures { + viewBinding true + } } dependencies { @@ -33,6 +36,8 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' implementation 'com.google.android.material:material:1.8.0' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' + implementation 'androidx.navigation:navigation-fragment:2.5.3' + implementation 'androidx.navigation:navigation-ui:2.5.3' testImplementation 'junit:junit:4.13.2' androidTestImplementation 'androidx.test.ext:junit:1.1.5' androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 338e00b..14a68f7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -11,6 +11,11 @@ android:supportsRtl="true" android:theme="@style/Theme.CpsAssist" tools:targetApi="31"> + diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/home/HomeActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/home/HomeActivity.java deleted file mode 100644 index ead86fb..0000000 --- a/app/src/main/java/xyz/r0r5chach/cpsAssist/home/HomeActivity.java +++ /dev/null @@ -1,4 +0,0 @@ -package xyz.r0r5chach.cpsAssist.home; - -public class HomeActivity { -} diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/OnClickListener.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java similarity index 94% rename from app/src/main/java/xyz/r0r5chach/cpsAssist/login/OnClickListener.java rename to app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java index 4910576..4cacca6 100644 --- a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/OnClickListener.java +++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/BtnOnClickListener.java @@ -1,6 +1,5 @@ package xyz.r0r5chach.cpsAssist.login; -import android.app.Activity; import android.content.Intent; import android.view.View; import android.widget.EditText; @@ -8,11 +7,12 @@ import android.widget.Toast; import xyz.r0r5chach.cpsAssist.ArrayTools; import xyz.r0r5chach.cpsAssist.notes.NotesActivity; + /** * This Class defines the definition of the OnCLickListener for the LoginActivity * @author r0r5chach */ -public class OnClickListener implements View.OnClickListener{ +public class BtnOnClickListener implements View.OnClickListener{ /** * This attribute stores the amount of attempts the user has currently taken */ @@ -34,7 +34,7 @@ public class OnClickListener implements View.OnClickListener{ * @param usernameField the View for the username field of the UI * @param passwordField the View for the password field of the UI */ - public OnClickListener(EditText usernameField, EditText passwordField, String users) { + public BtnOnClickListener(EditText usernameField, EditText passwordField, String users) { initUsers(users); this.currentAttempts = 0; this.usernameField = usernameField; @@ -56,7 +56,7 @@ public class OnClickListener implements View.OnClickListener{ Intent home = new Intent(view.getContext(), NotesActivity.class); home.putExtra("username", inputs[0]); view.getContext().startActivity(home); - ((Activity)view.getContext()).finish(); + ((android.app.Activity)view.getContext()).finish(); } else { currentAttempts += 1; diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/LoginActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/LoginActivity.java index be8fd37..2c69c31 100644 --- a/app/src/main/java/xyz/r0r5chach/cpsAssist/login/LoginActivity.java +++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/login/LoginActivity.java @@ -12,6 +12,6 @@ public class LoginActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_login); - findViewById(R.id.loginButton).setOnClickListener(new OnClickListener(findViewById(R.id.userNameField), findViewById(R.id.passwordField), getString(R.string.users))); + findViewById(R.id.loginButton).setOnClickListener(new BtnOnClickListener(findViewById(R.id.userNameField), findViewById(R.id.passwordField), getString(R.string.users))); } } \ No newline at end of file diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Adapter.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Adapter.java new file mode 100644 index 0000000..a50cbc2 --- /dev/null +++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/Adapter.java @@ -0,0 +1,55 @@ +package xyz.r0r5chach.cpsAssist.notes; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +import java.io.File; +import java.util.List; + +import xyz.r0r5chach.cpsAssist.R; + +public class Adapter extends RecyclerView.Adapter { + + private final List notes; + + public Adapter(List notes) { + this.notes = notes; + } + + @NonNull + @Override + public ViewHolder onCreateViewHolder(ViewGroup parent,int viewType) { + View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.notes_item, parent, false); + return new ViewHolder(v); + } + + @Override + public void onBindViewHolder(ViewHolder holder, int index) { + File note = notes.get(index); + holder.getFileName().setText(note.getName()); + } + + @Override + public int getItemCount() { + return 0; + } + + + public static class ViewHolder extends RecyclerView.ViewHolder { + private final TextView fileName; + public ViewHolder(View v) { + super(v); + fileName = v.findViewById(R.id.fileNameField); + } + + public TextView getFileName() { + return fileName; + } + } + +} diff --git a/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java new file mode 100644 index 0000000..842fa30 --- /dev/null +++ b/app/src/main/java/xyz/r0r5chach/cpsAssist/notes/NotesActivity.java @@ -0,0 +1,36 @@ +package xyz.r0r5chach.cpsAssist.notes; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; + +import android.os.Bundle; + +import java.io.File; +import java.util.Arrays; +import java.util.List; +import java.util.Objects; + +import xyz.r0r5chach.cpsAssist.R; + +public class NotesActivity extends AppCompatActivity { + private List notes; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_notes); + notes = getStoredNotes(); + initRecycler(); + } + + private void initRecycler() { + RecyclerView list =findViewById(R.id.notesList); + list.setAdapter(new Adapter(notes)); + list.setLayoutManager(new LinearLayoutManager(this)); + } + + private List getStoredNotes() { + return Arrays.asList(Objects.requireNonNull(getFilesDir().listFiles())); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_notes.xml b/app/src/main/res/layout/activity_notes.xml new file mode 100644 index 0000000..9b3135b --- /dev/null +++ b/app/src/main/res/layout/activity_notes.xml @@ -0,0 +1,23 @@ + + + +