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

Fixes on Edit button, there is + sign overlayed over letter E #5388 (#5464)

Browse source 
* Fixed Grey empty screen at Upload wizard caption step after denying files permission

* Empty commit

* Fixed loop issue

* Created docs for earlier commits

* Fixed javadoc

* Fixed spaces

* Added added basic features to OSM Maps

* Added search location feature

* Added filter to Open Street Maps

* Fixed chipGroup in Open Street Maps

* Removed mapBox code

* Removed mapBox's code

* Reformat code

* Reformatted code

* Removed rotation feature to map

* Removed rotation files and Fixed Marker click problem

* Ignored failing tests

* Added voice input feature

* Fixed test cases

* Changed caption and description text

* Replaced mapbox to osmdroid in upload activity

* Fixed Unit Tests

* Made selected marker to be fixed on map

* Changed color of map marker

* Fixes #5439 by capitalizing first letter of voice input

* Made UI changes in UploadMediaDetailAdapter

* Added javadoc

---------

Co-authored-by: Nicolas Raoul <nicolas.raoul@gmail.com>
This commit is contained in:
Kanahia 2024-01-23 19:33:38 +05:30 • committed by GitHub
parent ab3540312a
commit 3d0e65c92c
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 263 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/res/layout/activity_description_edit.xml
View file

@ -65,14 +65,6 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_add_description"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="@dimen/fragment_height"
android:text="+" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_edit_submit"
android:layout_width="wrap_content"

153
app/src/main/res/layout/fragment_upload_media_detail_fragment.xml
View file

@ -17,7 +17,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/dimen_10"
android:layout_marginStart="@dimen/dimen_10"
android:layout_marginTop="@dimen/dimen_10"
android:layout_marginEnd="@dimen/dimen_10"
android:layout_marginBottom="@dimen/dimen_10"
android:elevation="@dimen/cardview_default_elevation">
<LinearLayout
@ -26,81 +29,145 @@
android:layout_margin="@dimen/dimen_10"
android:orientation="vertical">
<RelativeLayout
android:id="@+id/rl_container_title"
<LinearLayout
android:id="@+id/ll_container_title"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="@dimen/half_standard_height"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_weight="1"
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="@dimen/half_standard_height"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_marginRight="@dimen/tiny_gap"
android:gravity="center_vertical"
android:textSize="@dimen/normal_text"
android:textSize="18dp"
android:textStyle="bold"
tools:text="Step 1 of 15" />
<ImageView
android:id="@+id/tooltip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/maplibre_info_icon_default"/>
android:layout_width="18dp"
android:layout_height="18dp"
android:src="@drawable/maplibre_info_icon_default" />
</LinearLayout>
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/ib_map"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:layout_toLeftOf="@id/ib_expand_collapse"
android:visibility="visible"
app:srcCompat="@drawable/ic_map_white_24dp"
tools:visibility="visible" />
<androidx.appcompat.widget.AppCompatImageButton
android:id="@+id/ib_expand_collapse"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="@dimen/half_standard_height"
android:layout_height="@dimen/half_standard_height"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginStart="@dimen/small_gap"
android:layout_marginEnd="@dimen/small_gap"
android:layout_marginBottom="@dimen/small_gap"
android:clickable="false"
android:focusable="false"
android:padding="@dimen/medium_height"
android:rotation="180"
app:srcCompat="@drawable/arrow_up" />
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/ll_container_media_detail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_gap"
android:orientation="vertical">
<LinearLayout
android:id="@+id/ll_container_actions"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/standard_gap"
android:orientation="horizontal">
<LinearLayout
android:id="@+id/ll_edit_image"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/clicked_linearlayout_background"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/ic_image_24dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="@dimen/half_standard_height"
android:layout_marginStart="@dimen/tiny_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:gravity="center_vertical"
android:text="@string/edit_image"
android:textColor="#2D8BA4"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:orientation="horizontal"></LinearLayout>
<LinearLayout
android:id="@+id/ll_location_status"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="@drawable/clicked_linearlayout_background"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:id="@+id/location_image_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:src="@drawable/ic_map_not_available_20dp" />
<TextView
android:id="@+id/location_text_view"
android:layout_width="wrap_content"
android:layout_height="@dimen/half_standard_height"
android:layout_marginStart="@dimen/tiny_gap"
android:layout_marginLeft="@dimen/tiny_gap"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginRight="@dimen/standard_gap"
android:gravity="center_vertical"
android:text="@string/add_location"
android:textColor="#2D8BA4"
android:textSize="@dimen/normal_text"
android:textStyle="bold" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/tiny_margin"
android:layout_weight="1"
android:src="@drawable/ic_arrow_16dp" />
</LinearLayout>
</LinearLayout>
<fr.free.nrw.commons.widget.HeightLimitedRecyclerView
android:id="@+id/rv_descriptions"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_margin_horizontal"
android:layout_marginBottom="@dimen/activity_margin_horizontal"
android:scrollbars="vertical"
android:fadeScrollbars="false"
android:scrollbarThumbVertical="@color/primaryColor"
android:scrollbarSize="@dimen/dimen_6"
android:scrollbarThumbVertical="@color/primaryColor"
android:scrollbars="vertical"
tools:visibility="visible" />
@ -109,8 +176,8 @@
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/copy_image_caption_description"
android:padding="@dimen/miniscule_margin"
android:text="@string/copy_image_caption_description"
android:textAlignment="textEnd"
android:textColor="@color/button_blue"
android:visibility="gone"
@ -120,21 +187,13 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_add_description"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="@dimen/fragment_height"
android:text="+" />
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:enabled="false"
android:alpha=".5"
android:enabled="false"
android:text="@string/next"
android:textColor="@android:color/white" />
@ -147,16 +206,6 @@
android:layout_marginRight="@dimen/standard_gap"
android:layout_toLeftOf="@+id/btn_next"
android:text="@string/previous" />
<Button
android:id="@+id/edit_image"
style="@style/Widget.AppCompat.Button.Borderless"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/standard_gap"
android:layout_marginBottom="24dp"
android:layout_toStartOf="@id/btn_previous"
android:contentDescription="Edit Image"
android:text="Edit Image" />
</RelativeLayout>

13
app/src/main/res/layout/row_item_description.xml
View file

@ -1,6 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView 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:layout_marginHorizontal="8dp"
@ -8,6 +9,7 @@
app:elevation="6dp">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_parent"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginHorizontal="20dp"
@ -23,6 +25,17 @@
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_remove" />
<ImageView
android:id="@+id/btn_add"
android:layout_width="24dp"
android:layout_height="wrap_content"
android:layout_marginEnd="10dp"
android:contentDescription="@string/remove"
android:visibility="visible"
app:layout_constraintEnd_toStartOf="@+id/btn_remove"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_add" />
<TextView
android:id="@+id/description_languages"
android:layout_width="wrap_content"