Skip to content

R
Research-Project
Commit 75f17c70 authored by Anuththara18's avatar Anuththara18
Browse files
Options

Enabling sharing csv & pdf data files and Navigation Drawer Formatting

parent 72ca270b
Show whitespace changes
Inline Side-by-side
Showing with 213 additions and 73 deletions
app/src/main/AndroidManifest.xml
View file @ 75f17c70
......@@ -6,7 +6,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission
android:name="android.permission.MANAGE_EXTERNAL_STORAGE"
tools:ignore="ScopedStorage" />
......@@ -21,56 +20,54 @@
android:theme="@style/Theme.AttentionAssessment"
android:usesCleartextTraffic="true">
<meta-data
android:name="preloaded_fonts"
android:resource="@array/preloaded_fonts" />
<activity android:name=".details.ParentDetailsActivity"
android:screenOrientation="landscape"
android:windowSoftInputMode="adjustPan|stateHidden"
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="com.anuththara18.attentionassessment.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
<activity android:name=".emailfiles.EmailDataFilesActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
<activity
android:name=".details.ParentDetailsActivity"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar"
android:windowSoftInputMode="adjustPan|stateHidden"></activity>
<activity
android:name=".consentform.ConsentFormActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".consentform.SinhalaConsentFormActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".consentform.GetParentsConsentActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
android:theme="@style/Theme.AppCompat.NoActionBar" />
<activity
android:name=".consentform.GetSignatureActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
android:theme="@style/Theme.AppCompat.NoActionBar" />
<activity
android:name=".alternating.AlternatingAttentionGame1"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar">
</activity>
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
<meta-data
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/provider_paths" />
</provider>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".sustained.BirdChoosingActivity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".dividedattention.DACompleteScreen"
android:screenOrientation="portrait"
......@@ -102,37 +99,27 @@
<activity
android:name=".CompleteScreen2"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".CompleteScreen"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".dividedattention.DividedAttentionGame1"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".sustained.SustainedAttentionGame1"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".focused.FocusedAttentionGame2"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".map.Map2Activity"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".map.Map1Activity"
android:screenOrientation="portrait"
......@@ -145,8 +132,7 @@
<activity
android:name=".focused.FocusedAttentionGame1"
android:screenOrientation="landscape"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".loginregistration.RegistrationActivity"
android:screenOrientation="portrait"
......@@ -170,9 +156,7 @@
<activity
android:name=".selective.SelectiveAttentionGame1"
android:screenOrientation="portrait"
android:theme="@style/Theme.AppCompat.NoActionBar" >
</activity>
android:theme="@style/Theme.AppCompat.NoActionBar"></activity>
<activity
android:name=".splashscreen.SplashActivity"
android:screenOrientation="landscape"
......
app/src/main/java/com/anuththara18/attentionassessment/dividedattention/DividedAttentionGame1.java
View file @ 75f17c70
......@@ -52,7 +52,6 @@ public class DividedAttentionGame1 extends AppCompatActivity {
private long startTime, clickedTime = 0;
long reactionTime;
int totalCorrectResponses = 0;
int noOfCorrectResponses = 0;
int noOfCommissionErrors = 0;
......@@ -94,7 +93,7 @@ public class DividedAttentionGame1 extends AppCompatActivity {
red_btn = (ImageButton) findViewById(R.id.red_btn);
textView2 = (TextView) findViewById(R.id.textView2);
//textView2.setText(LanguageSetter.getresources().getString(R.string.divg1));
textView2.setText(LanguageSetter.getresources().getString(R.string.divg1));
mp = MediaPlayer.create(getApplicationContext(), R.raw.divided);
mp.start();
......
app/src/main/java/com/anuththara18/attentionassessment/emailfiles/EmailDataFilesActivity.java 0 → 100644
View file @ 75f17c70
package com.anuththara18.attentionassessment.emailfiles;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.FileProvider;
import android.content.Context;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.os.Environment;
import android.view.View;
import android.widget.Button;
import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.language.LanguageSetter;
import java.io.File;
import java.util.ArrayList;
public class EmailDataFilesActivity extends AppCompatActivity {
Button button;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_email_data_files);
Context context = getApplicationContext(); ;
button = findViewById(R.id.button);
button.setText(LanguageSetter.getresources().getString(R.string.send));
String csv = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/SelectiveAttention.csv");
String pdf = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/SelectiveAttention.pdf");
String csv1 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/AlternatingAttention.csv");
String pdf1 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/AlternatingAttention.pdf");
String csv2 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/DividedAttention.csv");
String pdf2 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/DividedAttention.pdf");
String csv3 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/FocusedAttention.csv");
String pdf3 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/FocusedAttention.pdf");
String csv4 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/SustainedAttention.csv");
String pdf4 = (Environment.getExternalStorageDirectory().getAbsolutePath() + "/SustainedAttention.pdf");
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
Intent emailIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
emailIntent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);
emailIntent.setType("text/plain");
emailIntent.putExtra(Intent.EXTRA_EMAIL, new String[]{"it19114040@my.sliit.lk"});
emailIntent.putExtra(Intent.EXTRA_SUBJECT, "Attention Assessment Data");
emailIntent.putExtra(Intent.EXTRA_TEXT, "body text");
File file = new File(csv);
File file1 = new File(pdf);
File file2 = new File(csv1);
File file3 = new File(pdf1);
File file4 = new File(csv2);
File file5 = new File(pdf2);
File file6 = new File(csv3);
File file7 = new File(pdf3);
File file8 = new File(csv4);
File file9 = new File(pdf4);
Uri uri = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file);
Uri uri1 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file1);
Uri uri2 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file2);
Uri uri3 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file3);
Uri uri4 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file4);
Uri uri5 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file5);
Uri uri6 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file6);
Uri uri7 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file7);
Uri uri8 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file8);
Uri uri9 = FileProvider.getUriForFile(context, context.getApplicationContext().getPackageName() + ".provider", file9);
ArrayList<Uri> uris = new ArrayList<Uri>();
uris.add(uri);
uris.add(uri1);
uris.add(uri2);
uris.add(uri3);
uris.add(uri4);
uris.add(uri5);
uris.add(uri6);
uris.add(uri7);
uris.add(uri8);
uris.add(uri9);
emailIntent.putParcelableArrayListExtra(Intent.EXTRA_STREAM, uris);
//startActivityForResult(Intent.createChooser(emailIntent, "Sending multiple attachment"), 12345);
//emailIntent.putExtra(Intent.EXTRA_STREAM, uri);
startActivity(Intent.createChooser(emailIntent, "Pick an Email provider"));
}
});
}
}
\ No newline at end of file
app/src/main/java/com/anuththara18/attentionassessment/home/NavigationDrawerActivity.java
View file @ 75f17c70
......@@ -19,6 +19,7 @@ import android.widget.Toast;
import com.anuththara18.attentionassessment.R;
import com.anuththara18.attentionassessment.consentform.ConsentFormActivity;
import com.anuththara18.attentionassessment.emailfiles.EmailDataFilesActivity;
import com.google.android.material.navigation.NavigationView;
import static android.Manifest.permission.MANAGE_EXTERNAL_STORAGE;
......@@ -88,32 +89,36 @@ public class NavigationDrawerActivity extends AppCompatActivity implements Navig
this.showFragment(FRAGMENT_MAINDASHBOARD);
break;
case R.id.parents:
Intent intent1 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent1);
//Intent intent1 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent1);
break;
case R.id.healthProfessional:
Intent intent2 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent2);
//Intent intent2 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent2);
break;
case R.id.doctor:
Intent intent3 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent3);
//Intent intent3 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent3);
break;
case R.id.admin:
Intent intent4 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent4);
//Intent intent4 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent4);
break;
case R.id.termsAndConditions:
Intent intent6 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent6);
//Intent intent6 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent6);
break;
case R.id.consentForm:
Intent intent7 = new Intent(getApplicationContext(), ConsentFormActivity.class);
startActivity(intent7);
break;
case R.id.sendData:
Intent intent9 = new Intent(getApplicationContext(), EmailDataFilesActivity.class);
startActivity(intent9);
break;
case R.id.aboutUs:
Intent intent8 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
startActivity(intent8);
//Intent intent8 = new Intent(getApplicationContext(), NavigationDrawerActivity.class);
//startActivity(intent8);
break;
case R.id.logOut:
logout();
......
app/src/main/java/com/anuththara18/attentionassessment/selective/SelectiveAttentionGame1.java
View file @ 75f17c70
......@@ -363,7 +363,7 @@ public class SelectiveAttentionGame1 extends AppCompatActivity {
totalCorrectResponses++;
}
}
Log.d("@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@", String.valueOf(totalCorrectResponses));
Log.d("@@@@@@@@@@@@@@@@@@@", String.valueOf(totalCorrectResponses));
} while (totalCorrectResponses < 6);
try {
......
app/src/main/java/com/anuththara18/attentionassessment/sustained/SA1CompleteScreen.java
View file @ 75f17c70
......@@ -312,7 +312,7 @@ public class SA1CompleteScreen extends AppCompatActivity {
// below line is used to set the name of
// our PDF file and its path.
File file = new File(Environment.getExternalStorageDirectory(), "SustainedAttention1.pdf");
File file = new File(Environment.getExternalStorageDirectory(), "SustainedAttention.pdf");
try {
// after creating a file name we will
......
app/src/main/java/com/anuththara18/attentionassessment/sustained/SustainedAttentionGame1.java
View file @ 75f17c70
......@@ -48,12 +48,12 @@ public class SustainedAttentionGame1 extends AppCompatActivity {
// isi = 10 - 60 secs
/*Integer[] isi = { 10000, 45000, 25000, 50000, 20000, 35000, 60000, 15000, 30000, 55000, 40000,
Integer[] isi = { 10000, 45000, 25000, 50000, 20000, 35000, 60000, 15000, 30000, 55000, 40000,
10000, 45000, 25000, 50000, 20000, 35000, 60000, 15000, 30000, 55000, 40000,
10000, 15000, 10000, 15000 };*/
Integer[] isi = { 1000, 4500, 2500, 5000, 2000, 3500, 6000, 1500, 3000, 5500, 4000,
10000, 15000, 10000, 15000 };
/*Integer[] isi = { 1000, 4500, 2500, 5000, 2000, 3500, 6000, 1500, 3000, 5500, 4000,
1000, 4500, 2500, 5000, 2000, 3500, 6000, 1500, 3000, 5500, 4000,
1000, 1500, 1000, 1500 };
1000, 1500, 1000, 1500 }; */
Integer[] image = { R.drawable.red_bird_gif,
R.drawable.blue_bird_gif,
......
app/src/main/res/drawable-nodpi/icon_assessment.xml 0 → 100644
View file @ 75f17c70
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM9,17L7,17v-7h2v7zM13,17h-2L11,7h2v10zM17,17h-2v-4h2v4z"/>
</vector>
app/src/main/res/drawable-nodpi/icon_send.xml 0 → 100644
View file @ 75f17c70
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal"
android:autoMirrored="true">
<path
android:fillColor="@android:color/white"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>
app/src/main/res/layout/activity_email_data_files.xml 0 → 100644
View file @ 75f17c70
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg6"
tools:context=".emailfiles.EmailDataFilesActivity">
<Button
android:id="@+id/button"
android:layout_width="200dp"
android:layout_height="wrap_content"
android:text="@string/send"
android:background="@color/blue"
android:backgroundTint="@color/blue"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.5"
android:padding="20dp"
android:elevation="50dp"
android:textStyle="bold"
android:textSize="20sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
app/src/main/res/menu/drawermenu.xml
View file @ 75f17c70
......@@ -8,18 +8,19 @@
<group android:checkableBehavior="single">
<item android:id="@+id/dashboard" android:title="Dashboard" android:icon="@drawable/icon_dashboard"/>
<item android:id="@+id/admin" android:title="Visual Attention Assessments" android:icon="@drawable/icon_profile"/>
<item android:id="@+id/parents" android:title="Ayeshka" android:icon="@drawable/icon_profile"/>
<item android:id="@+id/healthProfessional" android:title="Sandunika" android:icon="@drawable/icon_profile"/>
<item android:id="@+id/doctor" android:title="Isuri" android:icon="@drawable/icon_profile"/>
<item android:id="@+id/admin" android:title="Visual Attention Assessments" android:icon="@drawable/icon_assessment"/>
<item android:id="@+id/parents" android:title="Ayeshka" android:icon="@drawable/icon_assessment"/>
<item android:id="@+id/healthProfessional" android:title="Sandunika" android:icon="@drawable/icon_assessment"/>
<item android:id="@+id/doctor" android:title="Isuri" android:icon="@drawable/icon_assessment"/>
</group>
</menu>
</item>
<group android:checkableBehavior="single">
<item android:id="@+id/consentForm" android:title="Consent Form" android:icon="@drawable/icon_terms"/>
<item android:id="@+id/sendData" android:title="Send Data" android:icon="@drawable/icon_send"/>
<item android:id="@+id/termsAndConditions" android:title="Preliminary Medical Guidance" android:icon="@drawable/icon_medical"/>
<item android:id="@+id/aboutUs" android:title="Contact Health Professional" android:icon="@drawable/icon_support"/>
<item android:id="@+id/aboutUs" android:title="Contact Health Professional" android:icon="@drawable/icon_contact"/>
<item android:id="@+id/logOut" android:title="Logout" android:icon="@drawable/icon_logout"/>
</group>
......
app/src/main/res/values-si/strings(si).xml
View file @ 75f17c70
......@@ -19,6 +19,7 @@
<string name="parentEmail">විද්යුත් තැපෑල් ලිපිනය:</string>
<string name="parentContact">දුරකතන අංකය :</string>
<string name="optional">* විකල්ප</string>
<string name="send">දත්ත යවන්න</string>
<string name="select">තෝරන්න</string>
<string name="birdselect">ඔබ වඩාත්ම කැමති චරිතය තෝරන්න</string>
......
app/src/main/res/values/strings.xml
View file @ 75f17c70
......@@ -18,6 +18,7 @@
<string name="parentEmail">Email :</string>
<string name="parentContact">Contact Number :</string>
<string name="optional">* Optional</string>
<string name="send">Send Data</string>
<string name="select">Select the</string>
<string name="birdselect">Pick your favourite character</string>
......
app/src/main/res/xml/provider_paths.xml
View file @ 75f17c70
<?xml version="1.0" encoding="utf-8"?>
<paths>
<external-path name="external_files" path="."/>
</paths>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment