+ 1581170116947
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/androidClient/app/src/main/java/com/macbitsgoa/comrades/aboutmac/AboutMacActivity.java b/androidClient/app/src/main/java/com/macbitsgoa/comrades/aboutmac/AboutMacActivity.java
index 4917dbe..7bac271 100644
--- a/androidClient/app/src/main/java/com/macbitsgoa/comrades/aboutmac/AboutMacActivity.java
+++ b/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
diff --git a/androidClient/app/src/main/res/drawable/devsoclogo.jpg b/androidClient/app/src/main/res/drawable/devsoclogo.jpg
new file mode 100644
index 0000000..26a7a95
Binary files /dev/null and b/androidClient/app/src/main/res/drawable/devsoclogo.jpg differ
diff --git a/androidClient/app/src/main/res/drawable/devsoclogo2.jpg b/androidClient/app/src/main/res/drawable/devsoclogo2.jpg
new file mode 100644
index 0000000..0eaf396
Binary files /dev/null and b/androidClient/app/src/main/res/drawable/devsoclogo2.jpg differ
diff --git a/androidClient/app/src/main/res/font/ps_ethnocentric.ttf b/androidClient/app/src/main/res/font/ps_ethnocentric.ttf
new file mode 100755
index 0000000..7be5996
Binary files /dev/null and b/androidClient/app/src/main/res/font/ps_ethnocentric.ttf differ
diff --git a/androidClient/app/src/main/res/font/ps_sourceserifproregular.ttf b/androidClient/app/src/main/res/font/ps_sourceserifproregular.ttf
new file mode 100644
index 0000000..e985b61
Binary files /dev/null and b/androidClient/app/src/main/res/font/ps_sourceserifproregular.ttf differ
diff --git a/androidClient/app/src/main/res/layout/content_about_us.xml b/androidClient/app/src/main/res/layout/content_about_us.xml
index 0d0d411..eecd854 100644
--- a/androidClient/app/src/main/res/layout/content_about_us.xml
+++ b/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 @@
+ app:srcCompat="@drawable/devsoclogo2" />
diff --git a/androidClient/app/src/main/res/values/strings.xml b/androidClient/app/src/main/res/values/strings.xml
index faaefc6..d3714e3 100644
--- a/androidClient/app/src/main/res/values/strings.xml
+++ b/androidClient/app/src/main/res/values/strings.xml
@@ -1,8 +1,8 @@
Comrades
- Version 1
- 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.
+ Version 2
+ 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.ContributorsSignInActivityDownloadActivity
diff --git a/androidClient/build.gradle b/androidClient/build.gradle
index 7a80f85..9cae1c1 100644
--- a/androidClient/build.gradle
+++ b/androidClient/build.gradle
@@ -1,5 +1,5 @@
buildscript {
- ext.kotlin_version = '1.2.71'
+ ext.kotlin_version = '1.3.10'
repositories {
maven { url 'https://maven.fabric.io/public' }
google()
@@ -7,7 +7,7 @@ buildscript {
}
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"
}
diff --git a/androidClient/gradle/wrapper/gradle-wrapper.properties b/androidClient/gradle/wrapper/gradle-wrapper.properties
index 24336e5..dc2d21a 100644
--- a/androidClient/gradle/wrapper/gradle-wrapper.properties
+++ b/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