Merge pull request #16 from UdacityAndroidBasicsScholarship/UI

[commits by Mahima @amy6]

Author: MadhavBangaru

.idea/caches/build_file_checksums.ser

@@ -2,11 +2,11 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 27
     defaultConfig {
         applicationId "com.example.dhananjay.dailygoals"
-        minSdkVersion 15
-        targetSdkVersion 26
+        minSdkVersion 21
+        targetSdkVersion 27
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -21,13 +21,13 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support:appcompat-v7:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:0.5'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:2.2.2'
-    implementation 'com.android.support:cardview-v7:26.1.0'
-    implementation 'com.android.support:design:26.1.0'
+    androidTestImplementation 'com.android.support.test:runner:1.0.1'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.android.support:cardview-v7:27.1.1'
+    implementation 'com.android.support:design:27.1.1'
     implementation 'com.squareup.retrofit2:retrofit:2.3.0'
-    implementation 'com.android.support:recyclerview-v7:26.1.0'
+    implementation 'com.android.support:recyclerview-v7:27.1.1'
 }

.idea/codeStyles/Project.xml

@@ -0,0 +1,70 @@
+package com.example.dhananjay.dailygoals;
+
+import android.content.Context;
+import android.support.annotation.NonNull;
+import android.support.design.widget.BottomNavigationView;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.v4.view.ViewCompat;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.View;
+
+import static java.lang.Math.max;
+import static java.lang.Math.min;
+
+
+public class BottomNavigationBehavior extends CoordinatorLayout.Behavior<BottomNavigationView> {
+
+        /**
+         * Default constructor for instantiating the behavior
+         */
+    public BottomNavigationBehavior() {
+        super();
+    }
+
+    /**
+     * Default constructor for inflating behaviors from the layout
+     *
+     * @param context
+     * @param attrs
+     */
+
+    public BottomNavigationBehavior(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+
+    /**
+     * @param coordinatorLayout the CoordinatorLayout with which the behavior is associated
+     * @param child             the child view of the CoordinatorLayout this behavior is associated with
+     * @param directTargetChild the child view of the CoordinatorLayout that either is or contains the view that is the target of nested
+     *                          scrolling operation
+     * @param target            the descendant of the CoordinatorLayout initiating the scroll operation
+     * @param axes              the axis of scrolling - horizontal or vertical
+     * @param type              type of input event that caused the scrolling
+     * @return true if behavior wishes to accept this nested scroll
+     */
+    @Override
+    public boolean onStartNestedScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull BottomNavigationView child, @NonNull View directTargetChild, @NonNull View target, int axes, int type) {
+        Log.v("Tag", target.getClass().toString());
+        return axes == ViewCompat.SCROLL_AXIS_VERTICAL;
+    }
+
+
+    /**
+     * @param coordinatorLayout
+     * @param child
+     * @param target
+     * @param dx                the horizontal number of pixels that the user attempted to scroll
+     * @param dy                the vertical number of pixels that the user attempted to scroll
+     * @param consumed          an integer array where consumed[0] should be set to dx , consumer[1] should be set
+     *                          to dy
+     * @param type
+     */
+    @Override
+    public void onNestedPreScroll(@NonNull CoordinatorLayout coordinatorLayout, @NonNull BottomNavigationView child, @NonNull View target, int dx, int dy, @NonNull int[] consumed, int type) {
+        super.onNestedPreScroll(coordinatorLayout, child, target, dx, dy, consumed, type);
+        child.setTranslationY(max(0f, min(((float) child.getHeight()), child.getTranslationY() + dy)));
+    }
+
+}