From 1e20c8ebcc4d50ff0e5eb6d81a3caa9999a19f3a Mon Sep 17 00:00:00 2001
From: ChronosX88 <chronosx88@gmail.com>
Date: Sat, 9 Feb 2019 21:45:22 +0400
Subject: [PATCH] =?UTF-8?q?[DetailActivity]=20Made=20transparent=20toolbar?=
 =?UTF-8?q?,=20dots=20(which=20indicates,=20how=20many=20images=20in=20sli?=
 =?UTF-8?q?der),=20margin=209=20dp=20from=20the=20left=20and=20char=20"?=
 =?UTF-8?q?=D0=A0"=20in=20price.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  4 +-
 .../vrcatalog/view/DetailActivity.java        |  6 ++
 .../res/drawable/tab_indicator_default.xml    |  8 ++
 .../res/drawable/tab_indicator_selected.xml   |  9 +++
 app/src/main/res/drawable/tab_selector.xml    |  8 ++
 app/src/main/res/layout/activity_detail.xml   | 73 ++++++++++++-------
 .../res/layout/properties_list_adapter.xml    |  6 +-
 app/src/main/res/values-v21/styles.xml        | 12 +++
 app/src/main/res/values/styles.xml            |  4 +
 9 files changed, 101 insertions(+), 29 deletions(-)
 create mode 100644 app/src/main/res/drawable/tab_indicator_default.xml
 create mode 100644 app/src/main/res/drawable/tab_indicator_selected.xml
 create mode 100644 app/src/main/res/drawable/tab_selector.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f210ba2..e5aa12d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -23,7 +23,9 @@
         </activity>
         <activity android:name=".view.SettingsActivity" />
         <activity android:name=".view.AboutActivity" />
-        <activity android:name=".view.DetailActivity" />
+        <activity
+            android:name=".view.DetailActivity"
+            android:theme="@style/ItemActivityTheme"/>
         <activity
             android:name=".view.SearchableActivity"
             android:label="Поиск"
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 f0f8814..ab0629e 100644
--- a/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
+++ b/app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
@@ -2,6 +2,7 @@ package ru.volgorobot.vrcatalog.view;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.design.widget.TabLayout;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.AppCompatActivity;
 import android.text.method.LinkMovementMethod;
@@ -35,6 +36,7 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It
         setContentView(R.layout.activity_detail);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
         getSupportActionBar().setHomeButtonEnabled(true);
+        getSupportActionBar().setDisplayShowTitleEnabled(false);
         initializeViews();
         mPresenter = new ItemPresenter(DetailActivity.this, this);
         Intent intent = getIntent();
@@ -43,6 +45,8 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It
         String tmp = intent.getStringExtra("detailPrice");
         if(tmp.equals("0")) {
             tmp = "Уточните у продавца";
+        } else {
+            tmp = tmp + " \u20BD";
         }
         ((TextView) findViewById(R.id.itemPrice)).setText(tmp);
 
@@ -132,7 +136,9 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It
     @Override
     public void setViewPagerContent(String[] uris) {
         ImagePagerAdapter imagePagerAdapter = new ImagePagerAdapter(DetailActivity.this, uris);
+        TabLayout tabLayout = (TabLayout) findViewById(R.id.tabDots);
         viewPager.setAdapter(imagePagerAdapter);
+        tabLayout.setupWithViewPager(viewPager);
         imagePagerAdapter.notifyDataSetChanged();
     }
 
diff --git a/app/src/main/res/drawable/tab_indicator_default.xml b/app/src/main/res/drawable/tab_indicator_default.xml
new file mode 100644
index 0000000..871dfba
--- /dev/null
+++ b/app/src/main/res/drawable/tab_indicator_default.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="2dp"
+    android:useLevel="false">
+    <solid android:color="@android:color/darker_gray"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_indicator_selected.xml b/app/src/main/res/drawable/tab_indicator_selected.xml
new file mode 100644
index 0000000..83daff8
--- /dev/null
+++ b/app/src/main/res/drawable/tab_indicator_selected.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    android:innerRadius="0dp"
+    android:shape="ring"
+    android:thickness="4dp"
+    android:useLevel="false"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+    <solid android:color="@color/colorAccent"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/tab_selector.xml b/app/src/main/res/drawable/tab_selector.xml
new file mode 100644
index 0000000..001747c
--- /dev/null
+++ b/app/src/main/res/drawable/tab_selector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:drawable="@drawable/tab_indicator_selected"
+        android:state_selected="true"/>
+
+    <item android:drawable="@drawable/tab_indicator_default"/>
+</selector>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_detail.xml b/app/src/main/res/layout/activity_detail.xml
index 2fedf75..d7f98b3 100644
--- a/app/src/main/res/layout/activity_detail.xml
+++ b/app/src/main/res/layout/activity_detail.xml
@@ -1,33 +1,54 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<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="wrap_content"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
 
-    <android.support.v4.view.ViewPager
-        android:id="@+id/viewPager"
-        android:layout_width="wrap_content"
-        android:layout_height="313dp" />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-    <TextView
-        android:id="@+id/itemName"
-        android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:text="Item Name"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="30sp" />
+        <android.support.v4.view.ViewPager
+            android:id="@+id/viewPager"
+            android:layout_width="wrap_content"
+            android:layout_height="313dp" />
 
-    <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" />
-    <ListView
-        android:id="@+id/propertiesList"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-</LinearLayout>
\ No newline at end of file
+        <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="40dp"
+            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.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/properties_list_adapter.xml b/app/src/main/res/layout/properties_list_adapter.xml
index 45011c0..c0bc04c 100644
--- a/app/src/main/res/layout/properties_list_adapter.xml
+++ b/app/src/main/res/layout/properties_list_adapter.xml
@@ -9,11 +9,13 @@
         android:layout_height="wrap_content"
         android:text="Property Name"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        android:textSize="18sp" />
+        android:textSize="18sp"
+        android:layout_marginLeft="9dp"/>
 
     <TextView
         android:id="@+id/propertyValueView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="Property Value" />
+        android:text="Property Value"
+        android:layout_marginLeft="9dp"/>
 </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 fd7a058..a005d20 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -5,4 +5,16 @@
         <item name="windowNoTitle">true</item>
         <item name="android:statusBarColor">@android:color/transparent</item>
     </style>
+    <style name="ItemActivityTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowDrawsSystemBarBackgrounds">true</item>
+        <item name="colorPrimary">@android:color/transparent</item>
+        <item name="actionBarStyle">@style/MyActionBar</item>
+        <item name="windowActionBarOverlay">true</item>
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+    <style name="MyActionBar" parent="Widget.AppCompat.ActionBar.Solid">
+        <item name="android:background">@android:color/transparent</item>
+        <!--For compatibility-->
+        <item name="background">@android:color/transparent</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 545b9c6..f49f94b 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -17,4 +17,8 @@
 
     <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 
+    <style name="ItemActivityTheme" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="android:windowTranslucentStatus">true</item>
+    </style>
+
 </resources>