From e28c083396cd08bfc58de586a6b6499dba5fcf80 Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Fri, 15 Feb 2019 20:28:01 +0400
Subject: [PATCH] [UI][DetailActivity] Fixed black arrow, now datasheet link is
 clickable (and displaying correctly)

---
 .../vrcatalog/view/DetailActivity.java        |  2 +-
 app/src/main/res/layout/activity_detail.xml   | 52 ++-----------------
 .../res/layout/properties_list_adapter.xml    |  3 +-
 app/src/main/res/values-v21/styles.xml        |  4 ++
 4 files changed, 10 insertions(+), 51 deletions(-)

diff --git a/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java b/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
index 992e744..14ea6db 100644
--- a/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
+++ b/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
@@ -91,7 +91,7 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It
         hashMap.put("Аналоги", tmp);
 
         tmp = intent.getStringExtra("detailDatasheet");
-        if(!tmp.matches("\\S")) {
+        if(!(tmp.trim().length() > 0)) {
             tmp = "Не указано";
         }
         hashMap.put("Техническая спецификация", tmp);
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index b57713f..05af980 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -5,53 +5,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
-
-    <!-- <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <android.support.v4.view.ViewPager
-            android:id="@+id/viewPager"
-            android:layout_width="wrap_content"
-            android:layout_height="313dp" />
-
-        <android.support.design.widget.TabLayout
-            android:id="@+id/tabDots"
-            android:layout_alignParentBottom="true"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:tabBackground="@drawable/tab_selector"
-            app:tabGravity="center"
-            app:tabIndicatorHeight="0dp"/>
-
-        <TextView
-            android:id="@+id/itemName"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Item Name"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textSize="30sp"
-            android:layout_marginLeft="9dp"/>
-
-        <TextView
-            android:id="@+id/itemPrice"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="Item Price"
-            android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-            android:textSize="24sp"
-            android:layout_marginLeft="9dp"/>
-        <ListView
-            android:id="@+id/propertiesList"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"/>
-
-    </LinearLayout>-->
-
-
-
     <android.support.design.widget.AppBarLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -70,7 +23,7 @@
                 android:id="@+id/tabDots"
                 android:layout_width="match_parent"
                 android:layout_height="62dp"
-                android:layout_alignParentBottom="true"
+                android:layout_gravity="bottom"
                 app:tabBackground="@drawable/tab_selector"
                 app:tabGravity="center"
                 app:tabIndicatorHeight="0dp" />
@@ -79,7 +32,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="?attr/actionBarSize"
                 app:layout_collapseMode="pin"
-                app:popupTheme="@style/AppTheme" />
+                app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+                android:theme="@style/ItemActionBar"/>
 
         </android.support.design.widget.CollapsingToolbarLayout>
     </android.support.design.widget.AppBarLayout>
diff --git a/app/src/main/res/layout/properties_list_adapter.xml b/app/src/main/res/layout/properties_list_adapter.xml
index c0bc04c..5a36547 100644
--- a/app/src/main/res/layout/properties_list_adapter.xml
+++ b/app/src/main/res/layout/properties_list_adapter.xml
@@ -17,5 +17,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="Property Value"
-        android:layout_marginLeft="9dp"/>
+        android:layout_marginLeft="9dp"
+        android:autoLink="web"/>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 1e3a2a3..5aff55f 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -14,4 +14,8 @@
         <item name="android:background">@android:color/transparent</item>
         <item name="background">@android:color/transparent</item>
     </style>
+    <style name="ItemActionBar" parent="ItemActivityTheme">
+        <item name="android:textColorPrimary">@android:color/white</item>
+        <item name="android:textColorSecondary">@android:color/white</item>
+    </style>
 </resources>