Merge branch 'master' of https://github.com/wncc/InstiApp into nss

.circleci/config.yml

+version: 2
+jobs:
+  build:
+    working_directory: ~/code
+    docker:
+      - image: circleci/android:api-28-alpha
+    environment:
+      JVM_OPTS: -Xmx3200m
+    steps:
+      - checkout
+      - restore_cache:
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Download Dependencies
+          command: ./gradlew androidDependencies
+      - save_cache:
+          paths:
+            - ~/.gradle
+          key: jars-{{ checksum "build.gradle" }}-{{ checksum  "app/build.gradle" }}
+      - run:
+          name: Run Lint
+          command: ./gradlew lint
+      - store_artifacts:
+          path: app/build/reports
+          destination: reports

README.md

@@ -5,6 +5,9 @@ InstiApp
 All IITB content in one place. InstiApp is the result of WnCC's coordinated efforts to build an application that makes it easier to discover IITB content on the go.
 InstiApp features the Placement Blog, Upcoming Events and general information on every active club/body in the Institute
 
+[![CircleCI](https://circleci.com/gh/wncc/InstiApp/tree/master.svg?style=shield)](https://circleci.com/gh/wncc/InstiApp/tree/master)
+[![GitHub license](https://img.shields.io/github/license/wncc/InstiApp.svg)](https://github.com/wncc/InstiApp/blob/master/LICENSE.md)
+[![Codacy Badge](https://api.codacy.com/project/badge/Grade/7807da12fc174c3da45ad538ebc170d3)](https://www.codacy.com/app/wncc/InstiApp?utm_source=github.com&utm_medium=referral&utm_content=wncc/InstiApp&utm_campaign=Badge_Grade)
 
 ### Features:
 * Events Directory
@@ -26,7 +29,7 @@ Check http://github.com/wncc for more information about all development activiti
 Development
 -----------
 
-Read the [Development Documentation](https://iitbapp1.docs.apiary.io/).
+Read the [API Documentation](https://wncc.github.io/IITBapp/).
 
 See the [Frontend Design](https://drive.google.com/open?id=1YJRUvsyqR5QtfWYug_PoBJ08p-criCPo).
 

app/build.gradle

@@ -8,8 +8,8 @@ android {
         manifestPlaceholders 'appAuthRedirectScheme': 'https'
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 18
-        versionName "1.0.12-beta2"
+        versionCode 20
+        versionName "1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }

app/src/main/java/app/insti/fragment/BodyFragment.java

@@ -30,6 +30,7 @@ import android.widget.Toast;
 
 import com.google.gson.Gson;
 
+import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -184,6 +185,7 @@ public class BodyFragment extends BackHandledFragment {
         if (!body.equals(min_body)) bodyDisplayed = true;
 
         TextView bodyName = (TextView) getView().findViewById(R.id.body_name);
+        TextView bodySubtitle = getView().findViewById(R.id.body_subtitle);
         TextView bodyDescription = (TextView) getView().findViewById(R.id.body_description);
         bodyPicture = (ImageView) getActivity().findViewById(R.id.body_picture);
         ImageButton webBodyButton = getActivity().findViewById(R.id.web_body_button);
@@ -198,6 +200,7 @@ public class BodyFragment extends BackHandledFragment {
 
         /* Set body information */
         bodyName.setText(body.getBodyName());
+        bodySubtitle.setText(body.getBodyShortDescription());
         Utils.loadImageWithPlaceholder(bodyPicture, body.getBodyImageURL());
 
         bodyPicture.setOnClickListener(new View.OnClickListener() {

app/src/main/java/app/insti/fragment/DataFragment.java

+package app.insti.fragment;
+
+public class DataFragment {
+}

app/src/main/res/layout/blog_post_card.xml

@@ -11,8 +11,7 @@
         android:layout_height="wrap_content"
         android:fontFamily="sans-serif-light"
         android:textColor="#000000"
-        android:textSize="22sp"
-        android:textStyle="bold" />
+        android:textSize="24sp" />
 
     <TextView
         android:id="@+id/post_published"
@@ -23,7 +22,7 @@
         android:id="@+id/post_content"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
+        android:layout_marginTop="4dp"
         android:textColor="#000000"
         android:textColorLink="@color/colorPrimary" />
 </LinearLayout>
\ No newline at end of file

app/src/main/res/layout/fragment_body.xml

@@ -92,6 +92,12 @@
                                     android:src="@drawable/ic_menu_share"
                                     android:tint="@color/colorWhite" />
                             </LinearLayout>
+
+                            <TextView
+                                android:id="@+id/body_subtitle"
+                                android:layout_width="wrap_content"
+                                android:layout_height="wrap_content"
+                                android:textColor="@color/colorWhite" />
                         </LinearLayout>
                     </android.support.v7.widget.CardView>
 
@@ -132,6 +138,7 @@
                         android:layout_marginStart="10dp"
                         android:layout_marginTop="12dp"
                         android:textColor="#333"
+                        android:textColorLink="@color/colorPrimary"
                         android:textSize="16sp" />
 
                     <TextView

app/src/main/res/layout/fragment_event.xml

@@ -206,6 +206,7 @@
                         android:layout_marginStart="10dp"
                         android:layout_marginTop="12dp"
                         android:textColor="#333"
+                        android:textColorLink="@color/colorPrimary"
                         android:textSize="16sp" />
 
                     <android.support.v7.widget.RecyclerView