Merge pull request #59 from K-Konstantinidis/mobileApp

Final pull request of Mobile App
K-Konstantinidis · Jun 21, 2022 · 3fc04f0 · 3fc04f0
2 parents 150ae67 + 1a1d403
commit 3fc04f0
Show file tree

Hide file tree

Showing 33 changed files with 1,233 additions and 673 deletions.
diff --git a/Mob-App/.idea/gradle.xml b/Mob-App/.idea/gradle.xml
diff --git a/Mob-App/.idea/libraries/Gradle__androidx_annotation_annotation_1_3_0.xml b/Mob-App/.idea/libraries/Gradle__androidx_annotation_annotation_1_3_0.xml
diff --git a/Mob-App/.idea/libraries/Gradle__androidx_annotation_annotation_1_4_0.xml b/Mob-App/.idea/libraries/Gradle__androidx_annotation_annotation_1_4_0.xml
diff --git a/..._jetbrains_kotlin_kotlin_stdlib_1_6_0.xml → ...jetbrains_kotlin_kotlin_stdlib_1_6_21.xml b/..._jetbrains_kotlin_kotlin_stdlib_1_6_0.xml → ...jetbrains_kotlin_kotlin_stdlib_1_6_21.xml
diff --git a/Mob-App/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml b/Mob-App/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_0.xml
diff --git a/Mob-App/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_21.xml b/Mob-App/.idea/libraries/Gradle__org_jetbrains_kotlin_kotlin_stdlib_common_1_6_21.xml
diff --git a/Mob-App/.idea/misc.xml b/Mob-App/.idea/misc.xml
diff --git a/Mob-App/.idea/modules.xml b/Mob-App/.idea/modules.xml
diff --git a/Mob-App/app/build.gradle b/Mob-App/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
 	implementation 'androidx.navigation:navigation-fragment:2.4.2'
 	implementation 'androidx.navigation:navigation-ui:2.4.2'
 	implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-	implementation 'androidx.annotation:annotation:1.3.0'
+	implementation 'androidx.annotation:annotation:1.4.0'
 	implementation "androidx.recyclerview:recyclerview:1.2.1"
 	testImplementation 'junit:junit:4.13.2'
 	androidTestImplementation 'androidx.test.ext:junit:1.1.3'

diff --git a/Mob-App/app/src/main/AndroidManifest.xml b/Mob-App/app/src/main/AndroidManifest.xml
@@ -3,20 +3,20 @@
 	xmlns:tools="http://schemas.android.com/tools"
 	package="com.example.esake">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.INTERNET" />
 	<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
 
-    <application
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:networkSecurityConfig="@xml/network_security_config"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/Theme.Esake"
-        android:usesCleartextTraffic="true"
+	<application
+		android:allowBackup="true"
+		android:icon="@mipmap/ic_launcher"
+		android:label="@string/app_name"
+		android:networkSecurityConfig="@xml/network_security_config"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:supportsRtl="true"
+		android:theme="@style/Theme.Esake"
+		android:usesCleartextTraffic="true"
 		tools:targetApi="n">
-<!--	Run index page (Official Main) -->
+		<!-- Run index page (Official Main) -->
 		<activity
 			android:name=".IndexPage"
 			android:exported="true">
@@ -25,29 +25,24 @@
 
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
-		</activity>
-<!--	Run login page -->
-        <activity
-            android:name=".Login"
-            android:exported="false" />
-<!--	Run home pages -->
+		</activity> <!-- Run login page -->
+		<activity
+			android:name=".Login"
+			android:exported="false" /> <!-- Run home pages -->
 		<activity
 			android:name=".StatsManagerHome.HomeActivity"
 			android:exported="false" />
 		<activity
 			android:name=".MainActivity"
-			android:exported="false" >
-		</activity>
-<!--	Run tabbed pages -->
+			android:exported="false"></activity> <!-- Run tabbed pages -->
 		<activity
 			android:name=".Tabbed_User"
 			android:exported="false"
-			android:theme="@style/Theme.Esake.NoActionBar">
-		</activity>
+			android:theme="@style/Theme.Esake.NoActionBar"></activity>
 		<activity
 			android:name=".Tabbed_Stats_Manager"
 			android:exported="false"
-			android:theme="@style/Theme.Esake.NoActionBar" >
-		</activity>
-    </application>
+			android:theme="@style/Theme.Esake.NoActionBar"></activity>
+	</application>
+
 </manifest>