Fix ambiguity in ReadMore and Changelog

This commit is contained in:
Mr. Dragon
2018-01-22 15:32:38 +05:30
parent a7f18d1d94
commit cbb68196af
2 changed files with 71 additions and 44 deletions

View File

@@ -153,8 +153,9 @@ public class GeneralDetails extends Abstract {
} else {
setText(R.id.description, Html.fromHtml(app.getDescription()).toString());
initExpandableGroup(R.id.description_header, R.id.description_container);
activity.findViewById(R.id.more_card).setVisibility(View.VISIBLE);
if (app.getInstalledVersionCode() == 0 || TextUtils.isEmpty(app.getChanges())) {
activity.findViewById(R.id.description_header).performClick();
//activity.findViewById(R.id.description_header).performClick();
}
}
}

View File

@@ -1,64 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/changes_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/description_header"
<android.support.v7.widget.CardView
android:id="@+id/more_card"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:focusable="true"
android:gravity="center"
android:paddingTop="6dip"
android:text="@string/details_description"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/colorPrimary"
android:visibility="gone" />
<LinearLayout
android:id="@+id/description_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="10dp"
android:layout_marginLeft="25dp"
android:layout_marginRight="25dp"
android:visibility="gone">
android:layout_margin="5dp"
android:visibility="gone"
app:cardBackgroundColor="@color/white"
app:cardCornerRadius="2dp"
app:cardElevation="2dp">
<TextView
android:id="@+id/description"
android:id="@+id/description_header"
android:text="@string/details_description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web|email"
android:paddingTop="6dip"
android:textIsSelectable="true"
android:textColor="@color/black"/>
<TextView
android:id="@+id/changes_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="10dip"
android:text="@string/details_changelog"
android:visibility="gone" />
<TextView
android:id="@+id/changes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web|email"
android:textIsSelectable="true"
android:visibility="gone" />
android:layout_margin="5dp"
android:drawableEnd="@drawable/ic_expand_more"
android:visibility="gone"
android:textColor="@color/colorPrimary"
android:gravity="center|start"
android:textSize="14sp"
android:textAllCaps="true"
android:textStyle="bold"/>
<LinearLayout
android:id="@+id/offer_details"
android:id="@+id/description_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="10dip" />
android:layout_marginTop="32dp"
android:visibility="gone">
<TextView
android:id="@+id/description"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web|email"
android:layout_margin="10dp"
android:paddingTop="6dip"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:background="@color/changelog_bg">
<TextView
android:id="@+id/changes_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:text="@string/details_changelog"
android:textAllCaps="true"
android:textSize="14sp"
android:textStyle="bold"
android:textColor="@color/changelog_txt"
android:visibility="gone" />
<TextView
android:id="@+id/changes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:autoLink="web|email"
android:layout_margin="10dp"
android:textIsSelectable="true"
android:visibility="gone"
android:textColor="@color/changelog_txt"
android:lineSpacingExtra="5dp"/>
</LinearLayout>
<LinearLayout
android:id="@+id/offer_details"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="10dp"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>