release 🚀

GOVINDDIXIT · Dec 12, 2020 · 35ac97c · 35ac97c
1 parent 46118cc
commit 35ac97c
Show file tree

Hide file tree

Showing 6 changed files with 102 additions and 23 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -4,13 +4,13 @@ apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     defaultConfig {
         applicationId "govind.iiitl.app"
         minSdkVersion 16
-        targetSdkVersion 28
-        versionCode 7
-        versionName "2.5.2"
+        targetSdkVersion 30
+        versionCode 9
+        versionName "2.6.0"
         compileOptions {
             sourceCompatibility JavaVersion.VERSION_1_8
             targetCompatibility JavaVersion.VERSION_1_8

diff --git a/app/src/main/java/govind/iiitl/app/MainActivity.kt b/app/src/main/java/govind/iiitl/app/MainActivity.kt
@@ -118,7 +118,7 @@ class MainActivity : AppCompatActivity() {
     private val isNetworkConnected: Boolean
         get() {
             val cm = (getSystemService(CONNECTIVITY_SERVICE) as ConnectivityManager)
-            return cm.activeNetworkInfo != null && cm.activeNetworkInfo.isConnected
+            return cm.activeNetworkInfo != null && cm.activeNetworkInfo!!.isConnected
         }
 
     private fun setUpToolbar() {

diff --git a/app/src/main/java/govind/iiitl/app/activities/AboutPageActivity.java b/app/src/main/java/govind/iiitl/app/activities/AboutPageActivity.java
@@ -1,5 +1,6 @@
 package govind.iiitl.app.activities;
 
+import android.content.ActivityNotFoundException;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.graphics.Color;
@@ -27,13 +28,15 @@ protected void onCreate(Bundle savedInstanceState) {
         LinearLayout fork = findViewById(R.id.Star_on_github);
         LinearLayout developers = findViewById(R.id.developers);
         LinearLayout rateApp = findViewById(R.id.rate_the_app);
+        LinearLayout sendMail = findViewById(R.id.send_mail);
         ImageView dsc_about = findViewById(R.id.dsc_about);
         TextView versionTextView = findViewById(R.id.app_version);
 
         fork.setOnClickListener(this);
         developers.setOnClickListener(this);
         rateApp.setOnClickListener(this);
         dsc_about.setOnClickListener(this);
+        sendMail.setOnClickListener(this);
 
         try {
             versionName = getApplicationContext().getPackageManager()
@@ -61,11 +64,24 @@ public void onClick(View view) {
             case R.id.dsc_about:
                 chromeCustomTabs(getResources().getString(R.string.dsc_website));
                 break;
+            case R.id.send_mail:
+                sendArticle();
+                break;
             default:
                 break;
         }
     }
 
+    private void sendArticle() {
+        String mailto = "mailto:dsc@iiitl.ac.in?subject=Question Paper submission";
+        Intent emailIntent = new Intent(Intent.ACTION_SENDTO);
+        emailIntent.setData(Uri.parse(mailto));
+        try {
+            startActivity(emailIntent);
+        } catch (ActivityNotFoundException e) {
+        }
+    }
+
     private void chromeCustomTabs(String url) {
         CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder();
         builder.setToolbarColor(Color.parseColor("#000000"));

diff --git a/app/src/main/java/govind/iiitl/app/activities/signIn/Login.kt b/app/src/main/java/govind/iiitl/app/activities/signIn/Login.kt
@@ -26,9 +26,10 @@ class Login : AppCompatActivity() {
         } else {
             //Init Providers
             providers = listOf(
-                EmailBuilder().build(),  //  new AuthUI.IdpConfig.PhoneBuilder().build(),
+                EmailBuilder().build()
+                //  new AuthUI.IdpConfig.PhoneBuilder().build(),
                 //  new AuthUI.IdpConfig.FacebookBuilder().build(),
-                GoogleBuilder().build()
+                // GoogleBuilder().build()
             )
             showSignInOptions()
         }

diff --git a/app/src/main/res/layout/activity_about_page.xml b/app/src/main/res/layout/activity_about_page.xml
@@ -224,23 +224,87 @@
             </LinearLayout>
 
         </androidx.cardview.widget.CardView>
+
+        <androidx.cardview.widget.CardView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="8dp"
+            app:cardCornerRadius="8dp"
+            app:cardUseCompatPadding="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="8dp"
+                android:orientation="vertical">
+
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="32dp"
+                    android:layout_marginLeft="32dp"
+                    android:orientation="vertical"
+                    android:paddingBottom="8dp">
+
+
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/send_mail"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="@drawable/background"
+                    android:clickable="true"
+                    android:focusable="true"
+                    android:gravity="center_vertical"
+                    android:minHeight="@dimen/md_listitem_height"
+                    android:orientation="horizontal"
+                    android:paddingLeft="16dp"
+                    android:paddingRight="16dp">
+
+                    <ImageView
+                        android:id="@+id/Submit_email_image"
+                        android:layout_width="24dp"
+                        android:layout_height="24dp"
+                        app:srcCompat="@drawable/ic_email"
+                        tools:ignore="ContentDescription,UnusedAttribute,VectorDrawableCompat" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginStart="32dp"
+                        android:layout_marginLeft="32dp"
+                        android:fontFamily="@font/qs"
+                        android:paddingTop="8dp"
+                        android:paddingBottom="8dp"
+                        android:text="Submit Your Question Paper"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+                </LinearLayout>
+
+
+            </LinearLayout>
+
+        </androidx.cardview.widget.CardView>
     </LinearLayout>
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_alignParentBottom="true"
         android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
         android:gravity="center"
-        android:padding="10dp"
-        android:orientation="horizontal">
+        android:orientation="horizontal"
+        android:padding="10dp">
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#ffffff"
-            android:textSize="16sp"
             android:fontFamily="@font/qs"
-            android:text="Made with" />
+            android:text="Made with"
+            android:textColor="#ffffff"
+            android:textSize="16sp" />
 
         <ImageView
             android:layout_width="22dp"
@@ -251,26 +315,26 @@
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:fontFamily="@font/qs"
-            android:textSize="16sp"
             android:layout_marginLeft="7dp"
+            android:fontFamily="@font/qs"
+            android:text="by"
             android:textColor="#ffffff"
-            android:text="by" />
+            android:textSize="16sp" />
 
         <ImageView
+            android:id="@+id/dsc_about"
             android:layout_width="48dp"
             android:layout_height="48dp"
-            android:id="@+id/dsc_about"
             android:src="@drawable/dsc_logo" />
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:fontFamily="@font/qs"
-            android:textSize="16sp"
+            android:text="DSC IIITL"
             android:textColor="#ffffff"
-            android:textStyle="bold"
-            android:text="DSC IIITL" />
+            android:textSize="16sp"
+            android:textStyle="bold" />
     </LinearLayout>
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"
-        android:background="@android:color/black">
+        android:background="@color/colorBackground">
 
         <androidx.appcompat.widget.Toolbar
             android:id="@+id/toolbar"
@@ -34,7 +34,6 @@
             android:layout_width="360dp"
             android:layout_height="360dp"
             android:layout_marginTop="72dp"
-            android:background="@android:color/black"
             android:src="@drawable/ic_no_network"
             android:visibility="visible" />
 
@@ -55,7 +54,6 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/postList"
                 android:layout_width="match_parent"
-                android:background="@android:color/black"
                 android:layout_height="match_parent">
             </androidx.recyclerview.widget.RecyclerView>