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

Add a button which will be displayed when nearby permission is not granted thus closest point can't be displayed on main screen. Besides, theme dependent click styles are added to button

Browse source
This commit is contained in:
neslihanturan 2018-09-13 12:51:19 +03:00
parent 69df3c01c9
commit 9fecc07ad7
4 changed files with 91 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/src/main/java/fr/free/nrw/commons/nearby/NearbyNoificationCardView.java
View file

@ -9,6 +9,7 @@ import android.view.View;
import android.view.animation.AnimationUtils; import android.view.animation.AnimationUtils;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.TextSwitcher; import android.widget.TextSwitcher;
import android.widget.TextView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@ -22,8 +23,8 @@ import fr.free.nrw.commons.notification.Notification;
public class NearbyNoificationCardView extends CardView{ public class NearbyNoificationCardView extends CardView{
private Context context; private Context context;
private TextSwitcher notificationTextSwitcher; private TextView notificationTextSwitcher;
private TextSwitcher notificationTimeSwitcher; private TextView notificationTimeSwitcher;
private ImageView notificationIcon; private ImageView notificationIcon;
public NearbyNoificationCardView(@NonNull Context context) { public NearbyNoificationCardView(@NonNull Context context) {

146
app/src/main/res/layout/nearby_card_view.xml
View file

@ -7,80 +7,84 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:minHeight="72dp"> android:minHeight="72dp">
<ImageView <Button
android:id="@+id/nearby_icon" android:layout_width="wrap_content"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:contentDescription="@string/no_image_found"
android:visibility="gone"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_location_white_24dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"
android:layout_toRightOf="@id/nearby_icon"
android:weightSum="4"
>
<TextSwitcher
android:id="@+id/nearby_title"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="3" android:text="Tab to see closest wikidata item needs photo"
android:layout_toRightOf="@id/nearby_icon"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginLeft="16dp" android:layout_marginLeft="8dp"
android:layout_marginRight="16dp" android:layout_marginRight="8dp"
android:layout_marginTop="16dp" android:layout_marginTop="8dp"
tools:text="test distance">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:singleLine="true"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:singleLine="true"
/>
</TextSwitcher>
<TextSwitcher
android:id="@+id/nearby_distance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:minWidth="48dp" android:minWidth="48dp"
android:textAppearance="@style/TextAppearance.AppCompat.Caption" android:textColor="@android:color/white"
tools:text="test distance"> android:singleLine="true"
<TextView android:theme="?attr/mainScreenNearbyPermissionbutton"
android:layout_width="wrap_content" style="@style/Widget.AppCompat.Button.Borderless"/>
android:layout_height="wrap_content" />
android:textColor="@android:color/white"
android:singleLine="true"
/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@android:color/white"
android:singleLine="true"
/>
</TextSwitcher>
</LinearLayout> <RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/nearby_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:contentDescription="@string/no_image_found"
android:visibility="gone"
android:scaleType="centerCrop"
app:srcCompat="@drawable/ic_location_white_24dp"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="horizontal"
android:layout_toRightOf="@id/nearby_icon"
android:weightSum="4"
>
<TextView
android:id="@+id/nearby_title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:layout_toRightOf="@id/nearby_icon"
android:layout_centerInParent="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
tools:text="test distance"
android:textColor="@android:color/white"
android:singleLine="true"
>
</TextView>
<TextView
android:id="@+id/nearby_distance"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginTop="16dp"
android:minWidth="48dp"
android:textAppearance="@style/TextAppearance.AppCompat.Caption"
tools:text="test distance"
android:textColor="@android:color/white"
android:singleLine="true"
>
</TextView>
</LinearLayout>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>

1
app/src/main/res/values/attrs.xml
View file

@ -19,6 +19,7 @@
<attr name="contributionsListBackground" format="reference"/> <attr name="contributionsListBackground" format="reference"/>
<attr name="mainTabBackground" format="reference"/> <attr name="mainTabBackground" format="reference"/>
<attr name="mainCardBackground" format="reference"/> <attr name="mainCardBackground" format="reference"/>
<attr name="mainScreenNearbyPermissionbutton" format="reference"/>
<declare-styleable name="CompatTextView"> <declare-styleable name="CompatTextView">

12
app/src/main/res/values/styles.xml
View file

@ -22,6 +22,8 @@
<item name="textDisabled">@color/disabled_button_text_color_dark</item> <item name="textDisabled">@color/disabled_button_text_color_dark</item>
<item name="textEnabled">@color/enabled_button_text_color_dark</item> <item name="textEnabled">@color/enabled_button_text_color_dark</item>
<item name="mainCardBackground">@color/main_background_dark</item> <item name="mainCardBackground">@color/main_background_dark</item>
<item name="mainScreenNearbyPermissionbutton">@style/DarkFlatNearbyPermissionButton</item>
</style> </style>
<style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar"> <style name="LightAppTheme" parent="Theme.AppCompat.Light.NoActionBar">
@ -45,6 +47,8 @@
<item name="textDisabled">@color/disabled_button_text_color_light</item> <item name="textDisabled">@color/disabled_button_text_color_light</item>
<item name="textEnabled">@color/enabled_button_text_color_light</item> <item name="textEnabled">@color/enabled_button_text_color_light</item>
<item name="mainCardBackground">@color/primaryDarkColor</item> <item name="mainCardBackground">@color/primaryDarkColor</item>
<item name="mainScreenNearbyPermissionbutton">@style/LightFlatNearbyPermissionButton</item>
</style> </style>
<style name="DarkSpinnerTheme" parent="DarkAppTheme"> <style name="DarkSpinnerTheme" parent="DarkAppTheme">
@ -55,6 +59,14 @@
<item name="colorControlNormal">#ffffff</item> <item name="colorControlNormal">#ffffff</item>
</style> </style>
<style name="DarkFlatNearbyPermissionButton" parent="DarkAppTheme">
<item name="colorControlHighlight">@color/contributionListDarkBackground</item>
</style>
<style name="LightFlatNearbyPermissionButton" parent="LightAppTheme">
<item name="colorControlHighlight">@color/colorPrimary</item>
</style>
<style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" /> <style name="ProgressBar" parent="Widget.AppCompat.ProgressBar.Horizontal" />
<style name="borderless_dialog"> <style name="borderless_dialog">