From cdb9f9790473e21607c4018026bfff19dfc24192 Mon Sep 17 00:00:00 2001
From: RicomenPL <RafalBO99@outlook.com>
Date: Wed, 19 Jul 2017 15:47:30 +0200
Subject: [PATCH] Correct the appearance of the grid and add automatic
 calculation of fragments layouts

---
 .../activity/dashboard/marks/ImageAdapter.java   |  6 +++++-
 app/src/main/res/layout/activity_dashboard.xml   |  5 ++++-
 app/src/main/res/layout/fragment_attendance.xml  |  4 ++--
 app/src/main/res/layout/fragment_board.xml       |  4 ++--
 app/src/main/res/layout/fragment_lessonplan.xml  |  4 ++--
 app/src/main/res/layout/fragment_marks.xml       |  3 +--
 app/src/main/res/layout/row_layout.xml           | 16 +++++++++++-----
 7 files changed, 27 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/ImageAdapter.java b/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/ImageAdapter.java
index 67133904..1e88b11d 100644
--- a/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/ImageAdapter.java
+++ b/app/src/main/java/io/github/wulkanowy/activity/dashboard/marks/ImageAdapter.java
@@ -34,7 +34,11 @@ public class ImageAdapter extends RecyclerView.Adapter<ImageAdapter.ViewHolder>
     public void onBindViewHolder(ImageAdapter.ViewHolder viewHolder, int i) {
 
         viewHolder.tv_android.setText(lista.get(i));
-        Picasso.with(context).load(R.drawable.sample_0).into(viewHolder.img_android);
+        Picasso.with(context)
+                .load(R.drawable.sample_0)
+                .noFade()
+                .into(viewHolder.img_android);
+
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_dashboard.xml b/app/src/main/res/layout/activity_dashboard.xml
index 9d4c23fa..4f974699 100644
--- a/app/src/main/res/layout/activity_dashboard.xml
+++ b/app/src/main/res/layout/activity_dashboard.xml
@@ -11,9 +11,12 @@
 
     <FrameLayout
         android:id="@+id/fragment_container"
+        app:layout_behavior="android.support.design.widget.AppBarLayout$ScrollingViewBehavior"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:fitsSystemWindows="true"
+        android:layout_weight="1"
+        />
 
 
     <android.support.design.widget.BottomNavigationView
diff --git a/app/src/main/res/layout/fragment_attendance.xml b/app/src/main/res/layout/fragment_attendance.xml
index d396545e..d009bfcb 100644
--- a/app/src/main/res/layout/fragment_attendance.xml
+++ b/app/src/main/res/layout/fragment_attendance.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,4 +9,4 @@
         android:layout_height="match_parent"
         android:text="Fragment Frekwencja" />
 
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_board.xml b/app/src/main/res/layout/fragment_board.xml
index b75e8c31..7be8d6e9 100644
--- a/app/src/main/res/layout/fragment_board.xml
+++ b/app/src/main/res/layout/fragment_board.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -11,4 +11,4 @@
         android:text="Fragment Dashboard" />
 
 
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_lessonplan.xml b/app/src/main/res/layout/fragment_lessonplan.xml
index 9330078a..f62d3227 100644
--- a/app/src/main/res/layout/fragment_lessonplan.xml
+++ b/app/src/main/res/layout/fragment_lessonplan.xml
@@ -1,4 +1,4 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -9,4 +9,4 @@
         android:layout_height="match_parent"
         android:text="Fragment Plan lekcji" />
 
-</FrameLayout>
+</android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/fragment_marks.xml b/app/src/main/res/layout/fragment_marks.xml
index 0566036f..bbffc410 100644
--- a/app/src/main/res/layout/fragment_marks.xml
+++ b/app/src/main/res/layout/fragment_marks.xml
@@ -2,7 +2,6 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:fitsSystemWindows="true"
     tools:context="io.github.wulkanowy.activity.dashboard.marks.MarksFragment">
 
     <android.support.v7.widget.RecyclerView
@@ -11,4 +10,4 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"/>
 
-    </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
+</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/row_layout.xml b/app/src/main/res/layout/row_layout.xml
index c09f541c..ad1e24bd 100644
--- a/app/src/main/res/layout/row_layout.xml
+++ b/app/src/main/res/layout/row_layout.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical"
-    android:background="@color/colorPrimaryDark"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
     <ImageView
@@ -9,12 +8,19 @@
         android:adjustViewBounds="true"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginLeft="1dp"
+        android:layout_marginRight="1dp"
         />
     <TextView
         android:id="@+id/tv_android"
-        android:layout_gravity="center"
-        android:textColor="#FFFFFF"
+
+        android:gravity="center"
+        android:textColor="#000000"
+        android:background="#FFFFFF"
         android:textStyle="bold"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content" />
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="2dp"
+        android:layout_marginLeft="1.5dp"
+        android:layout_marginRight="1.5dp"/>
 </LinearLayout>
\ No newline at end of file