Merge pull request #81 from iot-lab-kiit/master

Syncing with master

app/proguard-rules.pro

@@ -1,160 +1,90 @@
--if class androidx.credentials.CredentialManager
--keep class androidx.credentials.playservices.** {
-  *;
-}
-# Preserve annotations
--keepattributes *Annotation*
-
-# Preserve all classes that extend Android's base components
--keep public class * extends android.app.Activity
--keep public class * extends android.app.Service
--keep public class * extends android.app.Application
--keep public class * extends android.content.BroadcastReceiver
--keep public class * extends android.content.ContentProvider
-
-# Preserve custom views
--keep class * extends android.view.View {
-    public <init>(android.content.Context);
-    public <init>(android.content.Context, android.util.AttributeSet);
-    public <init>(android.content.Context, android.util.AttributeSet, int);
-}
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+-renamesourcefileattribute SourceFile
+
+#Coroutines---------------------------------------------------------
+-keepattributes Signature
+-keep class kotlin.coroutines.Continuation
+#Coroutines---------------------------------------------------------
 
-# Preserve Parcelable classes
--keepclassmembers class * implements android.os.Parcelable {
-    static ** CREATOR;
-}
+#Retrofit-----------------------------------------------------------
+-if interface * { @retrofit2.http.* *** *(...); }
+-keep,allowobfuscation interface <3>
 
-# Preserve Serializable classes
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object readResolve();
-}
+-keep,allowobfuscation,allowshrinking interface retrofit2.Call
+#Retrofit-----------------------------------------------------------
 
