About MAC Activity Changes

androidClient/app/src/main/java/com/macbitsgoa/comrades/aboutmac/AboutMacActivity.java

@@ -27,7 +27,7 @@ public class AboutMacActivity extends AppCompatActivity implements View.OnClickL
     public static String ABOUT_US_FACEBOOK_PAGE_ID = "MACBITSGoa";
     public static String ABOUT_US_GITHUB_URL = "https://github.com/MobileApplicationsClub/";
     public static String ABOUT_US_LINKEDIN_URL = "https://www.linkedin.com/company/mobile-applications-club/";
-    public static String ABOUT_US_MACWEBSITE_URL = "https://macbitsgoa.com/";
+    public static String ABOUT_US_MACWEBSITE_URL = "https://devsoc.club/";
     public static String ABOUT_APP_TITLE = "About App";
 
     @Override

androidClient/app/src/main/res/layout/content_about_us.xml

@@ -20,9 +20,9 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:text="@string/app_name"
-        android:fontFamily="@font/ps_bold"
-        android:textColor="@color/colorPrimary"
-        android:textSize="20sp"
+        android:fontFamily="@font/ps_ethnocentric"
+        android:textColor="#1d3a40"
+        android:textSize="30sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
@@ -37,8 +37,8 @@
         android:layout_marginStart="16dp"
         android:layout_marginTop="8dp"
         android:text="@string/app_version"
-        android:fontFamily="@font/ps_bold"
-        android:textColor="@color/colorPrimary"
+        android:fontFamily="@font/ps_sourceserifproregular"
+        android:textColor="#1d3a40"
         android:textSize="12sp"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -49,8 +49,8 @@
         android:layout_width="0dp"
         android:layout_height="200dp"
         android:layout_marginTop="8dp"
-        android:background="@color/colorPrimary"
-        android:src="@drawable/maclogopng"
+        android:background="#ffffff"
+        android:src="@drawable/devsoclogo"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/content_about_us_app_version_tv" />
@@ -109,7 +109,7 @@
 
     <ImageButton
         android:id="@+id/content_about_us_macweb"
-        android:layout_width="24dp"
+        android:layout_width="30dp"
         android:layout_height="24dp"
         android:scaleType="fitCenter"
         android:layout_margin="4dp"
@@ -119,19 +119,21 @@
         app:layout_constraintLeft_toRightOf="@+id/content_about_us_linkedin"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/content_about_us_mac_img"
-        app:srcCompat="@drawable/ic_macweb_icon" />
+        app:srcCompat="@drawable/devsoclogo2" />
 
     <TextView
         android:id="@+id/content_about_us_desc_tv"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:textColor="#1d3a40"
+        android:textStyle="bold"
         android:layout_marginEnd="16dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:gravity="center"
-        android:fontFamily="@font/ps_regular"
+        android:fontFamily="@font/ps_sourceserifproregular"
         android:text="@string/about_mac_main"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
@@ -143,9 +145,11 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
+        android:textColor="#1d3a40"
+        android:textStyle="bold"
         android:gravity="center"
         android:padding="8dp"
-        android:fontFamily="@font/ps_bold"
+        android:fontFamily="@font/ps_sourceserifproregular"
         android:text="@string/about_mac_contributors"
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/content_about_us_desc_tv" />

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

@@ -1,8 +1,8 @@
 <!--suppress ALL -->
 <resources>
     <string name="app_name">Comrades</string>
-    <string name="app_version">Version 1</string>
-    <string name="about_mac_main">Comrades is a free, handy and open file sharing platform by Mobile Applications Club for students of BITS Goa, to become their companion in acads and everyday life. This app allows you to add to the library of content already present and hence creates an ever-growing storage of knowledge and information. So, next time you need a file, you\'ll surely find it on Comrades.</string>
+    <string name="app_version">Version 2</string>
+    <string name="about_mac_main">Comrades is a free, handy and open file sharing platform by Developers Society for students of BITS Goa, to become their companion in acads and everyday life. This app allows you to add to the library of content already present and hence creates an ever-growing storage of knowledge and information. So, next time you need a file, you\'ll surely find it on Comrades.</string>
     <string name="about_mac_contributors"><b>Contributors</b></string>
     <string name="title_activity_sign_in">SignInActivity</string>
     <string name="title_activity_download">DownloadActivity</string>

androidClient/build.gradle

@@ -1,13 +1,13 @@
 buildscript {
-    ext.kotlin_version = '1.2.71'
+    ext.kotlin_version = '1.3.10'
     repositories {
         maven { url 'https://maven.fabric.io/public' }
         google()
         jcenter()
     }
     dependencies {
         classpath 'io.fabric.tools:gradle:1.25.4'
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath 'com.google.gms:google-services:4.0.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }

androidClient/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Sep 30 10:57:14 IST 2018
+#Wed Feb 05 19:41:38 IST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip