ChronosXYZ/ucatalog-android
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[UI][DetailActivity] Fixed black arrow, now datasheet link is clickable (and displaying correctly)

Browse Source
This commit is contained in:
ChronosX88 2019-02-15 20:28:01 +04:00
parent 666e6b2186
commit e28c083396
No known key found for this signature in database
GPG Key ID: 8F92E090A87804AA
4 changed files with 10 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ru/volgorobot/vrcatalog/view/DetailActivity.java
View File

@ -91,7 +91,7 @@ public class DetailActivity extends AppCompatActivity implements MainContract.It
hashMap.put("Аналоги", tmp); hashMap.put("Аналоги", tmp);
tmp = intent.getStringExtra("detailDatasheet"); tmp = intent.getStringExtra("detailDatasheet");
if(!tmp.matches("\\S")) { if(!(tmp.trim().length() > 0)) {
tmp = "Не указано"; tmp = "Не указано";
} }
hashMap.put("Техническая спецификация", tmp); hashMap.put("Техническая спецификация", tmp);

52
app/src/main/res/layout/activity_detail.xml
View File

@ -5,53 +5,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> 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.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -70,7 +23,7 @@
android:id="@+id/tabDots" android:id="@+id/tabDots"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="62dp" android:layout_height="62dp"
android:layout_alignParentBottom="true" android:layout_gravity="bottom"
app:tabBackground="@drawable/tab_selector" app:tabBackground="@drawable/tab_selector"
app:tabGravity="center" app:tabGravity="center"
app:tabIndicatorHeight="0dp" /> app:tabIndicatorHeight="0dp" />
@ -79,7 +32,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin" 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.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>

3
app/src/main/res/layout/properties_list_adapter.xml
View File

@ -17,5 +17,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Property Value" android:text="Property Value"
android:layout_marginLeft="9dp"/> android:layout_marginLeft="9dp"
android:autoLink="web"/>
</LinearLayout> </LinearLayout>

4
app/src/main/res/values-v21/styles.xml
View File

@ -14,4 +14,8 @@
<item name="android:background">@android:color/transparent</item> <item name="android:background">@android:color/transparent</item>
<item name="background">@android:color/transparent</item> <item name="background">@android:color/transparent</item>
</style> </style>
<style name="ItemActionBar" parent="ItemActivityTheme">
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColorSecondary">@android:color/white</item>
</style>
</resources> </resources>