implement share location button, share location timespan, rename threadId to chatId

This commit is contained in:
cyBerta
2019-03-06 17:25:01 +01:00
committed by B. Petersen
parent 3e28cbed05
commit be8a718b3f
11 changed files with 176 additions and 68 deletions
+2 -2
View File
@@ -91,14 +91,14 @@
android:layout_height="53dp"
android:src="@drawable/ic_location_on_white_24dp"
android:scaleType="center"
android:visibility="gone"
android:visibility="visible"
android:contentDescription="@string/location"
app:circleColor="@color/location_icon"/>
<TextView android:layout_marginTop="10dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
android:visibility="visible"
style="@style/AttachmentTypeLabel"
android:text="@string/location"/>
+10
View File
@@ -129,6 +129,16 @@
<item>@string/mute_for_one_year</item>
</string-array>
<string-array name="share_location_durations">
<item>@string/share_location_once</item>
<item>@string/share_location_for_5_minutes</item>
<item>@string/share_location_for_30_minutes</item>
<item>@string/share_location_for_one_hour</item>
<item>@string/share_location_for_two_hours</item>
<item>@string/share_location_for_six_hours</item>
</string-array>
<string-array name="recipient_vibrate_entries">
<item>@string/def</item>
<item>@string/on</item>
+7
View File
@@ -144,6 +144,7 @@
<string name="menu_deaddrop">Contact requests</string>
<string name="menu_deaddrop_subtitle">Press message to start chatting</string>
<string name="menu_view_profile">View profile</string>
<string name="title_share_location">Share location</string>
<string name="mute_for_one_hour">Mute for 1 hour</string>
<string name="mute_for_two_hours">Mute for 2 hours</string>
@@ -151,6 +152,12 @@
<string name="mute_for_seven_days">Mute for 7 days</string>
<string name="mute_for_one_year">Mute for 1 year</string>
<string name="share_location_once">once</string>
<string name="share_location_for_5_minutes">for 5 minutes</string>
<string name="share_location_for_30_minutes">for 30 minutes</string>
<string name="share_location_for_one_hour">for 1 hour</string>
<string name="share_location_for_two_hours">for 2 hours</string>
<string name="share_location_for_six_hours">for 6 hours</string>
<!-- get confirmations -->
<string name="ask_leave_group">Are you sure you want to leave this group?</string>