Merge branch 'IT17009546' into 'master'

Updated the issues in manifest and build gradle

See merge request !68

app/build.gradle

@@ -7,7 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.elearning.probabilityandstatisticsanalyserandeducator"
-        multiDexEnabled true
+
         python{
             pip{
                 install "numpy"
@@ -38,7 +38,8 @@ android {
 
         // python.exe file path *********** please change this according to your file path
         python{
-            buildPython "C:/Users/user/AppData/Local/Programs/Python/Python39/python.exe"
+            buildPython "C:/Users/Navod/AppData/Local/Programs/Python/Python39/python.exe"
+
         }
     }
 
@@ -63,10 +64,6 @@ android {
 
 dependencies {
 
-    implementation fileTree(dir: 'libs', includes: ['*.jar'])
-
-    compile 'com.alimuzaffar.lib:pinentryedittext:1.3.1'
-    implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'androidx.appcompat:appcompat:1.1.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
@@ -79,9 +76,6 @@ dependencies {
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    implementation files('libs\\activation.jar')
-    implementation files('libs\\additional.jar')
-    implementation files('libs\\mail.jar')
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
     implementation 'com.google.android.material:material:1.0.0'
     implementation 'com.rmtheis:tess-two:5.4.1'
@@ -91,4 +85,7 @@ dependencies {
     implementation 'com.opencsv:opencsv:4.6'
 
 
+
+
+
 }
\ No newline at end of file

app/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.elearning.probabilityandstatisticsanalyserandeducator">
+    package="com.elearning.probabilityandstatisticsanalyserandeducator" >
+
+    <uses-feature
+        android:name="android.hardware.camera2"
+        android:required="true" />
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission
+        android:name="android.permission.CAMERA"
+        android:required="true"
+        android:requiredFeature="true" />
 
     <application
         android:allowBackup="true"
@@ -10,11 +22,12 @@
         android:requestLegacyExternalStorage="true"
         android:roundIcon="@mipmap/app_logo"
         android:supportsRtl="true"
-        android:theme="@style/Theme.ProbabilityAndStatisticsAnalyserAndEducator">
-        <activity android:name=".calculationfunction.EssayTypeStdQuestionActivity"></activity>
-        <activity android:name=".calculationfunction.EssayTypeProDistributionActivity" />
+        android:theme="@style/Theme.ProbabilityAndStatisticsAnalyserAndEducator" >
+
         <activity android:name=".inputMethod.StandardDeviationInputMethod" />
-        <activity android:name=".calculationfunction.StandaradDeviationCalculation" />
+
+        <activity android:name=".calculationfunction.StandaradDeviationCalculation"/>
+
         <activity android:name=".inputMethod.ProbabilityDistributionsIM" />
         <activity android:name=".adaptiveLearning.QuizActivity" />
         <activity android:name=".adaptiveLearning.StartingScreen" />
@@ -23,9 +36,8 @@
         <activity android:name=".Sign_up_part3" />
         <activity android:name=".Sign_up_part2" />
         <activity android:name=".calculationfunction.DescriptiveStatisticsCalcuation" />
-        <activity android:name=".calculationfunction.EssayTypeDescriptiveStaticQuestion" />
         <activity android:name=".inputMethod.ProbabilityCalculationIM" />
-        <activity android:name=".calculationfunction.ProbabilityDistributionCalculation" />
+
         <activity
             android:name="com.theartofdev.edmodo.cropper.CropImageActivity"
             android:theme="@style/Theme.AppCompat.DayNight.DarkActionBar" />
@@ -35,7 +47,7 @@
         <activity android:name=".SignUp" />
         <activity
             android:name=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:theme="@style/AppTheme.NoActionBar" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
@@ -47,47 +59,12 @@
             android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
-            android:grantUriPermissions="true">
+            android:grantUriPermissions="true" >
             <meta-data
                 android:name="android.support.FILE_PROVIDER_PATHS"
                 android:resource="@xml/provider_paths" />
         </provider>
     </application>
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-
-    <uses-feature
-        android:name="android.hardware.camera2"
-        android:required="true" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
-    <uses-permission
-        android:name="android.permission.CAMERA"
-        android:required="true"
-        android:requiredFeature="true" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <uses-permission android:name="android.permission.INTERNET" />
 
 </manifest>
\ No newline at end of file