mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1200 from knight-shade/Fixes-#1179

Browse source 
Fixes #1179 Add material design to title and description of image, limits title size and add scrolling behaviour.
This commit is contained in:
neslihanturan 2018-03-16 11:56:37 +02:00 • committed by GitHub
commit 110337d296
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 73 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

77
app/src/main/res/layout/fragment_single_upload.xml
View file

@ -1,20 +1,28 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="fill"
android:orientation="vertical"
android:background="?attr/fragmentCategorisationBackground" android:background="?attr/fragmentCategorisationBackground"
android:paddingBottom="@dimen/small_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingEnd="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap"
android:theme="@style/DarkAppTheme"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
> android:paddingBottom="@dimen/small_gap"
android:paddingEnd="@dimen/standard_gap"
android:paddingLeft="@dimen/standard_gap"
android:paddingRight="@dimen/standard_gap"
android:paddingStart="@dimen/standard_gap"
android:paddingTop="@dimen/small_gap"
android:theme="@style/DarkAppTheme">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="fill"
android:orientation="vertical">
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/titleEdit" android:id="@+id/titleEdit"
@ -22,10 +30,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableEnd="@drawable/mapbox_info_icon_default" android:drawableEnd="@drawable/mapbox_info_icon_default"
android:drawableRight="@drawable/mapbox_info_icon_default" android:drawableRight="@drawable/mapbox_info_icon_default"
android:scrollHorizontally="false" android:maxLines="1"
android:inputType="textMultiLine" android:maxLength="80"
android:hint="@string/share_title_hint" android:hint="@string/share_title_hint"
android:imeOptions="flagNoExtractUi" /> android:imeOptions="flagNoExtractUi"
android:inputType="text"
android:scrollHorizontally="false" />
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText <EditText
android:id="@+id/descEdit" android:id="@+id/descEdit"
@ -33,41 +49,40 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawableEnd="@drawable/mapbox_info_icon_default" android:drawableEnd="@drawable/mapbox_info_icon_default"
android:drawableRight="@drawable/mapbox_info_icon_default" android:drawableRight="@drawable/mapbox_info_icon_default"
android:inputType="textMultiLine"
android:hint="@string/share_description_hint" android:hint="@string/share_description_hint"
android:imeOptions="flagNoExtractUi" /> android:imeOptions="flagNoExtractUi"
android:inputType="textMultiLine" />
</android.support.design.widget.TextInputLayout>
<Spinner <Spinner
android:id="@+id/licenseSpinner" android:id="@+id/licenseSpinner"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="?attr/spinnerTheme" android:theme="?attr/spinnerTheme" />
/>
<Button <Button
android:text="@string/use_previous" android:id="@+id/titleDescButton"
android:background="?attr/buttonBackground"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/titleDescButton" android:background="?attr/buttonBackground"
/> android:text="@string/use_previous" />
<TextView <TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/share_license_summary"
android:id="@+id/share_license_summary" android:id="@+id/share_license_summary"
android:gravity="center" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
/> android:gravity="center"
android:text="@string/share_license_summary" />
<fr.free.nrw.commons.ui.widget.HtmlTextView <fr.free.nrw.commons.ui.widget.HtmlTextView
android:id="@+id/media_upload_policy"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/media_upload_policy"
android:text="@string/media_upload_policy"
android:gravity="start"
android:layout_marginTop="@dimen/standard_gap" android:layout_marginTop="@dimen/standard_gap"
/> android:gravity="start"
android:text="@string/media_upload_policy" />
</LinearLayout> </LinearLayout>
</ScrollView>