mirror of
https://github.com/commons-app/apps-android-commons.git
synced 2025-10-27 21:03:54 +01:00
Ability to show captions and descriptions in all entered languages (#4355)
* implement Ability to show captions and descriptions in all entered languages *Add Javadoc * handle Back event of fragment(mediaDetailFragment) * fix minor bugs * add internationalization * revert previous changes * fix visibility bug * resolve conflict
This commit is contained in:
Prince kushwaha
GitHub
parent
808f21a1f2
commit
b202f553f0
12 changed files with 308 additions and 9 deletions
33
app/src/main/res/layout/caption_item.xml
Normal file
33
app/src/main/res/layout/caption_item.xml
Normal file
|
|
@ -0,0 +1,33 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/mainBackground"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/caption_language_textview"
|
||||
style="@style/CaptionTextLabel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"
|
||||
android:text="Caption"
|
||||
android:textColor="?attr/caption_description_text_color"
|
||||
android:textSize="16dp"
|
||||
android:textStyle="bold" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/caption_text"
|
||||
style="@style/CaptionTextLabel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:inputType="textMultiLine"
|
||||
android:textColor="?attr/caption_description_text_color"
|
||||
android:textStyle="normal" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
|
@ -23,6 +23,20 @@
|
|||
layout="@layout/layout_edit_categories" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/dummy_caption_description_container"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="bottom"
|
||||
android:elevation="35dp"
|
||||
android:orientation="vertical"
|
||||
android:visibility="gone"
|
||||
android:weightSum="10">
|
||||
|
||||
<include
|
||||
layout="@layout/show_captions_descriptions" />
|
||||
</LinearLayout>
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/mediaDetailImageFailed"
|
||||
android:layout_height="wrap_content"
|
||||
|
|
@ -190,6 +204,15 @@
|
|||
tools:text="Description of the media goes here. This can potentially be fairly long, and will need to wrap across multiple lines. We hope it looks nice though." />
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/show_caption_description_textview"
|
||||
style="@style/MediaDetailTextLabelGeneric"
|
||||
android:layout_width="match_parent"
|
||||
android:gravity="center"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/dimen_10"
|
||||
android:text="@string/media_detail_in_all_languages" />
|
||||
|
||||
<View
|
||||
android:background="?attr/mediaDetailSpacerColor"
|
||||
android:layout_width="match_parent"
|
||||
|
|
|
|||
55
app/src/main/res/layout/show_captions_descriptions.xml
Normal file
55
app/src/main/res/layout/show_captions_descriptions.xml
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/dimen_20"
|
||||
android:background="?attr/mainBackground"
|
||||
android:elevation="30dp"
|
||||
android:padding="@dimen/dimen_10">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/caption_label"
|
||||
style="@style/MediaDetailTextLabel"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="Captions"
|
||||
android:textColor="?attr/caption_description_text_color" />
|
||||
|
||||
<ListView
|
||||
android:id="@+id/caption_listview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/caption_label" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/description_label"
|
||||
style="@style/MediaDetailTextLabel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/caption_listview"
|
||||
android:layout_marginTop="@dimen/dimen_10"
|
||||
android:text="Descriptions"
|
||||
android:textColor="?attr/caption_description_text_color" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/pb_circular"
|
||||
style="?android:attr/progressBarStyleSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:background="?attr/mainBackground"
|
||||
android:indeterminate="true"
|
||||
android:indeterminateOnly="true"
|
||||
android:visibility="gone" />
|
||||
|
||||
<WebView
|
||||
android:id="@+id/description_webview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/description_label"
|
||||
android:layout_marginTop="@dimen/dimen_10"
|
||||
android:layout_marginBottom="@dimen/dimen_20"
|
||||
android:background="?attr/mainBackground"
|
||||
tools:ignore="WebViewLayout" />
|
||||
</RelativeLayout>
|
||||
|
|
@ -348,5 +348,6 @@
|
|||
<string name="leaderboard_used">Benotzt</string>
|
||||
<string name="limited_connection_mode">Limitéierte Verbindungsmodus</string>
|
||||
<string name="app_ui_language">Sprooch vum Interface vum Benotzer vun der App</string>
|
||||
<string name="media_detail_in_all_languages">In all languages</string>
|
||||
<string name="read_help_link">Liest méi</string>
|
||||
</resources>
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@
|
|||
<attr name="contributionsListTextPrimary" format="reference"/>
|
||||
<attr name="menu_item_tint" format="reference"/>
|
||||
<attr name="search_icon" format="reference"/>
|
||||
<attr name="caption_description_text_color" format="reference" />
|
||||
|
||||
<declare-styleable name="Badge">
|
||||
<attr name="boundary" format="color"/>
|
||||
|
|
|
|||
|
|
@ -622,6 +622,7 @@ Upload your first media by tapping on the add button.</string>
|
|||
<string name="app_ui_language">App user interface language</string>
|
||||
<string name="remove">Removes a caption and description</string>
|
||||
<string name="read_help_link">Read more</string>
|
||||
<string name="media_detail_in_all_languages">In all languages</string>
|
||||
<string name="choose_a_location">Choose a location</string>
|
||||
<string name="pan_and_zoom_to_adjust">Pan and zoom to adjust</string>
|
||||
<string name="exit_location_picker">Exit location picker</string>
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
<item name="rowButtonColor">@color/button_blue_dark</item>
|
||||
<item name="reviewHeading">@color/white</item>
|
||||
<item name="aboutIconsColor">@color/white</item>
|
||||
<item name="caption_description_text_color">@color/white</item>
|
||||
|
||||
<item name="semitransparentText">@color/commons_app_blue_dark</item>
|
||||
<item name="subBackground">@color/sub_background_dark</item>
|
||||
|
|
@ -76,6 +77,7 @@
|
|||
<item name="rowButtonColor">@color/button_blue</item>
|
||||
<item name="reviewHeading">@color/black</item>
|
||||
<item name="aboutIconsColor">@color/black</item>
|
||||
<item name="caption_description_text_color">@color/black</item>
|
||||
|
||||
<item name="semitransparentText">@color/commons_app_blue_light</item>
|
||||
<item name="subBackground">@color/sub_background_light</item>
|
||||
|
|
@ -206,6 +208,12 @@
|
|||
<item name="android:textStyle">bold</item>
|
||||
</style>
|
||||
|
||||
<style name="CaptionTextLabel">
|
||||
<item name="android:paddingTop">@dimen/dimen_6</item>
|
||||
<item name="android:paddingLeft">@dimen/tiny_gap</item>
|
||||
<item name="android:textSize">@dimen/normal_text</item>
|
||||
</style>
|
||||
|
||||
<style name="MediaDetailTextLabelTitle" parent="@style/MediaDetailTextLabel">
|
||||
<item name="android:textColor">@android:color/white</item>
|
||||
</style>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue