gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-21 12:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add nice FAB animation & cleanups to layouts

Browse Source
This commit is contained in:
Mario Danic 2018-11-28 17:15:30 +01:00
parent 1c13d893fc
commit b1889abb1b
37 changed files with 460 additions and 444 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
app/src/main/java/com/nextcloud/talk/utils/FABAwareScrollingViewBehavior.java Normal file
View File

@ -0,0 +1,73 @@
/*
* Copyright 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.nextcloud.talk.utils;
import android.content.Context;
import android.util.AttributeSet;
import android.view.View;
import com.google.android.material.appbar.AppBarLayout;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import java.util.List;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.ViewCompat;
public class FABAwareScrollingViewBehavior extends AppBarLayout.ScrollingViewBehavior {
public FABAwareScrollingViewBehavior(Context context, AttributeSet attrs) {
super(context, attrs);
}
@Override
public boolean layoutDependsOn(CoordinatorLayout parent, View child, View dependency) {
return super.layoutDependsOn(parent, child, dependency) ||
dependency instanceof FloatingActionButton;
}
@Override
public boolean onStartNestedScroll(final CoordinatorLayout coordinatorLayout, final View child,
final View directTargetChild, final View target, final int nestedScrollAxes) {
// Ensure we react to vertical scrolling
return nestedScrollAxes == ViewCompat.SCROLL_AXIS_VERTICAL
|| super.onStartNestedScroll(coordinatorLayout, child, directTargetChild, target, nestedScrollAxes);
}
@Override
public void onNestedScroll(final CoordinatorLayout coordinatorLayout, final View child,
final View target, final int dxConsumed, final int dyConsumed,
final int dxUnconsumed, final int dyUnconsumed) {
super.onNestedScroll(coordinatorLayout, child, target, dxConsumed, dyConsumed, dxUnconsumed, dyUnconsumed);
if (dyConsumed > 0) {
// User scrolled down -> hide the FAB
List<View> dependencies = coordinatorLayout.getDependencies(child);
for (View view : dependencies) {
if (view instanceof FloatingActionButton) {
((FloatingActionButton) view).hide();
}
}
} else if (dyConsumed < 0) {
// User scrolled up -> show the FAB
List<View> dependencies = coordinatorLayout.getDependencies(child);
for (View view : dependencies) {
if (view instanceof FloatingActionButton) {
((FloatingActionButton) view).show();
}
}
}
}
}

3
app/src/main/res/layout/activity_magic_call.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

9
app/src/main/res/layout/activity_main.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
@ -16,8 +15,7 @@
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
/>
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
</com.google.android.material.appbar.AppBarLayout>
@ -25,7 +23,6 @@
android:id="@+id/controller_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
/>
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

3
app/src/main/res/layout/bottom_sheet.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

11
app/src/main/res/layout/call_item.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -44,19 +43,19 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white" />
<ImageView
android:id="@+id/remote_audio_off"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignParentStart="true"
android:layout_below="@id/peer_nick_text_view"
android:layout_marginEnd="8dp"
android:layout_alignParentStart="true"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_mic_off_white_24px"
android:visibility="invisible" />

15
app/src/main/res/layout/controller_account_verification.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -31,10 +30,10 @@
android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in"
@ -47,11 +46,11 @@
android:layout_below="@+id/progress_bar"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/padding_between_elements"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:textAlignment="center"
android:textSize="18sp"
tools:text="Verifying..." />

42
app/src/main/res/layout/controller_call.xml
View File

@ -100,33 +100,13 @@
</FrameLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/callControlsRelativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginTop="16dp"
android:layout_marginBottom="8dp"
android:animateLayoutChanges="true">
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/callControlHangupView"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_above="@id/callControlsLinearLayoutView"
android:layout_centerHorizontal="true"
app:checked="false"
app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px" />
<LinearLayout
android:id="@+id/callControlsLinearLayoutView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:layout_marginBottom="24dp"
android:layout_marginBottom="16dp"
android:animateLayoutChanges="true"
android:background="@android:color/transparent"
android:gravity="center">
@ -135,19 +115,28 @@
android:id="@+id/call_control_microphone"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="24dp"
android:layout_margin="24dp"
android:alpha="0.7"
app:checked="false"
app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_mic_off_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/callControlHangupView"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_margin="24dp"
app:checked="false"
app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/call_control_camera"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_margin="24dp"
android:alpha="0.7"
app:checked="false"
app:enableInitialAnimation="false"
@ -158,8 +147,7 @@
android:id="@+id/callControlEnableSpeaker"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_margin="24dp"
android:visibility="gone"
app:animateRearImage="false"
app:checked="false"
@ -170,5 +158,5 @@
app:rearImage="@drawable/ic_volume_up_white_24dp" />
</LinearLayout>
</RelativeLayout>
</RelativeLayout>

3
app/src/main/res/layout/controller_call_menu.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

7
app/src/main/res/layout/controller_call_notification.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -27,9 +26,9 @@
android:background="@color/grey950">
<RelativeLayout
android:id="@+id/incomingTextRelativeLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/incomingTextRelativeLayout">
android:layout_height="wrap_content">
<TextView
android:id="@+id/incomingCallTextView"

15
app/src/main/res/layout/controller_chat.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -29,10 +28,10 @@
android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in"
@ -77,6 +76,7 @@
app:incomingDefaultBubbleColor="@color/white_two"
app:incomingDefaultBubblePressedColor="@color/white_two"
app:incomingDefaultBubbleSelectedColor="@color/transparent"
app:incomingImageTimeTextSize="12sp"
app:incomingTextColor="@color/nc_incoming_text_default"
app:incomingTextLinkColor="@color/nc_incoming_text_default"
app:incomingTextSize="@dimen/chat_text_size"
@ -88,12 +88,11 @@
app:outcomingDefaultBubbleColor="@color/colorPrimary"
app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
app:outcomingDefaultBubbleSelectedColor="@color/transparent"
app:outcomingImageTimeTextSize="12sp"
app:outcomingTextColor="@color/nc_outcoming_text_default"
app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
app:outcomingTextSize="@dimen/chat_text_size"
app:outcomingTimeTextSize="12sp"
app:outcomingImageTimeTextSize="12sp"
app:incomingImageTimeTextSize="12sp"
app:textAutoLink="all" />
<com.webianks.library.PopupBubble
@ -123,8 +122,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:maxLength="1000"
android:inputType="textLongMessage|textAutoComplete"
android:maxLength="1000"
app:inputButtonDefaultBgColor="@color/colorPrimary"
app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
app:inputButtonHeight="30dp"

14
app/src/main/res/layout/controller_conversations_rv.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -20,8 +19,8 @@
-->
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/generic_rv_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -32,10 +31,10 @@
android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in" />
@ -68,7 +67,8 @@
android:id="@+id/swipeRefreshLayoutView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone">
android:visibility="gone"
app:layout_behavior="com.nextcloud.talk.utils.FABAwareScrollingViewBehavior">
<FrameLayout
android:layout_width="match_parent"

11
app/src/main/res/layout/controller_entry_menu.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -29,8 +28,8 @@
android:id="@+id/text_field_boxes"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:errorColor="@color/nc_darkRed"
app:helperText=" "
app:panelBackgroundColor="@color/nc_white_color"
@ -51,11 +50,11 @@
android:id="@+id/ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/text_field_boxes"
android:layout_marginBottom="12dp"
android:layout_marginEnd="8dp"
android:layout_alignParentEnd="true"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:alpha="0.7"
android:background="#0000"
android:enabled="false"

3
app/src/main/res/layout/controller_generic_rv.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

19
app/src/main/res/layout/controller_operations_menu.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -29,8 +28,8 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerInParent="true"
android:layout_marginBottom="24dp"
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in"
@ -41,10 +40,10 @@
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="8dp"
android:tintMode="src_in"
android:visibility="gone" />
@ -54,9 +53,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/result_image_view"
android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="12dp"
android:maxLines="3"
android:textAlignment="center"
android:textColor="@color/colorPrimary"
@ -66,10 +65,10 @@
android:id="@+id/ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/result_text_view"
android:layout_marginBottom="12dp"
android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:background="#0000"
android:text="@string/nc_ok"
android:textColor="@color/colorPrimary"
@ -80,8 +79,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/result_text_view"
android:layout_marginBottom="12dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:layout_toStartOf="@id/ok_button"
android:background="#0000"
android:text="@string/nc_join_via_web"

13
app/src/main/res/layout/controller_server_selection.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -31,8 +30,8 @@
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_centerHorizontal="true"
android:layout_marginBottom="36dp"
android:layout_marginTop="92dp"
android:layout_marginBottom="36dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_logo" />
@ -41,8 +40,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/image_logo"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:errorColor="@android:color/white"
app:helperText=" "
app:labelText="@string/nc_server_url"
@ -66,9 +65,9 @@
android:layout_height="@dimen/small_item_height"
android:layout_below="@id/text_field_boxes"
android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="24dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@android:color/white"
android:indeterminateTintMode="src_in"
@ -81,9 +80,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/progress_bar"
android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="56dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:lines="2"
android:text="@string/nc_get_from_provider"
android:textAlignment="center"
@ -96,9 +95,9 @@
android:layout_height="wrap_content"
android:layout_below="@id/helper_text_view"
android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:lines="2"
android:text="@string/nc_configure_cert_auth"
android:textAlignment="center"

19
app/src/main/res/layout/controller_settings.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -135,10 +134,10 @@
android:id="@+id/settings_always_vibrate"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_default_value="true"
apc:mp_key="@string/nc_settings_vibrate_key"
apc:mp_title="@string/nc_settings_vibrate"
apc:mp_summary="@string/nc_settings_vibrate_desc"
apc:mp_default_value="true"/>
apc:mp_title="@string/nc_settings_vibrate" />
</com.yarolegovich.mp.MaterialPreferenceCategory>
@ -158,8 +157,7 @@
apc:mp_entry_descriptions="@array/proxy_type_descriptions"
apc:mp_key="@string/nc_settings_proxy_type_key"
apc:mp_show_value="onRight"
apc:mp_title="@string/nc_settings_proxy_type_title">
</com.yarolegovich.mp.MaterialChoicePreference>
apc:mp_title="@string/nc_settings_proxy_type_title"></com.yarolegovich.mp.MaterialChoicePreference>
<com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_host_edit"
@ -223,24 +221,21 @@
android:id="@+id/settings_source_code"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_title="@string/nc_get_source_code">
</com.yarolegovich.mp.MaterialStandardPreference>
apc:mp_title="@string/nc_get_source_code"></com.yarolegovich.mp.MaterialStandardPreference>
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_licence"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_summary="@string/nc_license_summary"
apc:mp_title="@string/nc_license_title">
</com.yarolegovich.mp.MaterialStandardPreference>
apc:mp_title="@string/nc_license_title"></com.yarolegovich.mp.MaterialStandardPreference>
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_version"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_summary="v0.1"
apc:mp_title="@string/nc_app_name">
</com.yarolegovich.mp.MaterialStandardPreference>
apc:mp_title="@string/nc_app_name"></com.yarolegovich.mp.MaterialStandardPreference>
</com.yarolegovich.mp.MaterialPreferenceCategory>

9
app/src/main/res/layout/controller_web_view_login.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -30,10 +29,10 @@
android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in" />

8
app/src/main/res/layout/fast_scroller.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -25,14 +24,13 @@
android:id="@+id/fast_scroller"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignTop="@+id/swipe_refresh_layout"
android:layout_alignBottom="@+id/swipe_refresh_layout"
android:layout_alignParentEnd="true"
android:layout_alignTop="@+id/swipe_refresh_layout"
android:layout_centerHorizontal="true"
app:fastScrollerAutoHideDelayInMillis="1000"
app:fastScrollerAutoHideEnabled="true"
app:fastScrollerBubbleEnabled="true"
app:fastScrollerBubblePosition="adjacent"
app:fastScrollerIgnoreTouchesOutsideHandle="false"
tools:visibility="visible">
</eu.davidea.fastscroller.FastScroller>
tools:visibility="visible"></eu.davidea.fastscroller.FastScroller>

2
app/src/main/res/layout/item_custom_incoming_preview_message.xml
View File

@ -22,8 +22,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="2dp">
<com.stfalcon.chatkit.utils.ShapeImageView

10
app/src/main/res/layout/item_custom_incoming_text_message.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -19,15 +18,14 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="2dp"
android:layout_marginRight="16dp"
android:layout_marginTop="2dp">
android:layout_marginBottom="2dp">
<com.stfalcon.chatkit.utils.ShapeImageView
android:id="@id/messageUserAvatar"

14
app/src/main/res/layout/item_custom_outcoming_text_message.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -19,15 +18,14 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="16dp"
android:layout_marginTop="2dp"
android:layout_marginRight="16dp"
android:layout_marginTop="2dp">
android:layout_marginBottom="2dp">
<com.google.android.flexbox.FlexboxLayout
android:id="@id/bubble"
@ -44,10 +42,10 @@
android:id="@id/messageText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textIsSelectable="true"
android:layout_alignWithParentIfMissing="true"
android:textColorHighlight="@color/nc_grey"
android:layout_alignWithParentIfMissing="true"/>
android:textIsSelectable="true" />
<TextView
android:id="@id/messageTime"

11
app/src/main/res/layout/item_system_message.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -22,15 +21,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp">
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp">
<RelativeLayout
android:id="@id/bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@id/bubble"
android:layout_centerHorizontal="true">
<TextView

5
app/src/main/res/layout/notification_settings_item.xml
View File

@ -40,15 +40,14 @@
apc:mp_entry_values="@array/message_notification_levels_entry_values"
apc:mp_key="message_notification_level"
apc:mp_show_value="onBottom"
apc:mp_title="@string/nc_plain_old_messages">
</com.yarolegovich.mp.MaterialChoicePreference>
apc:mp_title="@string/nc_plain_old_messages"></com.yarolegovich.mp.MaterialChoicePreference>
<com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_mute_calls"
android:layout_width="match_parent"
android:layout_height="wrap_content"
apc:mp_key="mute_calls"
apc:mp_default_value="false"
apc:mp_key="mute_calls"
apc:mp_summary="@string/nc_mute_calls_description"
apc:mp_title="@string/nc_mute_calls" />

9
app/src/main/res/layout/rv_item_app.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -24,8 +23,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:paddingBottom="16dp"
android:paddingTop="16dp">
android:paddingTop="16dp"
android:paddingBottom="16dp">
<ImageView
android:id="@+id/icon_image_view"
@ -42,8 +41,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_toEndOf="@id/icon_image_view"
android:focusable="false"
android:focusableInTouchMode="false"

9
app/src/main/res/layout/rv_item_call_header.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -36,8 +35,8 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="8dp"
android:contentDescription="@null"
android:src="@drawable/ic_public_black_24px"
android:tint="@color/colorPrimary" />
@ -47,8 +46,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_toEndOf="@id/public_call_link"
android:ellipsize="middle"
android:singleLine="true"
@ -71,8 +70,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/nc_public_call_explanation"
android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceListItem"

5
app/src/main/res/layout/rv_item_contact.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -33,8 +32,8 @@
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="48dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:animationDuration="170"
app:enableInitialAnimation="true"
app:rearBackgroundColor="@color/colorPrimary" />

14
app/src/main/res/layout/rv_item_conversation.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -34,8 +33,7 @@
android:layout_centerVertical="true"
android:layout_marginStart="@dimen/activity_horizontal_margin">
<com.nextcloud.talk.utils.MagicFlipView
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/avatar_image"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
@ -49,8 +47,8 @@
android:layout_width="10dp"
android:layout_height="10dp"
android:layout_gravity="bottom|end"
android:layout_marginBottom="6dp"
android:layout_marginEnd="6dp"
android:layout_marginBottom="6dp"
android:src="@drawable/ic_lock_white_24px"
android:visibility="visible" />
@ -62,8 +60,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginStart="@dimen/margin_between_elements"
android:layout_toEndOf="@id/frame_layout"
android:layout_toStartOf="@+id/more_menu"
android:layout_toEndOf="@id/frame_layout"
android:orientation="vertical">
<com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
@ -91,11 +89,11 @@
android:layout_height="match_parent"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/margin_between_elements"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:background="?android:attr/selectableItemBackground"
android:paddingEnd="8dp"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:scaleType="center"
android:src="@drawable/ic_more_horiz_black_24dp" />

11
app/src/main/res/layout/rv_item_conversation_with_last_message.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -42,9 +41,9 @@
<ImageView
android:id="@id/dialogAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
android:contentDescription="@null"
tools:src="@drawable/ic_call_black_24dp" />
<ImageView
@ -68,8 +67,8 @@
android:layout_height="wrap_content"
android:layout_alignTop="@id/dialogAvatarFrameLayout"
android:layout_marginStart="8dp"
android:layout_toEndOf="@id/dialogAvatarFrameLayout"
android:layout_toStartOf="@id/dialogDate"
android:layout_toEndOf="@id/dialogAvatarFrameLayout"
android:ellipsize="end"
android:includeFontPadding="false"
android:maxLines="1"
@ -97,10 +96,10 @@
<ImageView
android:id="@id/dialogLastMessageUserAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height"
android:layout_marginEnd="8dp"
android:contentDescription="@null"
tools:src="@drawable/ic_call_black_24dp" />
<TextView
@ -108,8 +107,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
android:layout_toStartOf="@id/dialogUnreadBubble"
android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
android:ellipsize="end"
android:gravity="top"
android:lines="2"

3
app/src/main/res/layout/rv_item_empty_footer.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

5
app/src/main/res/layout/rv_item_mention.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -51,8 +50,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/margin_between_elements"
android:layout_marginStart="@dimen/margin_between_elements"
android:layout_marginEnd="@dimen/margin_between_elements"
android:layout_toEndOf="@id/frame_layout"
android:orientation="vertical">

3
app/src/main/res/layout/rv_item_menu.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic

8
app/src/main/res/layout/rv_item_notification_sound.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -25,14 +24,13 @@
android:orientation="vertical">
<com.nextcloud.talk.utils.MagicFlipView
xmlns:app="http://schemas.android.com/apk/res-auto"
<com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/magicFlipView"
android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="24dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:animationDuration="170"
app:checked="false"
app:enableInitialAnimation="true"

6
app/src/main/res/layout/rv_item_progress.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -19,8 +18,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout 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"

7
app/src/main/res/layout/rv_item_title_header.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -34,10 +33,10 @@
android:id="@+id/title_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:textColor="@color/colorPrimary"
tools:text="A" />

7
app/src/main/res/layout/view_message_input.xml
View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
<?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application
~
~ @author Mario Danic
@ -19,8 +18,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<merge
xmlns:android="http://schemas.android.com/apk/res/android"
<merge xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
@ -42,7 +40,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toEndOf="@id/attachmentButtonSpace"
android:layout_toStartOf="@id/sendButtonSpace"
android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/>