From eedd58567bf06e509c4d7834c9c07bcc12e8bb5d Mon Sep 17 00:00:00 2001
From: ramola <sramola5@gmail.com>
Date: Mon, 13 Mar 2017 18:19:10 +0530
Subject: [PATCH] Finished V-1.1

---
 app/build.gradle                              |  5 ---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../nimbus/Activity/AboutActivity.java        |  2 +-
 app/src/main/res/layout/activity_about.xml    | 34 -------------------
 app/src/main/res/layout/fragment_fblogin.xml  |  4 +--
 app/src/main/res/values/strings.xml           |  2 +-
 build.gradle                                  |  2 +-
 gradle/wrapper/gradle-wrapper.properties      |  2 +-
 8 files changed, 7 insertions(+), 46 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_about.xml

diff --git a/app/build.gradle b/app/build.gradle
index 1fd747a..83f17bc 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,9 +42,4 @@ dependencies {
     compile 'com.github.jd-alexander:LikeButton:0.2.0'
     compile 'com.cloudinary:cloudinary-android:1.2.2'
     compile 'com.android.support:palette-v7:25.0.1'
-
-    compile 'net.steamcrafted:load-toast:1.0.10'
-    compile 'com.squareup.okhttp3:logging-interceptor:3.2.0'
-    compile 'com.github.florent37:materialleanback:1.0.2'
-    compile 'com.nineoldandroids:library:2.4.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 952a1d2..e2a8dd0 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -140,7 +140,7 @@
         <activity
             android:name=".Activity.AboutActivity"
             android:label="@string/title_activity_about"
-            android:theme="@style/AppTheme">
+            android:theme="@style/AppTheme.NoActionBar">
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.nith.appteam.nimbus.Activity.MainActivity" />
diff --git a/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java b/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java
index 3441a24..034eddc 100644
--- a/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java
+++ b/app/src/main/java/com/nith/appteam/nimbus/Activity/AboutActivity.java
@@ -22,7 +22,7 @@ public class AboutActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_about);
+        setContentView(R.layout.content_about);
         initCollapsingToolbar();
         toolbar = (Toolbar) findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
deleted file mode 100644
index c8a6b68..0000000
--- a/app/src/main/res/layout/activity_about.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
-    tools:context="com.nith.appteam.nimbus.Activity.AboutActivity">
-
-    <android.support.design.widget.AppBarLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:theme="@style/AppTheme.AppBarOverlay">
-
-        <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="?attr/actionBarSize"
-            android:background="?attr/colorPrimary"
-            app:popupTheme="@style/AppTheme.PopupOverlay" />
-
-    </android.support.design.widget.AppBarLayout>
-
-    <include layout="@layout/content_about" />
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        android:src="@android:drawable/ic_dialog_email" />
-
-</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_fblogin.xml b/app/src/main/res/layout/fragment_fblogin.xml
index 2f2c484..9527d9a 100644
--- a/app/src/main/res/layout/fragment_fblogin.xml
+++ b/app/src/main/res/layout/fragment_fblogin.xml
@@ -9,7 +9,7 @@
             android:layout_height="320dp"
             android:layout_centerHorizontal="true"
             android:layout_marginTop="54dp"
-            android:src="@drawable/nimbuslogo" />
+            android:src="@drawable/logo_b_t" />
 
         <ProgressBar
             android:id="@+id/pbLogin"
@@ -46,6 +46,6 @@
                 android:textSize="16dp"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
-                android:layout_marginBottom="100dp" />
+                android:layout_marginBottom="200dp" />
 
     </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8767c55..f90d95b 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">Nimbus 2k17</string>
+    <string name="app_name">Udgham</string>
     <string name="title_activity_appintro">appintro</string>
     <string name="next">Next</string>
     <string name="skip">Skip</string>
diff --git a/build.gradle b/build.gradle
index 997f140..78acd74 100644
--- a/build.gradle
+++ b/build.gradle
@@ -11,7 +11,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.0'
+        classpath 'com.android.tools.build:gradle:2.2.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 9a56d3c..23b3820 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip