From e62ddd8e5921fd4a7591731d6126c7d06af23a53 Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Sun, 27 Jan 2019 21:52:09 +0400
Subject: [PATCH] Fixed bug related with crash app (null on error views)

---
 .../java/ru/volgorobot/vrcatalog/view/MainActivity.java   | 3 +++
 app/src/main/res/layout/activity_searchable.xml           | 8 ++++----
 app/src/main/res/layout/content_main.xml                  | 8 ++++----
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/src/main/java/ru/volgorobot/vrcatalog/view/MainActivity.java b/app/src/main/java/ru/volgorobot/vrcatalog/view/MainActivity.java
index 2cbde48..1bbe158 100644
--- a/app/src/main/java/ru/volgorobot/vrcatalog/view/MainActivity.java
+++ b/app/src/main/java/ru/volgorobot/vrcatalog/view/MainActivity.java
@@ -68,6 +68,9 @@ public class MainActivity extends AppCompatActivity
         mSwipeRefreshLayout.setOnRefreshListener(MainActivity.this);
         mSwipeRefreshLayout.setColorSchemeResources(R.color.colorPrimary);
 
+        mErrorTextView = findViewById(R.id.errorTextView);
+        mConnectionErrorImageView = findViewById(R.id.connectionErrorImageView);
+
         mPresenter = new MainPresenter(this, MainActivity.this);
 
         treeView = new TreeView(rootNode, MainActivity.this, new NodeViewFactory(MainActivity.this, this, this.mPresenter.getCoreModel()));
diff --git a/app/src/main/res/layout/activity_searchable.xml b/app/src/main/res/layout/activity_searchable.xml
index 8afd301..4bdcf45 100644
--- a/app/src/main/res/layout/activity_searchable.xml
+++ b/app/src/main/res/layout/activity_searchable.xml
@@ -22,20 +22,20 @@
         </android.support.v4.widget.NestedScrollView>
 
         <ImageView
-            android:id="@+id/connectionErrorImageView"
+            android:id="@+id/searchableConnectionErrorImageView"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginTop="70dp"
             android:layout_marginBottom="52dp"
             android:src="@drawable/ic_cloud_off_gray_24dp"
             android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/errorTextView"
+            app:layout_constraintBottom_toTopOf="@+id/searchableErrorTextView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/errorTextView"
+            android:id="@+id/searchableErrorTextView"
             android:layout_width="0dp"
             android:layout_height="77dp"
             android:layout_marginStart="9dp"
@@ -47,7 +47,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/connectionErrorImageView" />
+            app:layout_constraintTop_toBottomOf="@+id/searchableConnectionErrorImageView" />
 
     </android.support.constraint.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 98a6740..e3e2877 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -30,20 +30,20 @@
         </android.support.v4.widget.NestedScrollView>
 
         <ImageView
-            android:id="@+id/searchableConnectionErrorImageView"
+            android:id="@+id/connectionErrorImageView"
             android:layout_width="0dp"
             android:layout_height="0dp"
             android:layout_marginTop="70dp"
             android:layout_marginBottom="52dp"
             android:src="@drawable/ic_cloud_off_gray_24dp"
             android:visibility="invisible"
-            app:layout_constraintBottom_toTopOf="@+id/searchableErrorTextView"
+            app:layout_constraintBottom_toTopOf="@+id/errorTextView"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
-            android:id="@+id/searchableErrorTextView"
+            android:id="@+id/errorTextView"
             android:layout_width="0dp"
             android:layout_height="77dp"
             android:layout_marginStart="9dp"
@@ -55,7 +55,7 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/searchableConnectionErrorImageView" />
+            app:layout_constraintTop_toBottomOf="@+id/connectionErrorImageView" />
 
     </android.support.constraint.ConstraintLayout>