diff --git a/.gitignore b/.gitignore
index 56cc642..307ee93 100644
--- a/.gitignore
+++ b/.gitignore
@@ -83,3 +83,4 @@ lint/generated/
lint/outputs/
lint/tmp/
# lint/reports/
+.idea/.name
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..2370474 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index d338dfe..5d75aeb 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,5 +1,6 @@
plugins {
id 'com.android.application'
+ id 'kotlin-android'
}
android {
@@ -37,7 +38,12 @@ dependencies {
implementation 'androidx.navigation:navigation-ui:2.3.2'
implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.2.0'
implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
+ implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation 'org.naishadhparmar.zcustomcalendar:zcustomcalendar:1.0.1'
+ implementation 'com.github.Armen101:AudioRecordView:1.0.5'
+ implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
testImplementation 'junit:junit:4.+'
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 33ef7d1..2abbaff 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -9,15 +9,43 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Sentimo">
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644
index 0000000..5aa99e9
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/AudioPlayerActivity.java b/app/src/main/java/ca/uwaterloo/sentimo/AudioPlayerActivity.java
new file mode 100644
index 0000000..e06a11c
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/AudioPlayerActivity.java
@@ -0,0 +1,215 @@
+package ca.uwaterloo.sentimo;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.View;
+import android.widget.ImageButton;
+import android.widget.SeekBar;
+import android.widget.TextView;
+
+import java.io.File;
+import java.io.IOException;
+
+public class AudioPlayerActivity extends AppCompatActivity {
+
+ private TextView txtDescription, txtFilename, txtDate, txtSeekPos, txtSeekDur;
+ private ImageButton btnPlay, btnFor, btnRev;
+ private SeekBar seekBar;
+
+ private MediaPlayer mediaPlayer;
+ private Runnable updateSeekBar;
+ private Handler seekBarHandler = new Handler();
+
+ private static boolean isPlaying = false;
+ private File fileToPlay;
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_audio_player);
+ fileToPlay = (File) getIntent().getSerializableExtra("FILE_TO_PLAY");
+
+ txtDate = findViewById(R.id.player_moddate_txt);
+ txtDescription = findViewById(R.id.player_description_txt);
+ txtFilename = findViewById(R.id.player_filename_txt);
+ txtSeekDur = findViewById(R.id.player_duration_txt);
+ txtSeekPos = findViewById(R.id.player_position_txt);
+ btnPlay = findViewById(R.id.player_play_btn);
+ btnFor = findViewById(R.id.player_forward_btn);
+ btnRev = findViewById(R.id.player_reverse_btn);
+ seekBar = findViewById(R.id.player_seekbar);
+
+ playAudio();
+
+ btnPlay.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (isPlaying)
+ pauseAudio();
+ else
+ resumeAudio();
+ }
+ });
+
+ btnFor.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (!isPlaying)
+ resumeAudio();
+ int currentPos = mediaPlayer.getCurrentPosition();
+ int duration = mediaPlayer.getDuration();
+ if (currentPos + 5000 >= duration)
+ {
+ // go to end of audio file and pause.
+ txtSeekPos.setText(Utils.formatMilliSeccond(currentPos));
+ seekBar.setProgress(seekBar.getMax());
+ mediaPlayer.seekTo(duration);
+ pauseAudio();
+ } else {
+ // fast forward 5 secs.
+ currentPos = currentPos + 5000;
+ txtSeekPos.setText(Utils.formatMilliSeccond(currentPos));
+ mediaPlayer.seekTo(currentPos);
+ }
+ }
+ });
+
+ btnRev.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ if (!isPlaying)
+ resumeAudio();
+ int currentPos = mediaPlayer.getCurrentPosition();
+ int duration = mediaPlayer.getDuration();
+ if (currentPos - 5000 < 0)
+ {
+ // go to beginning of audio file
+ txtSeekPos.setText("0:00");
+ mediaPlayer.seekTo(0);
+ } else {
+ // rewind 5 secs.
+ currentPos = currentPos - 5000;
+ txtSeekPos.setText(Utils.formatMilliSeccond(currentPos));
+ mediaPlayer.seekTo(currentPos);
+ }
+ }
+ });
+
+ seekBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
+ @Override
+ public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) {
+ if (fromUser) {
+ mediaPlayer.seekTo(progress);
+ }
+ txtSeekPos.setText(Utils.formatMilliSeccond(mediaPlayer.getCurrentPosition()));
+ }
+
+ @Override
+ public void onStartTrackingTouch(SeekBar seekBar) {
+ pauseAudio();
+ }
+
+ @Override
+ public void onStopTrackingTouch(SeekBar seekBar) {
+ int progress = seekBar.getProgress();
+ mediaPlayer.seekTo(progress);
+ resumeAudio();
+ }
+ });
+
+ mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+ @Override
+ public void onCompletion(MediaPlayer mp) {
+ pauseAudio();
+ }
+ });
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ if (isPlaying)
+ stopAudio();
+ }
+
+ private void pauseAudio() {
+ mediaPlayer.pause();
+ btnPlay.setImageDrawable(getDrawable(R.drawable.ic_play_arrow_36dp));
+ isPlaying = false;
+ seekBarHandler.removeCallbacks(updateSeekBar);
+ }
+
+ private void resumeAudio() {
+ mediaPlayer.start();
+ btnPlay.setImageDrawable(getDrawable(R.drawable.ic_baseline_pause_36dp));
+ isPlaying = true;
+ updateRunnable();
+ seekBarHandler.postDelayed(updateSeekBar, 0);
+ }
+
+ private void stopAudio() {
+ //Stops The Audio Completely.
+ isPlaying = false;
+ mediaPlayer.pause();
+ mediaPlayer.stop();
+ mediaPlayer.release();
+ seekBarHandler.removeCallbacks(updateSeekBar);
+ }
+
+ private void playAudio() {
+ mediaPlayer = new MediaPlayer();
+ try {
+ mediaPlayer.setDataSource(fileToPlay.getAbsolutePath());
+ mediaPlayer.prepare();
+ mediaPlayer.start();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ btnPlay.setImageDrawable(getDrawable(R.drawable.ic_baseline_pause_36dp));
+ txtFilename.setText(fileToPlay.getName());
+ txtDate.setText(Utils.formatDateModified(fileToPlay.lastModified()));
+ //Play the audio
+ isPlaying = true;
+ mediaPlayer.setOnCompletionListener(new MediaPlayer.OnCompletionListener() {
+ @Override
+ public void onCompletion(MediaPlayer mp) {
+ pauseAudio();
+ }
+ });
+ // set seekbar max value
+ seekBar.setMax(mediaPlayer.getDuration());
+ // set audio duration
+ txtSeekDur.setText(Utils.formatMilliSeccond(mediaPlayer.getDuration()));
+
+ seekBarHandler = new Handler();
+ updateRunnable();
+ seekBarHandler.postDelayed(updateSeekBar, 0);
+ }
+
+ private void updateRunnable() {
+ updateSeekBar = new Runnable() {
+ @Override
+ public void run() {
+ seekBar.setProgress(mediaPlayer.getCurrentPosition());
+ seekBarHandler.postDelayed(this, 500);
+ }
+ };
+ }
+
+}
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/MainActivity.java b/app/src/main/java/ca/uwaterloo/sentimo/MainActivity.java
index da8f085..e8c429e 100644
--- a/app/src/main/java/ca/uwaterloo/sentimo/MainActivity.java
+++ b/app/src/main/java/ca/uwaterloo/sentimo/MainActivity.java
@@ -1,15 +1,19 @@
package ca.uwaterloo.sentimo;
+import android.content.Intent;
import android.os.Bundle;
-
-import com.google.android.material.bottomnavigation.BottomNavigationView;
+import android.view.View;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
import androidx.navigation.NavController;
import androidx.navigation.Navigation;
import androidx.navigation.ui.AppBarConfiguration;
import androidx.navigation.ui.NavigationUI;
+import com.google.android.material.bottomnavigation.BottomNavigationView;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+
public class MainActivity extends AppCompatActivity {
@Override
@@ -20,11 +24,21 @@ protected void onCreate(Bundle savedInstanceState) {
// Passing each menu ID as a set of Ids because each
// menu should be considered as top level destinations.
AppBarConfiguration appBarConfiguration = new AppBarConfiguration.Builder(
- R.id.navigation_home, R.id.navigation_dashboard, R.id.navigation_notifications)
+ R.id.navigation_recordingList, R.id.navigation_dashboard, R.id.navigation_calendar)
.build();
NavController navController = Navigation.findNavController(this, R.id.nav_host_fragment);
- NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_activity_main);
+ setSupportActionBar(toolbar);
NavigationUI.setupWithNavController(navView, navController);
+ // Not using toolbar to display titles/headings anymore
+ // NavigationUI.setupActionBarWithNavController(this, navController, appBarConfiguration);
+ FloatingActionButton fab = findViewById(R.id.fab_record);
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View view) {
+ startActivity(new Intent(MainActivity.this, RecordActivity.class));
+ }
+ });
}
}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/RecordActivity.java b/app/src/main/java/ca/uwaterloo/sentimo/RecordActivity.java
new file mode 100644
index 0000000..7763b0f
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/RecordActivity.java
@@ -0,0 +1,307 @@
+package ca.uwaterloo.sentimo;
+
+import android.Manifest;
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.drawable.Drawable;
+import android.media.MediaRecorder;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.os.SystemClock;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.widget.Button;
+import android.widget.Chronometer;
+import android.widget.EditText;
+import android.widget.ImageButton;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.visualizer.amplitude.AudioRecordView;
+
+import java.io.File;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+public class RecordActivity extends AppCompatActivity implements View.OnClickListener {
+
+ private final static int bitDepth = 16;
+ private final static int sampleRate = 44100;
+ private final static int bitRate = sampleRate * bitDepth;
+
+ // Requesting permission to RECORD_AUDIO
+ private boolean permissionToRecordAccepted = false;
+ private static final String LOG_TAG = "AudioRecordTest";
+ private static final int REQUEST_RECORD_AUDIO_PERMISSION = 200;
+ private String [] permissions = {Manifest.permission.RECORD_AUDIO};
+ private static String recordPath = null;
+ private static String oldFileName = null;
+ private static long startTime = 0L, time_MS = 0L;
+
+
+ private ImageButton btnRecord;
+ private TextView txtRecord;
+ private Chronometer txtTimer_hm;
+ private TextView txtTimer_ms;
+ private AudioRecordView arvVisualizer;
+ private MediaRecorder mRecorder = null;
+ private Handler customHandler = new Handler();
+ public static final int DELAY_BTN_AMIN_MILLIS = 500;
+
+ // animation drawables
+ private static Drawable anim1;
+ private static Drawable anim2;
+ private static Drawable anim3;
+
+ private boolean isRecording = false;
+
+ private Runnable updateTimerThread = new Runnable() {
+ @Override
+ public void run() {
+ time_MS = startTime + SystemClock.uptimeMillis();
+ int milliseconds = (int)(time_MS % 1000);
+ txtTimer_ms.setText(String.format("%03d", milliseconds));
+ customHandler.postDelayed(updateTimerThread, 10);
+ }
+ };
+
+ private Runnable updateVisualizerThread = new Runnable() {
+ @Override
+ public void run() {
+ int currentMaxAmplitude = mRecorder.getMaxAmplitude();
+ arvVisualizer.update(currentMaxAmplitude);
+ customHandler.postDelayed(updateVisualizerThread, 25);
+ }
+ };
+
+ private Runnable updateAnimationThread = new Runnable() {
+ @Override
+ public void run() {
+ if (btnRecord.getDrawable() == anim1) {
+ btnRecord.setImageDrawable(anim2);
+ }
+ else if (btnRecord.getDrawable() == anim2) {
+ btnRecord.setImageDrawable(anim3);
+ } else {
+ btnRecord.setImageDrawable(anim1);
+ }
+ customHandler.postDelayed(updateAnimationThread, DELAY_BTN_AMIN_MILLIS);
+ }
+ };
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_record);
+
+ Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_activity_record);
+ setSupportActionBar(toolbar);
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+ getSupportActionBar().setDisplayShowHomeEnabled(true);
+
+ btnRecord = findViewById(R.id.btn_record);
+ btnRecord.setImageDrawable(getDrawable(R.drawable.record_icon_off));
+ btnRecord.setOnClickListener(this);
+
+ txtRecord = findViewById(R.id.txt_record);
+
+ txtTimer_hm = findViewById(R.id.txt_timer_hm);
+ txtTimer_ms = findViewById(R.id.txt_timer_ms);
+
+ arvVisualizer = findViewById(R.id.audioRecordView);
+
+ anim1 = getDrawable(R.drawable.record_icon_on_1);
+ anim2 = getDrawable(R.drawable.record_icon_on_2);
+ anim3 = getDrawable(R.drawable.record_icon_on_3);
+ }
+
+ @Nullable
+ @Override
+ public View onCreateView(@NonNull String name, @NonNull Context context, @NonNull AttributeSet attrs) {
+ return super.onCreateView(name, context, attrs);
+ }
+
+ @Override
+ public void onClick(View v) {
+ if(isRecording)
+ {
+ isRecording = false;
+ stopRecording(true);
+ btnRecord.setImageDrawable(getDrawable(R.drawable.record_icon_off));
+ txtRecord.setText(R.string.stop_record);
+ }
+ else
+ {
+ if (checkPermissions())
+ {
+ isRecording = true;
+ startRecording();
+ btnRecord.setImageDrawable(getDrawable(R.drawable.record_icon_on_1));
+ txtRecord.setText(R.string.start_record);
+ }
+ }
+ }
+
+ @Override
+ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+ startActivity(new Intent(RecordActivity.this, MainActivity.class));
+ return true;
+ }
+
+ @Override
+ protected void onStop() {
+ super.onStop();
+ if (mRecorder != null) {
+ stopRecording(false);
+ }
+ }
+
+ @Override
+ public void onBackPressed() {
+ super.onBackPressed();
+ if (mRecorder != null) {
+ stopRecording(false);
+ }
+ }
+
+ @Override
+ public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+ switch (requestCode) {
+ case REQUEST_RECORD_AUDIO_PERMISSION:
+ permissionToRecordAccepted = grantResults[0] == PackageManager.PERMISSION_GRANTED;
+ break;
+ }
+ if (!permissionToRecordAccepted) finish();
+ }
+
+ private boolean checkPermissions() {
+ if ((ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED))
+ return true;
+ ActivityCompat.requestPermissions(this, permissions, REQUEST_RECORD_AUDIO_PERMISSION);
+ return (ContextCompat.checkSelfPermission(getApplicationContext(),
+ Manifest.permission.RECORD_AUDIO) == PackageManager.PERMISSION_GRANTED);
+ }
+
+ private void startRecording() {
+ recordPath = getExternalFilesDir("/").getAbsolutePath();
+ SimpleDateFormat formatter = new SimpleDateFormat("yyyy_MM_dd_hh_mm_ss");
+ oldFileName = "Recording_" + formatter.format(new Date()) + ".mp3";
+ recordPath += "/" + oldFileName;
+
+ mRecorder = new MediaRecorder();
+ mRecorder.setAudioSource(MediaRecorder.AudioSource.VOICE_RECOGNITION);
+ mRecorder.setOutputFormat(MediaRecorder.OutputFormat.MPEG_4);
+ mRecorder.setAudioEncoder(MediaRecorder.AudioEncoder.AAC);
+ mRecorder.setAudioEncodingBitRate(bitRate);
+ mRecorder.setAudioSamplingRate(sampleRate);
+ mRecorder.setOutputFile(recordPath);
+
+ try {
+ mRecorder.prepare();
+ } catch (IOException e) {
+ Log.e(LOG_TAG, "prepare() failed");
+ }
+
+ mRecorder.start();
+ txtTimer_hm.setBase(SystemClock.elapsedRealtime());
+ txtTimer_hm.start();
+ startTime = System.currentTimeMillis();
+ arvVisualizer.clearAnimation();
+ customHandler.postDelayed(updateTimerThread, 0);
+ customHandler.postDelayed(updateVisualizerThread, 0);
+ customHandler.postDelayed(updateAnimationThread, DELAY_BTN_AMIN_MILLIS);
+ }
+
+ private void stopRecording(boolean save) {
+ customHandler.removeCallbacks(updateTimerThread);
+ customHandler.removeCallbacks(updateVisualizerThread);
+ customHandler.removeCallbacks(updateAnimationThread);
+ mRecorder.stop();
+ txtTimer_hm.stop();
+ mRecorder.release();
+ if (save)
+ saveRecording();
+ else
+ {
+ //Save file as default if user leaves app before saving.
+ Toast.makeText(RecordActivity.this, "Recording saved as " + oldFileName, Toast.LENGTH_LONG).show();
+ }
+ mRecorder = null;
+ }
+
+ private void saveRecording() {
+ LayoutInflater li = LayoutInflater.from(this);
+ View promptsView = li.inflate(R.layout.dialogue_save, null);
+
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(this);
+
+ // set prompts.xml to alertdialog builder
+ alertDialogBuilder.setView(promptsView);
+
+ final EditText userInput = (EditText) promptsView.findViewById(R.id.editTextDialogUserInput);
+ userInput.setText(oldFileName);
+ userInput.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ userInput.selectAll();
+ }
+ });
+ Button cancel = promptsView.findViewById(R.id.save_cancel);
+ Button ok = promptsView.findViewById(R.id.save_ok);
+ Activity mActivity = this;
+
+ // set dialog message
+ alertDialogBuilder.setCancelable(false);
+
+ // create alert dialog
+ final AlertDialog alertDialog = alertDialogBuilder.create();
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ File oldFile = new File(getExternalFilesDir("/").getAbsolutePath(), oldFileName);
+ oldFile.delete();
+ Toast.makeText(RecordActivity.this, "Recording discarded", Toast.LENGTH_LONG).show();
+ alertDialog.dismiss();
+ }
+ });
+ ok.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String newFileName = userInput.getText().toString();
+ if (!newFileName.contains(".mp3"))
+ newFileName += ".mp3";
+ if (newFileName != null && newFileName.trim().length() > 0) {
+ File newFile = new File(getExternalFilesDir("/").getAbsolutePath(), newFileName);
+ File oldFile = new File(getExternalFilesDir("/").getAbsolutePath(), oldFileName);
+ oldFile.renameTo(newFile);
+ Toast.makeText(RecordActivity.this, "Recording Saved", Toast.LENGTH_LONG).show();
+ alertDialog.dismiss();
+
+ // open audio player activity after save
+ Intent intent = new Intent(mActivity, AudioPlayerActivity.class);
+ intent.putExtra("FILE_TO_PLAY", newFile);
+ startActivity(intent);
+ }
+ }
+ });
+ // show it
+ alertDialog.show();
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/SplashScreenActivity.java b/app/src/main/java/ca/uwaterloo/sentimo/SplashScreenActivity.java
new file mode 100644
index 0000000..914fc17
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/SplashScreenActivity.java
@@ -0,0 +1,16 @@
+package ca.uwaterloo.sentimo;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+
+public class SplashScreenActivity extends AppCompatActivity {
+ @Override
+ protected void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ startActivity(new Intent(SplashScreenActivity.this, MainActivity.class));
+ finish();
+ }
+}
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/Utils.java b/app/src/main/java/ca/uwaterloo/sentimo/Utils.java
new file mode 100644
index 0000000..f030bf2
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/Utils.java
@@ -0,0 +1,87 @@
+package ca.uwaterloo.sentimo;
+
+import android.media.MediaMetadataRetriever;
+
+import java.io.File;
+import java.util.Date;
+import java.util.concurrent.TimeUnit;
+
+public class Utils {
+
+ /**
+ * Function to convert milliseconds time to
+ * Timer Format
+ * Hours:Minutes:Seconds
+ */
+ public static String formatMilliSeccond(long milliseconds) {
+ String finalTimerString = "";
+ String secondsString = "";
+
+ // Convert total duration into time
+ int hours = (int) (milliseconds / (1000 * 60 * 60));
+ int minutes = (int) (milliseconds % (1000 * 60 * 60)) / (1000 * 60);
+ int seconds = (int) ((milliseconds % (1000 * 60 * 60)) % (1000 * 60) / 1000);
+
+ // Add hours if there
+ if (hours > 0) {
+ finalTimerString = hours + ":";
+ }
+
+ // Prepending 0 to seconds if it is one digit
+ if (seconds < 10) {
+ secondsString = "0" + seconds;
+ } else {
+ secondsString = "" + seconds;
+ }
+
+ finalTimerString = finalTimerString + minutes + ":" + secondsString;
+
+ // return String.format("%02d Min, %02d Sec",
+ // TimeUnit.MILLISECONDS.toMinutes(milliseconds),
+ // TimeUnit.MILLISECONDS.toSeconds(milliseconds) -
+ // TimeUnit.MINUTES.toSeconds(TimeUnit.MILLISECONDS.toMinutes(milliseconds)));
+
+ // return timer string
+ return finalTimerString;
+ }
+
+ public static String formatDateModified(long lastModified) {
+ Date lastModDate = new Date(lastModified);
+ String[] date = lastModDate.toString().split(" ");
+ return date[2] + " " + date[1] + " " + date[5];
+ }
+
+ public static String getTimeAgo(long lastModified) {
+ Date now = new Date();
+
+ long seconds = TimeUnit.MILLISECONDS.toSeconds(now.getTime() - lastModified);
+ long minutes = TimeUnit.MILLISECONDS.toMinutes(now.getTime() - lastModified);
+ long hours = TimeUnit.MILLISECONDS.toHours(now.getTime() - lastModified);
+ long days = TimeUnit.MILLISECONDS.toDays(now.getTime() - lastModified);
+
+ if(seconds < 60){
+ return "just now";
+ } else if (minutes == 1) {
+ return "a minute ago";
+ } else if (minutes > 1 && minutes < 60) {
+ return minutes + " minutes ago";
+ } else if (hours == 1) {
+ return "an hour ago";
+ } else if (hours > 1 && hours < 24) {
+ return hours + " hours ago";
+ } else if (days == 1) {
+ return "a day ago";
+ } else if (days <= 5) {
+ return days + " days ago";
+ } else {
+ return formatDateModified(lastModified);
+ }
+ }
+
+ public static String getDuration(File file) {
+ MediaMetadataRetriever mmr = new MediaMetadataRetriever();
+ mmr.setDataSource(file.getAbsolutePath());
+ String durationStr = mmr.extractMetadata(MediaMetadataRetriever.METADATA_KEY_DURATION);
+ return Utils.formatMilliSeccond(Long.parseLong(durationStr));
+ }
+}
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/onboarding/LoadingFragment.kt b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/LoadingFragment.kt
new file mode 100644
index 0000000..374574f
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/LoadingFragment.kt
@@ -0,0 +1,21 @@
+package ca.uwaterloo.sentimo.onboarding
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ca.uwaterloo.sentimo.R
+
+class LoadingFragment : Fragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_welcome, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding1Fragment.kt b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding1Fragment.kt
new file mode 100644
index 0000000..7c2e69f
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding1Fragment.kt
@@ -0,0 +1,21 @@
+package ca.uwaterloo.sentimo.onboarding
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ca.uwaterloo.sentimo.R
+
+class Onboarding1Fragment : Fragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding1, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding2Fragment.kt b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding2Fragment.kt
new file mode 100644
index 0000000..5bcd9c1
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding2Fragment.kt
@@ -0,0 +1,21 @@
+package ca.uwaterloo.sentimo.onboarding
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ca.uwaterloo.sentimo.R
+
+class Onboarding2Fragment : Fragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding2, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding3Fragment.kt b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding3Fragment.kt
new file mode 100644
index 0000000..f7bd5f9
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/Onboarding3Fragment.kt
@@ -0,0 +1,21 @@
+package ca.uwaterloo.sentimo.onboarding
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ca.uwaterloo.sentimo.R
+
+class Onboarding3Fragment : Fragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_onboarding3, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/onboarding/WelcomeFragment.kt b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/WelcomeFragment.kt
new file mode 100644
index 0000000..09054a5
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/onboarding/WelcomeFragment.kt
@@ -0,0 +1,21 @@
+package ca.uwaterloo.sentimo.onboarding
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import ca.uwaterloo.sentimo.R
+
+class WelcomeFragment : Fragment() {
+
+ override fun onCreate(savedInstanceState: Bundle?) {
+ super.onCreate(savedInstanceState)
+ }
+
+ override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+ savedInstanceState: Bundle?): View? {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_welcome, container, false)
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/calendar/CalendarFragment.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/calendar/CalendarFragment.java
new file mode 100644
index 0000000..888595e
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/ui/calendar/CalendarFragment.java
@@ -0,0 +1,130 @@
+package ca.uwaterloo.sentimo.ui.calendar;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+
+import org.naishadhparmar.zcustomcalendar.CustomCalendar;
+import org.naishadhparmar.zcustomcalendar.OnDateSelectedListener;
+import org.naishadhparmar.zcustomcalendar.OnNavigationButtonClickedListener;
+import org.naishadhparmar.zcustomcalendar.Property;
+
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+
+import ca.uwaterloo.sentimo.R;
+
+public class CalendarFragment extends Fragment implements OnNavigationButtonClickedListener {
+
+ CustomCalendar customCalendar;
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+
+ //Assign variable
+ customCalendar = view.findViewById(R.id.custom_calendar);
+
+ //Initialize description hash map
+ HashMap descHashMap = new HashMap<>();
+ //Initialize default property
+ Property defaultProperty = new Property();
+ //Initialize default resource
+ defaultProperty.layoutResource = R.layout.default_view;
+ //Initialize and assign variable
+ defaultProperty.dateTextViewResource = R.id.text_view_default;
+ //Put object and property
+ descHashMap.put("default", defaultProperty);
+
+ //For current date
+ Property currentProperty = new Property();
+ currentProperty.layoutResource = R.layout.current_view;
+ currentProperty.dateTextViewResource = R.id.text_view_current;
+ descHashMap.put("current", currentProperty);
+
+ //For Present date
+ Property presentProperty = new Property();
+ presentProperty.layoutResource = R.layout.present_view;
+ presentProperty.dateTextViewResource = R.id.text_view_present;
+ descHashMap.put("present", presentProperty);
+
+ //For absent
+ Property absentProperty = new Property();
+ absentProperty.layoutResource = R.layout.absent_view;
+ absentProperty.dateTextViewResource = R.id.text_view_absent;
+ descHashMap.put("absent", absentProperty);
+
+ //Set desc hash map on custom calendar
+ customCalendar.setMapDescToProp(descHashMap);
+
+ //Initialize date hash map
+ HashMap dateHashMap = new HashMap<>();
+ //Initialize calendar
+ Calendar calendar = Calendar.getInstance();
+ //Put values
+ dateHashMap.put(calendar.get(Calendar.DAY_OF_MONTH), "current");
+ dateHashMap.put(1, "present");
+ dateHashMap.put(2, "absent");
+ dateHashMap.put(3, "present");
+ dateHashMap.put(4, "absent");
+ dateHashMap.put(20, "present");
+ dateHashMap.put(30, "absent");
+ //Set date
+ customCalendar.setDate(calendar, dateHashMap);
+
+ customCalendar.setOnDateSelectedListener(new OnDateSelectedListener() {
+ @Override
+ public void onDateSelected(View view, Calendar selectedDate, Object desc) {
+ //Get string date
+ String sDate = selectedDate.get(Calendar.DAY_OF_MONTH)
+ + "/" + (selectedDate.get(Calendar.MONTH) + 1 )
+ + "/" + selectedDate.get(Calendar.YEAR);
+ //Display date in toast
+ Toast.makeText(getActivity().getApplicationContext()
+ , sDate, Toast.LENGTH_SHORT).show();
+ }
+ });
+
+ customCalendar.setOnNavigationButtonClickedListener(CustomCalendar.PREVIOUS, this);
+ customCalendar.setOnNavigationButtonClickedListener(CustomCalendar.NEXT, this);
+
+ }
+
+ public View onCreateView(@NonNull LayoutInflater inflater,
+ ViewGroup container, Bundle savedInstanceState) {
+
+ View root = inflater.inflate(R.layout.fragment_calendar, container, false);
+
+ return root;
+
+ }
+
+ @Override
+ public Map[] onNavigationButtonClicked(int whichButton, Calendar newMonth) {
+ Map[] arr = new Map[2];
+ switch(newMonth.get(Calendar.MONTH)) {
+ case Calendar.AUGUST:
+ arr[0] = new HashMap<>(); //This is the map linking a date to its description
+ arr[0].put(3, "unavailable");
+ arr[0].put(6, "holiday");
+ arr[0].put(21, "unavailable");
+ arr[0].put(24, "holiday");
+ arr[1] = null; //Optional: This is the map linking a date to its tag.
+ break;
+ case Calendar.JUNE:
+ arr[0] = new HashMap<>();
+ arr[0].put(5, "unavailable");
+ arr[0].put(10, "holiday");
+ arr[0].put(19, "holiday");
+ break;
+ }
+ return arr;
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeFragment.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeFragment.java
deleted file mode 100644
index 09f3939..0000000
--- a/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeFragment.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package ca.uwaterloo.sentimo.ui.home;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-
-import ca.uwaterloo.sentimo.R;
-
-public class HomeFragment extends Fragment {
-
- private HomeViewModel homeViewModel;
-
- public View onCreateView(@NonNull LayoutInflater inflater,
- ViewGroup container, Bundle savedInstanceState) {
- homeViewModel =
- new ViewModelProvider(this).get(HomeViewModel.class);
- View root = inflater.inflate(R.layout.fragment_home, container, false);
- final TextView textView = root.findViewById(R.id.text_home);
- homeViewModel.getText().observe(getViewLifecycleOwner(), new Observer() {
- @Override
- public void onChanged(@Nullable String s) {
- textView.setText(s);
- }
- });
- return root;
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeViewModel.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeViewModel.java
deleted file mode 100644
index cca0567..0000000
--- a/app/src/main/java/ca/uwaterloo/sentimo/ui/home/HomeViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ca.uwaterloo.sentimo.ui.home;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class HomeViewModel extends ViewModel {
-
- private MutableLiveData mText;
-
- public HomeViewModel() {
- mText = new MutableLiveData<>();
- mText.setValue("This is home fragment");
- }
-
- public LiveData getText() {
- return mText;
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsFragment.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsFragment.java
deleted file mode 100644
index 64fae1c..0000000
--- a/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsFragment.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package ca.uwaterloo.sentimo.ui.notifications;
-
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.TextView;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
-import androidx.lifecycle.Observer;
-import androidx.lifecycle.ViewModelProvider;
-
-import ca.uwaterloo.sentimo.R;
-
-public class NotificationsFragment extends Fragment {
-
- private NotificationsViewModel notificationsViewModel;
-
- public View onCreateView(@NonNull LayoutInflater inflater,
- ViewGroup container, Bundle savedInstanceState) {
- notificationsViewModel =
- new ViewModelProvider(this).get(NotificationsViewModel.class);
- View root = inflater.inflate(R.layout.fragment_notifications, container, false);
- final TextView textView = root.findViewById(R.id.text_notifications);
- notificationsViewModel.getText().observe(getViewLifecycleOwner(), new Observer() {
- @Override
- public void onChanged(@Nullable String s) {
- textView.setText(s);
- }
- });
- return root;
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsViewModel.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsViewModel.java
deleted file mode 100644
index d829f48..0000000
--- a/app/src/main/java/ca/uwaterloo/sentimo/ui/notifications/NotificationsViewModel.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package ca.uwaterloo.sentimo.ui.notifications;
-
-import androidx.lifecycle.LiveData;
-import androidx.lifecycle.MutableLiveData;
-import androidx.lifecycle.ViewModel;
-
-public class NotificationsViewModel extends ViewModel {
-
- private MutableLiveData mText;
-
- public NotificationsViewModel() {
- mText = new MutableLiveData<>();
- mText.setValue("This is notifications fragment");
- }
-
- public LiveData getText() {
- return mText;
- }
-}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListAdapter.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListAdapter.java
new file mode 100644
index 0000000..6a14155
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListAdapter.java
@@ -0,0 +1,252 @@
+package ca.uwaterloo.sentimo.ui.recordingList;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.net.Uri;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.content.FileProvider;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.RecyclerView;
+
+import org.w3c.dom.Text;
+
+import java.io.File;
+import java.util.List;
+
+import ca.uwaterloo.sentimo.AudioPlayerActivity;
+import ca.uwaterloo.sentimo.R;
+import ca.uwaterloo.sentimo.RecordActivity;
+
+public class AudioListAdapter extends RecyclerView.Adapter {
+
+ private List recordingList;
+ private Context context;
+ private Fragment fragment;
+
+ public AudioListAdapter(List recordingList, Fragment fragment) {
+ this.recordingList = recordingList;
+ this.fragment = fragment;
+ }
+
+ @NonNull
+ @Override
+ public AudioViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+ View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.single_list_item, parent, false);
+ // get application context from parent ViewGroup
+ context = parent.getContext();
+ return new AudioViewHolder(view);
+ }
+
+ @Override
+ public void onBindViewHolder(@NonNull AudioViewHolder holder, int position) {
+ Recording recording = recordingList.get(position);
+ holder.list_title.setText(recording.getTitle());
+ holder.list_date.setText(recording.getDateModified());
+ holder.list_duration.setText(recording.getDuration());
+
+ boolean isExpanded = recording.isExpanded();
+ holder.expandableLayout.setVisibility(isExpanded ? View.VISIBLE : View.GONE);
+ }
+
+ @Override
+ public int getItemCount() {
+ return recordingList.size();
+ }
+
+ public class AudioViewHolder extends RecyclerView.ViewHolder {
+
+ private TextView list_title;
+ private TextView list_date;
+ private TextView list_duration;
+ private ImageView img_play_audio;
+ private ImageView btn_save;
+ private ImageView btn_rename;
+ private ImageView btn_delete;
+ private ImageView btn_share;
+ private ConstraintLayout expandableLayout;
+ private ConstraintLayout nonExpandableLayout;
+ private boolean expanded = false;
+
+ public AudioViewHolder(@NonNull View itemView) {
+ super(itemView);
+
+ list_title = itemView.findViewById(R.id.list_title);
+ list_date = itemView.findViewById(R.id.list_date);
+ list_duration = itemView.findViewById(R.id.list_duration);
+ img_play_audio = itemView.findViewById(R.id.list_play_btn);
+ img_play_audio.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ File fileToPlay = recordingList.get(getAdapterPosition()).getFile();
+ Intent intent = new Intent(context, AudioPlayerActivity.class);
+ intent.putExtra("FILE_TO_PLAY", fileToPlay);
+ context.startActivity(intent);
+ }
+ });
+
+ expandableLayout = itemView.findViewById(R.id.expandable_layout);
+ nonExpandableLayout = itemView.findViewById(R.id.non_expandable_layout);
+ nonExpandableLayout.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ for (Recording recording : recordingList)
+ {
+ if (recordingList.indexOf(recording) == getAdapterPosition()) {
+ recording.setExpanded(!recording.isExpanded());
+ notifyItemChanged(getAdapterPosition());
+ }
+ else {
+ if (recording.isExpanded()) {
+ recording.setExpanded(!recording.isExpanded());
+ notifyItemChanged(recordingList.indexOf(recording));
+ }
+ }
+ }
+ }
+ });
+
+ btn_delete = itemView.findViewById(R.id.btn_delete_audio);
+ btn_delete.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ new AlertDialog.Builder(context)
+ .setMessage("Are you sure you want to delete this entry?")
+ // Specifying a listener allows you to take an action before dismissing the dialog.
+ // The dialog is automatically dismissed when a dialog button is clicked.
+ .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int which) {
+ File oldFile = recordingList.get(getAdapterPosition()).getFile();
+ boolean success = oldFile.delete();
+ if (success)
+ {
+ recordingList.remove(getAdapterPosition());
+ // double check if the old file is removed
+ recordingList.remove(oldFile);
+ notifyItemRemoved(getAdapterPosition());
+ Toast.makeText(context, "Recording discarded", Toast.LENGTH_LONG).show();
+ } else {
+ boolean doubleCheck = context.deleteFile(oldFile.getName());
+ if (doubleCheck) {
+ recordingList.remove(getAdapterPosition());
+ recordingList.remove(oldFile);
+ notifyItemRemoved(getAdapterPosition());
+ Toast.makeText(context, "Recording discarded", Toast.LENGTH_LONG).show();
+ } else {
+ Toast.makeText(context, "Failed to discard recording. Please try again.", Toast.LENGTH_LONG).show();
+ }
+ }
+ }
+ })
+ // A null listener allows the button to dismiss the dialog and take no further action.
+ .setNegativeButton(android.R.string.no, null)
+ .setIcon(android.R.drawable.ic_dialog_alert)
+ .show();
+ }
+ });
+
+ btn_rename = itemView.findViewById(R.id.btn_rename_audio);
+ btn_rename.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String oldFileName = recordingList.get(getAdapterPosition()).getFile().getName();
+
+ LayoutInflater li = LayoutInflater.from(context);
+ View promptsView = li.inflate(R.layout.dialogue_save, null);
+
+ AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(context);
+
+ // set prompts.xml to alertdialog builder
+ alertDialogBuilder.setView(promptsView);
+
+ final EditText userInput = (EditText) promptsView.findViewById(R.id.editTextDialogUserInput);
+ userInput.setText(oldFileName);
+ Button cancel = promptsView.findViewById(R.id.save_cancel);
+ Button ok = promptsView.findViewById(R.id.save_ok);
+ TextView title = promptsView.findViewById(R.id.save_dialog_heading_txt);
+ title.setText("Rename Recording: ");
+ Activity mActivity = fragment.getActivity();
+
+ // set dialog message
+ alertDialogBuilder.setCancelable(false);
+
+ // create alert dialog
+ final AlertDialog alertDialog = alertDialogBuilder.create();
+ cancel.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ alertDialog.dismiss();
+ }
+ });
+ ok.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ String newFileName = userInput.getText().toString();
+ if (!newFileName.contains(".mp3"))
+ newFileName += ".mp3";
+ if (newFileName != null && newFileName.trim().length() > 0) {
+ File newFile = new File(context.getExternalFilesDir("/").getAbsolutePath(), newFileName);
+ File oldFile = new File(context.getExternalFilesDir("/").getAbsolutePath(), oldFileName);
+ oldFile.renameTo(newFile);
+
+ // edit the arraylist
+ recordingList.remove(getAdapterPosition());
+ // double check if the old file is removed
+ recordingList.remove(oldFile);
+ recordingList.add(getAdapterPosition(), new Recording(newFile));
+
+ Toast.makeText(context, "Recording Renamed", Toast.LENGTH_LONG).show();
+ alertDialog.dismiss();
+ notifyItemChanged(getAdapterPosition());
+ }
+ }
+ });
+ // show it
+ alertDialog.show();
+ }
+ });
+
+ btn_save = itemView.findViewById(R.id.btn_save_audio);
+ btn_save.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+
+ }
+ });
+
+ btn_share = itemView.findViewById(R.id.btn_share_audio);
+ btn_share.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ // Set up an Intent to send back to apps that request a file
+ Intent resultIntent = new Intent(Intent.ACTION_SEND);
+ File requestFile = recordingList.get(getAdapterPosition()).getFile();
+ Uri fileUri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", requestFile);
+
+ // Grant temporary read permission to the content URI
+ resultIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
+ // set data and type of intent
+ resultIntent.setDataAndType(fileUri, context.getContentResolver().getType(fileUri));
+ resultIntent.putExtra(Intent.EXTRA_STREAM, fileUri);
+
+ context.startActivity(Intent.createChooser(resultIntent, "Share File"));
+ }
+ });
+
+ }
+ }
+
+}
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListFragment.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListFragment.java
new file mode 100644
index 0000000..532e23c
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/AudioListFragment.java
@@ -0,0 +1,99 @@
+package ca.uwaterloo.sentimo.ui.recordingList;
+
+import android.media.MediaPlayer;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.Fragment;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Collections;
+
+import ca.uwaterloo.sentimo.R;
+
+public class AudioListFragment extends Fragment {
+
+ private RecyclerView audioList;
+ private SwipeRefreshLayout refreshLayout;
+ private File[] allFiles;
+
+ private AudioListAdapter audioListAdapter;
+
+ private MediaPlayer mediaPlayer = null;
+ private boolean isPlaying = false;
+
+ private File fileToPlay = null;
+
+ public AudioListFragment() {
+ // Required empty public constructor
+ }
+
+ @Override
+ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+ return inflater.inflate(R.layout.fragment_audio_list, container, false);
+ }
+
+ @Override
+ public void onCreate(@Nullable Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ refreshAdapter();
+ }
+
+ @Override
+ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
+ super.onViewCreated(view, savedInstanceState);
+ audioList = view.findViewById(R.id.lst_audio_list_view);
+ refreshLayout = view.findViewById(R.id.swipe_container);
+
+ audioList.setHasFixedSize(true);
+ audioList.setLayoutManager(new LinearLayoutManager(getContext()));
+ audioList.setAdapter(audioListAdapter);
+ audioListAdapter.notifyDataSetChanged();
+
+ refreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
+ @Override
+ public void onRefresh() {
+ // update file list
+ refreshAdapter();
+ // notify recycler view and update it
+ audioList.setAdapter(audioListAdapter);
+ audioListAdapter.notifyDataSetChanged();
+ // Call setRefreshing(false) to signal refresh has finished
+ refreshLayout.setRefreshing(false);
+ }
+ });
+
+ }
+
+ @Override
+ public void onStart() {
+ super.onStart();
+ // update file list
+ refreshAdapter();
+ // notify recycler view and update it
+ audioList.setAdapter(audioListAdapter);
+ audioListAdapter.notifyDataSetChanged();
+ }
+
+ private void refreshAdapter() {
+ String path = getActivity().getExternalFilesDir("/").getAbsolutePath();
+ File directory = new File(path);
+ allFiles = directory.listFiles();
+
+ ArrayList recordingList = new ArrayList<>();
+ for (File recording : allFiles) {
+ recordingList.add(new Recording(recording));
+ }
+ Collections.sort(recordingList);
+
+ audioListAdapter = new AudioListAdapter(recordingList, this);
+ }
+}
\ No newline at end of file
diff --git a/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/Recording.java b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/Recording.java
new file mode 100644
index 0000000..72ba7da
--- /dev/null
+++ b/app/src/main/java/ca/uwaterloo/sentimo/ui/recordingList/Recording.java
@@ -0,0 +1,64 @@
+package ca.uwaterloo.sentimo.ui.recordingList;
+
+import java.io.File;
+
+import ca.uwaterloo.sentimo.Utils;
+
+public class Recording implements Comparable {
+
+ private File recording;
+ private boolean expanded;
+
+ private String title;
+ private String dateModified;
+ private long chronologicalOrder;
+ private String duration;
+
+ public Recording(File recording) {
+ setRecordingFile(recording);
+ this.expanded = false;
+ }
+
+ public String getTitle() {
+ return title;
+ }
+
+ public String getDateModified() {
+ return dateModified;
+ }
+
+ public long getChronologicalOrder() {
+ return chronologicalOrder;
+ }
+
+ public String getDuration() {
+ return duration;
+ }
+
+ public boolean isExpanded() {
+ return expanded;
+ }
+
+ public void setExpanded(boolean expanded) {
+ this.expanded = expanded;
+ }
+
+ public File getFile() {
+ return recording;
+ }
+
+ public void setRecordingFile(File recording) {
+ this.recording = recording;
+ title = recording.getName().replace(".mp3", "");
+ dateModified = Utils.getTimeAgo(recording.lastModified());
+ chronologicalOrder = recording.lastModified();
+ duration = Utils.getDuration(recording);
+ }
+
+ @Override
+ public int compareTo(Object o) {
+ if (o.getClass() != Recording.class)
+ return 0;
+ return -Long.valueOf(this.getChronologicalOrder()).compareTo(((Recording) o).getChronologicalOrder());
+ }
+}
diff --git a/app/src/main/res/drawable-v24/ic_welcome_continue.png b/app/src/main/res/drawable-v24/ic_welcome_continue.png
new file mode 100644
index 0000000..b13c244
Binary files /dev/null and b/app/src/main/res/drawable-v24/ic_welcome_continue.png differ
diff --git a/app/src/main/res/drawable-v24/logo_silhouette.png b/app/src/main/res/drawable-v24/logo_silhouette.png
new file mode 100644
index 0000000..f664b46
Binary files /dev/null and b/app/src/main/res/drawable-v24/logo_silhouette.png differ
diff --git a/app/src/main/res/drawable-v24/onboarding1.png b/app/src/main/res/drawable-v24/onboarding1.png
new file mode 100644
index 0000000..552c6f4
Binary files /dev/null and b/app/src/main/res/drawable-v24/onboarding1.png differ
diff --git a/app/src/main/res/drawable-v24/onboarding2.png b/app/src/main/res/drawable-v24/onboarding2.png
new file mode 100644
index 0000000..f0d13df
Binary files /dev/null and b/app/src/main/res/drawable-v24/onboarding2.png differ
diff --git a/app/src/main/res/drawable-v24/onboarding3.png b/app/src/main/res/drawable-v24/onboarding3.png
new file mode 100644
index 0000000..af10f09
Binary files /dev/null and b/app/src/main/res/drawable-v24/onboarding3.png differ
diff --git a/app/src/main/res/drawable/background_gradient.xml b/app/src/main/res/drawable/background_gradient.xml
new file mode 100644
index 0000000..074342b
--- /dev/null
+++ b/app/src/main/res/drawable/background_gradient.xml
@@ -0,0 +1,10 @@
+
+
+-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_baseline_delete_36.xml b/app/src/main/res/drawable/ic_baseline_delete_36.xml
new file mode 100644
index 0000000..cdf1e7e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_delete_36.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_edit_24.xml b/app/src/main/res/drawable/ic_baseline_edit_24.xml
new file mode 100644
index 0000000..2844baf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_edit_24.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_edit_36.xml b/app/src/main/res/drawable/ic_baseline_edit_36.xml
new file mode 100644
index 0000000..164b979
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_edit_36.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_forward_5_36dp.xml b/app/src/main/res/drawable/ic_baseline_forward_5_36dp.xml
new file mode 100644
index 0000000..0d2bf0f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_forward_5_36dp.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_pause_36dp.xml b/app/src/main/res/drawable/ic_baseline_pause_36dp.xml
new file mode 100644
index 0000000..442c001
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_pause_36dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_replay_5_36dp.xml b/app/src/main/res/drawable/ic_baseline_replay_5_36dp.xml
new file mode 100644
index 0000000..13c019a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_replay_5_36dp.xml
@@ -0,0 +1,13 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_save_alt_36.xml b/app/src/main/res/drawable/ic_baseline_save_alt_36.xml
new file mode 100644
index 0000000..46992c5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_save_alt_36.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_baseline_share_36.xml b/app/src/main/res/drawable/ic_baseline_share_36.xml
new file mode 100644
index 0000000..7785d5d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_share_36.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_calendar_black_24dp.xml b/app/src/main/res/drawable/ic_calendar_black_24dp.xml
new file mode 100644
index 0000000..1cf969c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calendar_black_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_play_arrow_36dp.xml b/app/src/main/res/drawable/ic_play_arrow_36dp.xml
new file mode 100644
index 0000000..0923d61
--- /dev/null
+++ b/app/src/main/res/drawable/ic_play_arrow_36dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_plus_black_36dp.xml b/app/src/main/res/drawable/ic_plus_black_36dp.xml
new file mode 100644
index 0000000..5f444cf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_plus_black_36dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_record_black_24dp.xml b/app/src/main/res/drawable/ic_record_black_24dp.xml
new file mode 100644
index 0000000..791b475
--- /dev/null
+++ b/app/src/main/res/drawable/ic_record_black_24dp.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/app/src/main/res/drawable/list_pause_btn.png b/app/src/main/res/drawable/list_pause_btn.png
new file mode 100644
index 0000000..be36c46
Binary files /dev/null and b/app/src/main/res/drawable/list_pause_btn.png differ
diff --git a/app/src/main/res/drawable/list_play_btn.png b/app/src/main/res/drawable/list_play_btn.png
new file mode 100644
index 0000000..70f0851
Binary files /dev/null and b/app/src/main/res/drawable/list_play_btn.png differ
diff --git a/app/src/main/res/drawable/record_icon_off.png b/app/src/main/res/drawable/record_icon_off.png
new file mode 100644
index 0000000..8639a33
Binary files /dev/null and b/app/src/main/res/drawable/record_icon_off.png differ
diff --git a/app/src/main/res/drawable/record_icon_on_1.png b/app/src/main/res/drawable/record_icon_on_1.png
new file mode 100644
index 0000000..4e628fd
Binary files /dev/null and b/app/src/main/res/drawable/record_icon_on_1.png differ
diff --git a/app/src/main/res/drawable/record_icon_on_2.png b/app/src/main/res/drawable/record_icon_on_2.png
new file mode 100644
index 0000000..25bc2ef
Binary files /dev/null and b/app/src/main/res/drawable/record_icon_on_2.png differ
diff --git a/app/src/main/res/drawable/record_icon_on_3.png b/app/src/main/res/drawable/record_icon_on_3.png
new file mode 100644
index 0000000..a0ae3f3
Binary files /dev/null and b/app/src/main/res/drawable/record_icon_on_3.png differ
diff --git a/app/src/main/res/drawable/sentimo_logo.png b/app/src/main/res/drawable/sentimo_logo.png
new file mode 100644
index 0000000..7f52a5f
Binary files /dev/null and b/app/src/main/res/drawable/sentimo_logo.png differ
diff --git a/app/src/main/res/drawable/sentimo_logo_2x.png b/app/src/main/res/drawable/sentimo_logo_2x.png
new file mode 100644
index 0000000..f89245b
Binary files /dev/null and b/app/src/main/res/drawable/sentimo_logo_2x.png differ
diff --git a/app/src/main/res/drawable/sign_up_button.xml b/app/src/main/res/drawable/sign_up_button.xml
new file mode 100644
index 0000000..87a4943
--- /dev/null
+++ b/app/src/main/res/drawable/sign_up_button.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/small_logo.png b/app/src/main/res/drawable/small_logo.png
new file mode 100644
index 0000000..2bf1c9d
Binary files /dev/null and b/app/src/main/res/drawable/small_logo.png differ
diff --git a/app/src/main/res/drawable/splash_screen_background.xml b/app/src/main/res/drawable/splash_screen_background.xml
new file mode 100644
index 0000000..25b34b3
--- /dev/null
+++ b/app/src/main/res/drawable/splash_screen_background.xml
@@ -0,0 +1,10 @@
+
+
+ -
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/font/roboto.xml b/app/src/main/res/font/roboto.xml
new file mode 100644
index 0000000..2641caf
--- /dev/null
+++ b/app/src/main/res/font/roboto.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/font/roboto_bold.xml b/app/src/main/res/font/roboto_bold.xml
new file mode 100644
index 0000000..1e8c20a
--- /dev/null
+++ b/app/src/main/res/font/roboto_bold.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/font/roboto_medium.xml b/app/src/main/res/font/roboto_medium.xml
new file mode 100644
index 0000000..59df90b
--- /dev/null
+++ b/app/src/main/res/font/roboto_medium.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/font/roboto_medium_italic.xml b/app/src/main/res/font/roboto_medium_italic.xml
new file mode 100644
index 0000000..e67326f
--- /dev/null
+++ b/app/src/main/res/font/roboto_medium_italic.xml
@@ -0,0 +1,7 @@
+
+
+
diff --git a/app/src/main/res/layout/absent_view.xml b/app/src/main/res/layout/absent_view.xml
new file mode 100644
index 0000000..b822722
--- /dev/null
+++ b/app/src/main/res/layout/absent_view.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_audio_player.xml b/app/src/main/res/layout/activity_audio_player.xml
new file mode 100644
index 0000000..ccc45f6
--- /dev/null
+++ b/app/src/main/res/layout/activity_audio_player.xml
@@ -0,0 +1,127 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 38c0aa8..b100679 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -4,7 +4,31 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:paddingTop="?attr/actionBarSize">
+ android:fitsSystemWindows="false">
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_record.xml b/app/src/main/res/layout/activity_record.xml
new file mode 100644
index 0000000..c02a945
--- /dev/null
+++ b/app/src/main/res/layout/activity_record.xml
@@ -0,0 +1,135 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/current_view.xml b/app/src/main/res/layout/current_view.xml
new file mode 100644
index 0000000..e2da794
--- /dev/null
+++ b/app/src/main/res/layout/current_view.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/default_view.xml b/app/src/main/res/layout/default_view.xml
new file mode 100644
index 0000000..2ad27de
--- /dev/null
+++ b/app/src/main/res/layout/default_view.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialogue_save.xml b/app/src/main/res/layout/dialogue_save.xml
new file mode 100644
index 0000000..1f7047a
--- /dev/null
+++ b/app/src/main/res/layout/dialogue_save.xml
@@ -0,0 +1,49 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_audio_list.xml b/app/src/main/res/layout/fragment_audio_list.xml
new file mode 100644
index 0000000..86b1888
--- /dev/null
+++ b/app/src/main/res/layout/fragment_audio_list.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_calendar.xml
similarity index 63%
rename from app/src/main/res/layout/fragment_home.xml
rename to app/src/main/res/layout/fragment_calendar.xml
index f3d9b08..23c66a0 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -4,19 +4,26 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- tools:context=".ui.home.HomeFragment">
+ tools:context=".ui.calendar.CalendarFragment">
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml
index 166ab0e..544bc0d 100644
--- a/app/src/main/res/layout/fragment_dashboard.xml
+++ b/app/src/main/res/layout/fragment_dashboard.xml
@@ -6,6 +6,19 @@
android:layout_height="match_parent"
tools:context=".ui.dashboard.DashboardFragment">
+
+
+ android:background="@drawable/background_gradient"
+ tools:context=".onboarding.LoadingFragment">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding2.xml b/app/src/main/res/layout/fragment_onboarding2.xml
new file mode 100644
index 0000000..710a2af
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding2.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_onboarding3.xml b/app/src/main/res/layout/fragment_onboarding3.xml
new file mode 100644
index 0000000..40c69f9
--- /dev/null
+++ b/app/src/main/res/layout/fragment_onboarding3.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_welcome.xml b/app/src/main/res/layout/fragment_welcome.xml
new file mode 100644
index 0000000..fa076e1
--- /dev/null
+++ b/app/src/main/res/layout/fragment_welcome.xml
@@ -0,0 +1,68 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/present_view.xml b/app/src/main/res/layout/present_view.xml
new file mode 100644
index 0000000..fb35213
--- /dev/null
+++ b/app/src/main/res/layout/present_view.xml
@@ -0,0 +1,26 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/single_list_item.xml b/app/src/main/res/layout/single_list_item.xml
new file mode 100644
index 0000000..570621b
--- /dev/null
+++ b/app/src/main/res/layout/single_list_item.xml
@@ -0,0 +1,208 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/bottom_nav_menu.xml b/app/src/main/res/menu/bottom_nav_menu.xml
index fb6d040..4e27089 100644
--- a/app/src/main/res/menu/bottom_nav_menu.xml
+++ b/app/src/main/res/menu/bottom_nav_menu.xml
@@ -2,9 +2,9 @@
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index eca70cf..036d09b 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
-
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index a571e60..e999bc8 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..03ff5d5
Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 61da551..482272c 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index c41dd28..c360307 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..3ce56fb
Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index db5080a..faef8e8 100644
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 6dba46d..d1cc079 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..89f0dbc
Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index da31a87..e6c8944 100644
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index 15ac681..f591669 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..4a1ebc6
Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index b216f2d..bec19b9 100644
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index f25a419..121a581 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
new file mode 100644
index 0000000..9c4be62
Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ
diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index e96783c..e3de0f0 100644
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ
diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml
index 7ca3812..a938b64 100644
--- a/app/src/main/res/navigation/mobile_navigation.xml
+++ b/app/src/main/res/navigation/mobile_navigation.xml
@@ -3,13 +3,13 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/mobile_navigation"
- app:startDestination="@+id/navigation_home">
+ app:startDestination="@+id/navigation_dashboard">
+ android:id="@+id/navigation_recordingList"
+ android:name="ca.uwaterloo.sentimo.ui.recordingList.AudioListFragment"
+ android:label="@string/title_recordings"
+ tools:layout="@layout/fragment_audio_list" />
+ android:id="@+id/navigation_calendar"
+ android:name="ca.uwaterloo.sentimo.ui.calendar.CalendarFragment"
+ android:label="@string/title_calendar"
+ tools:layout="@layout/fragment_calendar" />
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index 9b17a02..f27fb59 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -1,6 +1,6 @@
-
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8c6127..b9ca175 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -7,4 +7,21 @@
#FF018786
#FF000000
#FFFFFFFF
+ #808080
+ #808080
+ #FFFEF9
+
+
+ #FFFDF4
+ #333333
+ #BFECEC
+ #177B7B
+ #FFEC43
+ #FCDD32
+ #FFF6E9
+ #ABE5E5
+ #68D6D6
+ #FFB2B2
+ #F88A72
+ #FC6D6D
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index e00c2dd..ddbfc87 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -2,4 +2,5 @@
16dp
16dp
+ 68dp
\ No newline at end of file
diff --git a/app/src/main/res/values/font_certs.xml b/app/src/main/res/values/font_certs.xml
new file mode 100644
index 0000000..d2226ac
--- /dev/null
+++ b/app/src/main/res/values/font_certs.xml
@@ -0,0 +1,17 @@
+
+
+
+ - @array/com_google_android_gms_fonts_certs_dev
+ - @array/com_google_android_gms_fonts_certs_prod
+
+
+ -
+ MIIEqDCCA5CgAwIBAgIJANWFuGx90071MA0GCSqGSIb3DQEBBAUAMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTAeFw0wODA0MTUyMzM2NTZaFw0zNTA5MDEyMzM2NTZaMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbTCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBANbOLggKv+IxTdGNs8/TGFy0PTP6DHThvbbR24kT9ixcOd9W+EaBPWW+wPPKQmsHxajtWjmQwWfna8mZuSeJS48LIgAZlKkpFeVyxW0qMBujb8X8ETrWy550NaFtI6t9+u7hZeTfHwqNvacKhp1RbE6dBRGWynwMVX8XW8N1+UjFaq6GCJukT4qmpN2afb8sCjUigq0GuMwYXrFVee74bQgLHWGJwPmvmLHC69EH6kWr22ijx4OKXlSIx2xT1AsSHee70w5iDBiK4aph27yH3TxkXy9V89TDdexAcKk/cVHYNnDBapcavl7y0RiQ4biu8ymM8Ga/nmzhRKya6G0cGw8CAQOjgfwwgfkwHQYDVR0OBBYEFI0cxb6VTEM8YYY6FbBMvAPyT+CyMIHJBgNVHSMEgcEwgb6AFI0cxb6VTEM8YYY6FbBMvAPyT+CyoYGapIGXMIGUMQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEQMA4GA1UEChMHQW5kcm9pZDEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDEiMCAGCSqGSIb3DQEJARYTYW5kcm9pZEBhbmRyb2lkLmNvbYIJANWFuGx90071MAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQADggEBABnTDPEF+3iSP0wNfdIjIz1AlnrPzgAIHVvXxunW7SBrDhEglQZBbKJEk5kT0mtKoOD1JMrSu1xuTKEBahWRbqHsXclaXjoBADb0kkjVEJu/Lh5hgYZnOjvlba8Ld7HCKePCVePoTJBdI4fvugnL8TsgK05aIskyY0hKI9L8KfqfGTl1lzOv2KoWD0KWwtAWPoGChZxmQ+nBli+gwYMzM1vAkP+aayLe0a1EQimlOalO762r0GXO0ks+UeXde2Z4e+8S/pf7pITEI/tP+MxJTALw9QUWEv9lKTk+jkbqxbsh8nfBUapfKqYn0eidpwq2AzVp3juYl7//fKnaPhJD9gs=
+
+
+
+ -
+ MIIEQzCCAyugAwIBAgIJAMLgh0ZkSjCNMA0GCSqGSIb3DQEBBAUAMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDAeFw0wODA4MjEyMzEzMzRaFw0zNjAxMDcyMzEzMzRaMHQxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpDYWxpZm9ybmlhMRYwFAYDVQQHEw1Nb3VudGFpbiBWaWV3MRQwEgYDVQQKEwtHb29nbGUgSW5jLjEQMA4GA1UECxMHQW5kcm9pZDEQMA4GA1UEAxMHQW5kcm9pZDCCASAwDQYJKoZIhvcNAQEBBQADggENADCCAQgCggEBAKtWLgDYO6IIrgqWbxJOKdoR8qtW0I9Y4sypEwPpt1TTcvZApxsdyxMJZ2JORland2qSGT2y5b+3JKkedxiLDmpHpDsz2WCbdxgxRczfey5YZnTJ4VZbH0xqWVW/8lGmPav5xVwnIiJS6HXk+BVKZF+JcWjAsb/GEuq/eFdpuzSqeYTcfi6idkyugwfYwXFU1+5fZKUaRKYCwkkFQVfcAs1fXA5V+++FGfvjJ/CxURaSxaBvGdGDhfXE28LWuT9ozCl5xw4Yq5OGazvV24mZVSoOO0yZ31j7kYvtwYK6NeADwbSxDdJEqO4k//0zOHKrUiGYXtqw/A0LFFtqoZKFjnkCAQOjgdkwgdYwHQYDVR0OBBYEFMd9jMIhF1Ylmn/Tgt9r45jk14alMIGmBgNVHSMEgZ4wgZuAFMd9jMIhF1Ylmn/Tgt9r45jk14aloXikdjB0MQswCQYDVQQGEwJVUzETMBEGA1UECBMKQ2FsaWZvcm5pYTEWMBQGA1UEBxMNTW91bnRhaW4gVmlldzEUMBIGA1UEChMLR29vZ2xlIEluYy4xEDAOBgNVBAsTB0FuZHJvaWQxEDAOBgNVBAMTB0FuZHJvaWSCCQDC4IdGZEowjTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBAUAA4IBAQBt0lLO74UwLDYKqs6Tm8/yzKkEu116FmH4rkaymUIE0P9KaMftGlMexFlaYjzmB2OxZyl6euNXEsQH8gjwyxCUKRJNexBiGcCEyj6z+a1fuHHvkiaai+KL8W1EyNmgjmyy8AW7P+LLlkR+ho5zEHatRbM/YAnqGcFh5iZBqpknHf1SKMXFh4dd239FJ1jWYfbMDMy3NS5CTMQ2XFI1MvcyUTdZPErjQfTbQe3aDQsQcafEQPD+nqActifKZ0Np0IS9L9kR/wbNvyz6ENwPiTrjV2KRkEjH78ZMcUQXg0L3BYHJ3lc69Vs5Ddf9uUGGMYldX3WfMBEmh/9iFBDAaTCK
+
+
+
diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644
index 0000000..c5d5899
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+
+
+ #FFFFFF
+
\ No newline at end of file
diff --git a/app/src/main/res/values/preloaded_fonts.xml b/app/src/main/res/values/preloaded_fonts.xml
new file mode 100644
index 0000000..20bdb47
--- /dev/null
+++ b/app/src/main/res/values/preloaded_fonts.xml
@@ -0,0 +1,9 @@
+
+
+
+ - @font/roboto
+ - @font/roboto_bold
+ - @font/roboto_medium
+ - @font/roboto_medium_italic
+
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bb0d279..922c4f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,28 @@
Sentimo
- Home
+ My Journal
Dashboard
- Notifications
+ History
+ Add a new recording
+
+ Hello blank fragment
+ recording
+ Tap the button to record
+ Recording successfully saved
+ Recordings
+ Journal Entry
+ Sentimo: write an entry
+
+ Image
+ Image
+ sentimo
+ Welcome to Sentimo
+ The voice journal that learns with you.
+ continue
+ Reflect on your day with an easy-to-use voice journal
+ AI voice analysis helps track your mood
+ Get to know yourself better
+ Let’s get started
+ Already have an account? Log in
+
\ No newline at end of file
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 9024766..cb47065 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -1,16 +1,62 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
new file mode 100644
index 0000000..4495c28
--- /dev/null
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -0,0 +1,4 @@
+
+
+
+
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 4d24be2..37e50b3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,11 +1,15 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
+ ext {
+ kotlin_version = '1.3.72'
+ }
repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:4.1.1"
+ classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
@@ -16,6 +20,7 @@ allprojects {
repositories {
google()
jcenter()
+ maven { url 'https://jitpack.io' }
}
}