-# Preserve the names of methods and fields related to data binding
--keep class androidx.databinding.** { *; }
--keep class com.android.databinding.library.baseAdapters.** { *; }
--keepclassmembers class * extends androidx.databinding.ViewDataBinding {
-    public static final androidx.databinding.ViewDataBinding bind(android.view.View);
-    public static final androidx.databinding.ViewDataBinding bind(android.view.View, java.lang.Object);
-    public static final androidx.databinding.ViewDataBinding inflate(android.view.LayoutInflater);
-    public static final androidx.databinding.ViewDataBinding inflate(android.view.LayoutInflater, android.view.ViewGroup, boolean);
-    public static final androidx.databinding.ViewDataBinding inflate(android.view.LayoutInflater, android.view.ViewGroup, boolean, java.lang.Object);
+#Gson---------------------------------------------------------------
+-keepclassmembers,allowobfuscation class * {
+ @com.google.gson.annotations.SerializedName <fields>;
 }
 
-# Preserve all classes that use Retrofit
 -keepattributes Signature
--keepattributes Exceptions
--keepattributes *Annotation*
+-keep class com.google.gson.reflect.TypeToken { *; }
+-keep class * extends com.google.gson.reflect.TypeToken
+#Gson---------------------------------------------------------------
 
--keepclasseswithmembers class * {
-    @retrofit2.http.* <methods>;
-}
+# Keep application classes
+-keep class in.iot.lab.** { *; }
 
--keepclasseswithmembers interface * {
-    @retrofit2.http.* <methods>;
+# Keep classes that are referenced in your XML layouts
+-keepclassmembers class * {
+    @androidx.annotation.LayoutRes <init>(...);
 }
-#OkHttp Rules
--dontwarn retrofit2.**
--dontwarn okio.**
--dontwarn okhttp3.**
 
--dontwarn okhttp3.internal.platform.**
--dontwarn org.conscrypt.**
--dontwarn org.bouncycastle.**
--dontwarn org.openjsse.**
-
-
-##---------------Begin: proguard configuration for Gson  ----------
-# Gson uses generic type information stored in a class file when working with fields. Proguard
-# removes such information by default, so configure it to keep all of it.
--keepattributes Signature
-
-# For using GSON @Expose annotation
--keepattributes *Annotation*
-
-# Gson specific classes
--dontwarn sun.misc.**
-#-keep class com.google.gson.stream.** { *; }
-
-# Application classes that will be serialized/deserialized over Gson
--keep class com.google.gson.examples.android.model.** { <fields>; }
-
-# Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
-# JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)
--keep class * extends com.google.gson.TypeAdapter
--keep class * implements com.google.gson.TypeAdapterFactory
--keep class * implements com.google.gson.JsonSerializer
--keep class * implements com.google.gson.JsonDeserializer
-
-# Prevent R8 from leaving Data object members always null
--keepclassmembers,allowobfuscation class * {
-  @com.google.gson.annotations.SerializedName <fields>;
+# Keep ViewModel classes
+-keep class * extends androidx.lifecycle.ViewModel {
+    <init>();
 }
 
-# Retain generic signatures of TypeToken and its subclasses with R8 version 3.0 and higher.
--keep,allowobfuscation,allowshrinking class com.google.gson.reflect.TypeToken
--keep,allowobfuscation,allowshrinking class * extends com.google.gson.reflect.TypeToken
-
-##---------------End: proguard configuration for Gson  ----------
-
--keep class androidx.lifecycle.LiveData { *; }
-
-# Retrofit does reflection on generic parameters. InnerClasses is required to use Signature and
-# EnclosingMethod is required to use InnerClasses.
--keepattributes Signature, InnerClasses, EnclosingMethod
-
-# Retrofit does reflection on method and parameter annotations.
--keepattributes RuntimeVisibleAnnotations, RuntimeVisibleParameterAnnotations
-
-# Keep annotation default values (e.g., retrofit2.http.Field.encoded).
--keepattributes AnnotationDefault
+# Keep Hilt-related classes
+-keep class dagger.** { *; }
+-keep class javax.inject.** { *; }
+-keepclassmembers class * {
+    @dagger.Provides *;
+    @dagger.Binds *;
+}
 
-# Retain service method parameters when optimizing.
--keepclassmembers,allowshrinking,allowobfuscation interface * {
+# Keep Retrofit and OkHttp interfaces and their methods
+-keep interface retrofit2.** {
+    *;
+}
+-keepclasseswithmembers class * {
     @retrofit2.http.* <methods>;
 }
 
-# Ignore annotation used for build tooling.
--dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
-
-# Ignore JSR 305 annotations for embedding nullability information.
--dontwarn javax.annotation.**
-
-# Guarded by a NoClassDefFoundError try/catch and only used when on the classpath.
--dontwarn kotlin.Unit
-
-# Top-level functions that can only be used by Kotlin.
--dontwarn retrofit2.KotlinExtensions
--dontwarn retrofit2.KotlinExtensions$*
-
-# With R8 full mode, it sees no subtypes of Retrofit interfaces since they are created with a Proxy
-# and replaces all potential values with null. Explicitly keeping the interfaces prevents this.
--if interface * { @retrofit2.http.* <methods>; }
--keep,allowobfuscation interface <1>
-
-# Keep inherited services.
--if interface * { @retrofit2.http.* <methods>; }
--keep,allowobfuscation interface * extends <1>
-
-# With R8 full mode generic signatures are stripped for classes that are not
-# kept. Suspend functions are wrapped in continuations where the type argument
-# is used.
--keep,allowobfuscation,allowshrinking class kotlin.coroutines.Continuation
-
-# R8 full mode strips generic signatures from return types if not kept.
--if interface * { @retrofit2.http.* public *** *(...); }
--keep,allowoptimization,allowshrinking,allowobfuscation class <3>
-
-# With R8 full mode generic signatures are stripped for classes that are not kept.
--keep,allowobfuscation,allowshrinking class retrofit2.Response
+# Keep GSON and Moshi model classes
+-keepclassmembers class * {
+    @com.google.gson.annotations.SerializedName <fields>;
+}
 
-#keep data classes
--keep class in.iot.lab.teacherreview.domain.models.** { <fields>; }
+# Keep Firebase and Play Services classes
+-keep class com.google.firebase.** { *; }
+-keep class com.google.android.gms.** { *; }
 
-# slf4j error during build
--dontwarn org.slf4j.impl.StaticLoggerBinder
+# Keep annotation classes (for Kotlin reflection)
+-keepclasseswithmembers public class * {
+    kotlin.Metadata *;
+}
 
-# some unknown error
--dontwarn java.lang.invoke.StringConcatFactory
+# Keep classes used by Kotlin reflection
+-dontwarn kotlin.reflect.**
+-dontwarn kotlin.Metadata

app/src/main/res/values/colors.xml

@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
-    <color name="teal_200">#FF03DAC5</color>
-    <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
 </resources>

app/src/main/res/values/strings.xml

@@ -1,48 +1,3 @@
 <resources>
     <string name="app_name">IoT Teacher Review</string>
-    <string name="email_id">Email ID</string>
-    <string name="enter_password">Enter Password</string>
-    <string name="login">Login With Google</string>
-    <string name="create_an_account">Create an Account</string>
-    <string name="enter_name">Enter Name</string>
-    <string name="enter_phone_number">Enter Phone Number</string>
-    <string name="re_enter_password">Re-Enter Password</string>
-    <string name="sign_up">Sign Up</string>
-    <string name="already_have_an_account">Already Have an Account</string>
-    <string name="title_activity_home">HomeActivity</string>
-    <string name="home">Home</string>
-    <string name="history">History</string>
-    <string name="profile">Profile</string>
-    <string name="dont_have_anything_to_show">Database is Empty!! Enter a Data yourself or Try Again Later</string>
-    <string name="back">Back</string>
-    <string name="star">star</string>
-    <string name="show_more_details">show more Details</string>
-    <string name="failed_to_load_tap_to_retry">Failed To Load !! Tap to Retry</string>
-    <string name="reviews">Reviews</string>
-    <string name="teaching_rating">Teaching Rating</string>
-    <string name="marking_rating">Marking Rating</string>
-    <string name="attendance_rating">Attendance Rating</string>
-    <string name="overall_rating">Overall Rating</string>
-
-    <string name="overall_review">Overall Review</string>
-    <string name="marking_review">Marking Review</string>
-    <string name="teaching_review">Teaching Review</string>
-    <string name="attendance_review">Attendance Review</string>
-
-    <string name="submit_review">Submit Review</string>
-
-    <string name="add">Add</string>
-    <string name="minus">Minus</string>
-    <string name="add_your_review">Add Your Review</string>
-    <string name="comment">Comment</string>
-    <string name="add_review">Add Review</string>
-    <string name="add_rating">Add Rating</string>
-
-    <string name="semester">Semester</string>
-
-    <string name="roll_number">Roll Number</string>
-    <string name="web_client_id">725298587648-vvacnojh148tv2qb7rk3kqbqumbubhe2.apps.googleusercontent.com</string>
-    <string name="hero_title">Find the right college professor for you</string>
-    <string name="hero_desc">Explore and share your experiences with teachers at our college to help others make informed decisions.</string>
-
 </resources>

app/src/main/res/values/themes.xml

@@ -3,7 +3,5 @@
 
     <style name="Theme.IoTTeacherReview" parent="android:Theme.Material.Light.NoActionBar">
         <item name="android:statusBarColor">@color/black</item>
-        <!--        <item name="android:statusBarColor">@android:color/transparent</item>-->
-        <!--        <item name="android:windowLightStatusBar">?attr/isLightTheme</item>-->
     </style>
 </resources>

auth/proguard-rules.pro

@@ -18,4 +18,8 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile
+-if class androidx.credentials.CredentialManager
+-keep class androidx.credentials.playservices.** {
+  *;
+}

auth/src/main/java/in/iot/lab/auth/view/components/AuthOnBoarding.kt

@@ -1,26 +1,18 @@
 package `in`.iot.lab.auth.view.components
 
 import android.content.res.Configuration
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
-import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
-import `in`.iot.lab.auth.R
 import `in`.iot.lab.design.components.AppScreen
-import `in`.iot.lab.design.components.LoginAnim
+import `in`.iot.lab.design.animations.OnBoardingAnimation
 import `in`.iot.lab.design.theme.CustomAppTheme
 
 
@@ -51,32 +43,26 @@ fun AuthOnBoarding(modifier: Modifier = Modifier) {
 
     Column(
         modifier = modifier,
-        verticalArrangement = Arrangement.Center,
+        verticalArrangement = Arrangement.spacedBy(16.dp),
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
+
         // Title Text
         Text(
             text = "Find the right college professor for you",
-            style = MaterialTheme.typography.headlineLarge.copy(
-                fontWeight = FontWeight.Bold,
-                lineHeight = 32.sp,
-            ),
+            style = MaterialTheme.typography.headlineLarge,
             textAlign = TextAlign.Center
         )
 
         // Caption Text
         Text(
             text = "Explore and share your experiences with teachers at our college to help " +
                     "others make informed decisions.",
-            style = MaterialTheme.typography.bodyLarge.copy(
-                lineHeight = 18.sp,
-                fontWeight = FontWeight.SemiBold
-            ),
+            style = MaterialTheme.typography.titleMedium,
             textAlign = TextAlign.Center
         )
 
-        // Onboarding Image
-        LoginAnim()
-
+        // OnBoarding Animation
+        OnBoardingAnimation()
     }
 }