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();
}
}
}
}
}

15
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,15 +19,15 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true"
tools:context=".activities.MagicCallActivity"> tools:context=".activities.MagicCallActivity">
<com.bluelinelabs.conductor.ChangeHandlerFrameLayout <com.bluelinelabs.conductor.ChangeHandlerFrameLayout
android:id="@+id/controller_container" android:id="@+id/controller_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"/> android:layout_height="match_parent" />
</RelativeLayout> </RelativeLayout>

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

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

15
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,12 +19,12 @@
--> -->
<com.bluelinelabs.conductor.ChangeHandlerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <com.bluelinelabs.conductor.ChangeHandlerFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/bottom_sheet" android:id="@+id/bottom_sheet"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
app:layout_behavior="@string/appbar_scrolling_view_behavior"> app:layout_behavior="@string/appbar_scrolling_view_behavior">
</com.bluelinelabs.conductor.ChangeHandlerFrameLayout> </com.bluelinelabs.conductor.ChangeHandlerFrameLayout>

31
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,23 +19,23 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/relative_layout" android:id="@+id/relative_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical"> android:orientation="vertical">
<org.webrtc.SurfaceViewRenderer <org.webrtc.SurfaceViewRenderer
android:id="@+id/surface_view" android:id="@+id/surface_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="invisible"/> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/avatarImageView" android:id="@+id/avatarImageView"
android:layout_width="80dp" android:layout_width="80dp"
android:layout_height="80dp" android:layout_height="80dp"
android:layout_centerInParent="true"/> android:layout_centerInParent="true" />
<TextView <TextView
android:id="@+id/peer_nick_text_view" android:id="@+id/peer_nick_text_view"
@ -44,21 +43,21 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentStart="true" android:layout_alignParentStart="true"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginBottom="8dp"
android:layout_marginEnd="8dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:textColor="@android:color/white"/> android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/white" />
<ImageView <ImageView
android:id="@+id/remote_audio_off" android:id="@+id/remote_audio_off"
android:layout_width="16dp" android:layout_width="16dp"
android:layout_height="16dp" android:layout_height="16dp"
android:layout_alignParentStart="true"
android:layout_below="@id/peer_nick_text_view" android:layout_below="@id/peer_nick_text_view"
android:layout_marginEnd="8dp" android:layout_alignParentStart="true"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_mic_off_white_24px" android:src="@drawable/ic_mic_off_white_24px"
android:visibility="invisible"/> android:visibility="invisible" />
<ImageView <ImageView
android:id="@+id/remote_video_off" android:id="@+id/remote_video_off"
@ -68,6 +67,6 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_toEndOf="@id/remote_audio_off" android:layout_toEndOf="@id/remote_audio_off"
android:src="@drawable/ic_videocam_off_white_24px" android:src="@drawable/ic_videocam_off_white_24px"
android:visibility="invisible"/> android:visibility="invisible" />
</RelativeLayout> </RelativeLayout>

29
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,25 +19,25 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/nc_white_color" android:background="@color/nc_white_color"
android:keepScreenOn="true"> android:keepScreenOn="true">
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
android:layout_width="@dimen/item_height" android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:layout_centerInParent="true" 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_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:indeterminate="true"
android:indeterminateTint="@color/colorPrimary" android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in" android:indeterminateTintMode="src_in"
android:keepScreenOn="true"/> android:keepScreenOn="true" />
<TextView <TextView
android:id="@+id/progress_text" android:id="@+id/progress_text"
@ -47,13 +46,13 @@
android:layout_below="@+id/progress_bar" android:layout_below="@+id/progress_bar"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_centerVertical="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_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginTop="@dimen/padding_between_elements" 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:textAlignment="center"
android:textSize="18sp" android:textSize="18sp"
tools:text="Verifying..."/> tools:text="Verifying..." />
</RelativeLayout> </RelativeLayout>

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

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

13
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,16 +19,16 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/nc_white_color"> android:background="@color/nc_white_color">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
tools:listitem="@layout/rv_item_conversation"/> tools:listitem="@layout/rv_item_conversation" />
</RelativeLayout> </RelativeLayout>

31
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -19,17 +18,17 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/constraintLayout" android:id="@+id/constraintLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/grey950"> android:background="@color/grey950">
<RelativeLayout <RelativeLayout
android:id="@+id/incomingTextRelativeLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:id="@+id/incomingTextRelativeLayout">
<TextView <TextView
android:id="@+id/incomingCallTextView" android:id="@+id/incomingCallTextView"
@ -42,7 +41,7 @@
android:textSize="16sp" android:textSize="16sp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/> app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/conversationNameTextView" android:id="@+id/conversationNameTextView"
@ -54,7 +53,7 @@
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="28sp" android:textSize="28sp"
tools:text="Victor Gregorius Magnus"/> tools:text="Victor Gregorius Magnus" />
</RelativeLayout> </RelativeLayout>
@ -67,7 +66,7 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.45" app:layout_constraintVertical_bias="0.45"
tools:src="@color/white"/> tools:src="@color/white" />
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -86,7 +85,7 @@
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_mic_white_24px"/> app:frontImage="@drawable/ic_mic_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/callControlHangupView" android:id="@+id/callControlHangupView"
@ -96,7 +95,7 @@
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/nc_darkRed" app:frontBackgroundColor="@color/nc_darkRed"
app:frontImage="@drawable/ic_call_end_white_24px"/> app:frontImage="@drawable/ic_call_end_white_24px" />
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/callAnswerCameraView" android:id="@+id/callAnswerCameraView"
@ -107,7 +106,7 @@
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_videocam_white_24px"/> app:frontImage="@drawable/ic_videocam_white_24px" />
</LinearLayout> </LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

35
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,23 +19,23 @@
--> -->
<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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<ProgressBar <ProgressBar
android:id="@+id/progressBar" android:id="@+id/progressBar"
android:layout_width="@dimen/item_height" android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:layout_centerInParent="true" 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_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:indeterminate="true"
android:indeterminateTint="@color/colorPrimary" android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in" android:indeterminateTintMode="src_in"
android:visibility="gone"/> android:visibility="gone" />
<RelativeLayout <RelativeLayout
android:id="@+id/emptyLayout" android:id="@+id/emptyLayout"
@ -51,7 +50,7 @@
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:text="👋" android:text="👋"
android:textAlignment="center" android:textAlignment="center"
android:textSize="72sp"/> android:textSize="72sp" />
<TextView <TextView
android:id="@+id/sendHiTextView" android:id="@+id/sendHiTextView"
@ -60,7 +59,7 @@
android:layout_below="@+id/wawingTextView" android:layout_below="@+id/wawingTextView"
android:layout_margin="8dp" android:layout_margin="8dp"
android:textAlignment="center" android:textAlignment="center"
android:textSize="20sp"/> android:textSize="20sp" />
</RelativeLayout> </RelativeLayout>
<com.stfalcon.chatkit.messages.MessagesList <com.stfalcon.chatkit.messages.MessagesList
@ -77,6 +76,7 @@
app:incomingDefaultBubbleColor="@color/white_two" app:incomingDefaultBubbleColor="@color/white_two"
app:incomingDefaultBubblePressedColor="@color/white_two" app:incomingDefaultBubblePressedColor="@color/white_two"
app:incomingDefaultBubbleSelectedColor="@color/transparent" app:incomingDefaultBubbleSelectedColor="@color/transparent"
app:incomingImageTimeTextSize="12sp"
app:incomingTextColor="@color/nc_incoming_text_default" app:incomingTextColor="@color/nc_incoming_text_default"
app:incomingTextLinkColor="@color/nc_incoming_text_default" app:incomingTextLinkColor="@color/nc_incoming_text_default"
app:incomingTextSize="@dimen/chat_text_size" app:incomingTextSize="@dimen/chat_text_size"
@ -88,13 +88,12 @@
app:outcomingDefaultBubbleColor="@color/colorPrimary" app:outcomingDefaultBubbleColor="@color/colorPrimary"
app:outcomingDefaultBubblePressedColor="@color/colorPrimary" app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
app:outcomingDefaultBubbleSelectedColor="@color/transparent" app:outcomingDefaultBubbleSelectedColor="@color/transparent"
app:outcomingImageTimeTextSize="12sp"
app:outcomingTextColor="@color/nc_outcoming_text_default" app:outcomingTextColor="@color/nc_outcoming_text_default"
app:outcomingTextLinkColor="@color/nc_outcoming_text_default" app:outcomingTextLinkColor="@color/nc_outcoming_text_default"
app:outcomingTextSize="@dimen/chat_text_size" app:outcomingTextSize="@dimen/chat_text_size"
app:outcomingTimeTextSize="12sp" app:outcomingTimeTextSize="12sp"
app:outcomingImageTimeTextSize="12sp" app:textAutoLink="all" />
app:incomingImageTimeTextSize="12sp"
app:textAutoLink="all"/>
<com.webianks.library.PopupBubble <com.webianks.library.PopupBubble
android:id="@+id/popupBubbleView" android:id="@+id/popupBubbleView"
@ -107,7 +106,7 @@
app:pb_backgroundColor="@color/colorPrimary" app:pb_backgroundColor="@color/colorPrimary"
app:pb_icon="@drawable/ic_baseline_arrow_downward_24px" app:pb_icon="@drawable/ic_baseline_arrow_downward_24px"
app:pb_text="@string/nc_new_messages" app:pb_text="@string/nc_new_messages"
app:pb_textColor="@color/white"/> app:pb_textColor="@color/white" />
<View <View
android:id="@+id/separator" android:id="@+id/separator"
@ -116,15 +115,15 @@
android:layout_above="@+id/messageInputView" android:layout_above="@+id/messageInputView"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:background="@color/nc_light_grey"/> android:background="@color/nc_light_grey" />
<com.stfalcon.chatkit.messages.MessageInput <com.stfalcon.chatkit.messages.MessageInput
android:id="@+id/messageInputView" android:id="@+id/messageInputView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:maxLength="1000"
android:inputType="textLongMessage|textAutoComplete" android:inputType="textLongMessage|textAutoComplete"
android:maxLength="1000"
app:inputButtonDefaultBgColor="@color/colorPrimary" app:inputButtonDefaultBgColor="@color/colorPrimary"
app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark" app:inputButtonDefaultBgPressedColor="@color/colorPrimaryDark"
app:inputButtonHeight="30dp" app:inputButtonHeight="30dp"
@ -132,6 +131,6 @@
app:inputButtonWidth="30dp" app:inputButtonWidth="30dp"
app:inputHint="@string/nc_hint_enter_a_message" app:inputHint="@string/nc_hint_enter_a_message"
app:inputTextColor="@color/black" app:inputTextColor="@color/black"
app:inputTextSize="16sp"/> app:inputTextSize="16sp" />
</RelativeLayout> </RelativeLayout>

26
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,8 +19,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:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/generic_rv_layout" android:id="@+id/generic_rv_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -32,13 +31,13 @@
android:layout_width="@dimen/item_height" android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:layout_gravity="center" 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_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:indeterminate="true"
android:indeterminateTint="@color/colorPrimary" android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in"/> android:indeterminateTintMode="src_in" />
<RelativeLayout <RelativeLayout
android:id="@+id/emptyLayout" android:id="@+id/emptyLayout"
@ -51,7 +50,7 @@
android:layout_width="72dp" android:layout_width="72dp"
android:layout_height="72dp" android:layout_height="72dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:background="@drawable/ic_logo_blue"/> android:background="@drawable/ic_logo_blue" />
<TextView <TextView
android:id="@+id/sendHiTextView" android:id="@+id/sendHiTextView"
@ -61,14 +60,15 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:text="@string/nc_conversations_empty" android:text="@string/nc_conversations_empty"
android:textAlignment="center" android:textAlignment="center"
android:textSize="20sp"/> android:textSize="20sp" />
</RelativeLayout> </RelativeLayout>
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefreshLayoutView" android:id="@+id/swipeRefreshLayoutView"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:visibility="gone"> android:visibility="gone"
app:layout_behavior="com.nextcloud.talk.utils.FABAwareScrollingViewBehavior">
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -78,13 +78,13 @@
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:listitem="@layout/rv_item_conversation"/> tools:listitem="@layout/rv_item_conversation" />
</FrameLayout> </FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<include layout="@layout/fast_scroller"/> <include layout="@layout/fast_scroller" />
<com.google.android.material.floatingactionbutton.FloatingActionButton <com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton" android:id="@+id/floatingActionButton"
@ -92,6 +92,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="16dp" android:layout_margin="16dp"
app:srcCompat="@drawable/ic_add_white_24px"/> app:srcCompat="@drawable/ic_add_white_24px" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

23
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,17 +19,17 @@
--> -->
<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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/nc_white_color"> android:background="@color/nc_white_color">
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:id="@+id/text_field_boxes" android:id="@+id/text_field_boxes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:errorColor="@color/nc_darkRed" app:errorColor="@color/nc_darkRed"
app:helperText=" " app:helperText=" "
app:panelBackgroundColor="@color/nc_white_color" app:panelBackgroundColor="@color/nc_white_color"
@ -43,7 +42,7 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textUri" android:inputType="textUri"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/colorPrimary"/> android:textColor="@color/colorPrimary" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes> </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
@ -51,15 +50,15 @@
android:id="@+id/ok_button" android:id="@+id/ok_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/text_field_boxes" android:layout_below="@id/text_field_boxes"
android:layout_marginBottom="12dp" android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:alpha="0.7" android:alpha="0.7"
android:background="#0000" android:background="#0000"
android:enabled="false" android:enabled="false"
android:text="@string/nc_proceed" android:text="@string/nc_proceed"
android:textColor="@color/colorPrimary"/> android:textColor="@color/colorPrimary" />
</RelativeLayout> </RelativeLayout>

17
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,11 +19,11 @@
--> -->
<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:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/generic_rv_layout" android:id="@+id/generic_rv_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/nc_white_color"> android:background="@color/nc_white_color">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh_layout" android:id="@+id/swipe_refresh_layout"
@ -39,11 +38,11 @@
android:id="@+id/recycler_view" android:id="@+id/recycler_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:listitem="@layout/rv_item_conversation"/> tools:listitem="@layout/rv_item_conversation" />
</FrameLayout> </FrameLayout>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout> </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
<include layout="@layout/fast_scroller"/> <include layout="@layout/fast_scroller" />
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

35
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,33 +19,33 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/nc_white_color"> android:background="@color/nc_white_color">
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginBottom="24dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:indeterminate="true" android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary" android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in" android:indeterminateTintMode="src_in"
android:keepScreenOn="true"/> android:keepScreenOn="true" />
<ImageView <ImageView
android:id="@+id/result_image_view" android:id="@+id/result_image_view"
android:layout_width="48dp" android:layout_width="48dp"
android:layout_height="48dp" android:layout_height="48dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="8dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="8dp"
android:tintMode="src_in" android:tintMode="src_in"
android:visibility="gone"/> android:visibility="gone" />
<TextView <TextView
android:id="@+id/result_text_view" android:id="@+id/result_text_view"
@ -54,38 +53,38 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/result_image_view" android:layout_below="@id/result_image_view"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="12dp"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="12dp"
android:maxLines="3" android:maxLines="3"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:visibility="gone"/> android:visibility="gone" />
<Button <Button
android:id="@+id/ok_button" android:id="@+id/ok_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_below="@id/result_text_view" android:layout_below="@id/result_text_view"
android:layout_marginBottom="12dp" android:layout_alignParentEnd="true"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:background="#0000" android:background="#0000"
android:text="@string/nc_ok" android:text="@string/nc_ok"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:visibility="gone"/> android:visibility="gone" />
<Button <Button
android:id="@+id/web_button" android:id="@+id/web_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/result_text_view" android:layout_below="@id/result_text_view"
android:layout_marginBottom="12dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="12dp"
android:layout_toStartOf="@id/ok_button" android:layout_toStartOf="@id/ok_button"
android:background="#0000" android:background="#0000"
android:text="@string/nc_join_via_web" android:text="@string/nc_join_via_web"
android:textColor="@color/nc_darkGreen" android:textColor="@color/nc_darkGreen"
android:visibility="gone"/> android:visibility="gone" />
</RelativeLayout> </RelativeLayout>

33
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,29 +19,29 @@
--> -->
<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" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/colorPrimary" android:background="@color/colorPrimary"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true">
<ImageView <ImageView
android:id="@+id/image_logo" android:id="@+id/image_logo"
android:layout_width="96dp" android:layout_width="96dp"
android:layout_height="96dp" android:layout_height="96dp"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginBottom="36dp"
android:layout_marginTop="92dp" android:layout_marginTop="92dp"
android:layout_marginBottom="36dp"
android:scaleType="fitXY" android:scaleType="fitXY"
app:srcCompat="@drawable/ic_logo"/> app:srcCompat="@drawable/ic_logo" />
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes <studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:id="@+id/text_field_boxes" android:id="@+id/text_field_boxes"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/image_logo" android:layout_below="@id/image_logo"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:errorColor="@android:color/white" app:errorColor="@android:color/white"
app:helperText=" " app:helperText=" "
app:labelText="@string/nc_server_url" app:labelText="@string/nc_server_url"
@ -56,7 +55,7 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textUri" android:inputType="textUri"
android:singleLine="true" android:singleLine="true"
android:textColor="@android:color/white"/> android:textColor="@android:color/white" />
</studio.carbonylgroup.textfieldboxes.TextFieldBoxes> </studio.carbonylgroup.textfieldboxes.TextFieldBoxes>
@ -66,14 +65,14 @@
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/small_item_height"
android:layout_below="@id/text_field_boxes" android:layout_below="@id/text_field_boxes"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="24dp" android:layout_marginTop="24dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:indeterminate="true" android:indeterminate="true"
android:indeterminateTint="@android:color/white" android:indeterminateTint="@android:color/white"
android:indeterminateTintMode="src_in" android:indeterminateTintMode="src_in"
android:keepScreenOn="true" android:keepScreenOn="true"
android:visibility="invisible"/> android:visibility="invisible" />
<TextView <TextView
android:id="@+id/helper_text_view" android:id="@+id/helper_text_view"
@ -81,14 +80,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/progress_bar" android:layout_below="@id/progress_bar"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="56dp" android:layout_marginTop="56dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:lines="2" android:lines="2"
android:text="@string/nc_get_from_provider" android:text="@string/nc_get_from_provider"
android:textAlignment="center" android:textAlignment="center"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/nc_light_blue_color"/> android:textColor="@color/nc_light_blue_color" />
<TextView <TextView
android:id="@+id/cert_text_view" android:id="@+id/cert_text_view"
@ -96,13 +95,13 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/helper_text_view" android:layout_below="@id/helper_text_view"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginTop="16dp" android:layout_marginTop="16dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:lines="2" android:lines="2"
android:text="@string/nc_configure_cert_auth" android:text="@string/nc_configure_cert_auth"
android:textAlignment="center" android:textAlignment="center"
android:textAllCaps="true" android:textAllCaps="true"
android:textColor="@color/nc_light_blue_color"/> android:textColor="@color/nc_light_blue_color" />
</RelativeLayout> </RelativeLayout>

59
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,10 +19,10 @@
--> -->
<com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:apc="http://schemas.android.com/apk/res-auto" xmlns:apc="http://schemas.android.com/apk/res-auto"
android:id="@+id/settings_screen" android:id="@+id/settings_screen"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.yarolegovich.mp.MaterialPreferenceCategory <com.yarolegovich.mp.MaterialPreferenceCategory
android:id="@+id/message_view" android:id="@+id/message_view"
@ -35,7 +34,7 @@
android:id="@+id/message_text" android:id="@+id/message_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center"/> android:gravity="center" />
</com.yarolegovich.mp.MaterialPreferenceCategory> </com.yarolegovich.mp.MaterialPreferenceCategory>
<com.yarolegovich.mp.MaterialPreferenceCategory <com.yarolegovich.mp.MaterialPreferenceCategory
@ -51,7 +50,7 @@
android:id="@+id/avatar_image" android:id="@+id/avatar_image"
android:layout_width="@dimen/avatar_size_big" android:layout_width="@dimen/avatar_size_big"
android:layout_height="@dimen/avatar_size_big" android:layout_height="@dimen/avatar_size_big"
android:layout_centerHorizontal="true"/> android:layout_centerHorizontal="true" />
<TextView <TextView
android:id="@+id/display_name_text" android:id="@+id/display_name_text"
@ -59,7 +58,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/avatar_image" android:layout_below="@id/avatar_image"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/margin_between_elements"/> android:layout_marginTop="@dimen/margin_between_elements" />
<TextView <TextView
android:id="@+id/base_url_text" android:id="@+id/base_url_text"
@ -67,7 +66,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/display_name_text" android:layout_below="@id/display_name_text"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
android:layout_margin="4dp"/> android:layout_margin="4dp" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
@ -76,35 +75,35 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/base_url_text" android:layout_below="@id/base_url_text"
android:tag="switchAccountButton" android:tag="switchAccountButton"
apc:mp_title="@string/nc_settings_switch_account"/> apc:mp_title="@string/nc_settings_switch_account" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_reauthorize" android:id="@+id/settings_reauthorize"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/settings_switch" android:layout_below="@id/settings_switch"
apc:mp_title="@string/nc_settings_reauthorize"/> apc:mp_title="@string/nc_settings_reauthorize" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_client_cert" android:id="@+id/settings_client_cert"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/settings_reauthorize" android:layout_below="@id/settings_reauthorize"
apc:mp_title="@string/nc_client_cert_setup"/> apc:mp_title="@string/nc_client_cert_setup" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_remove_account" android:id="@+id/settings_remove_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/settings_client_cert" android:layout_below="@id/settings_client_cert"
apc:mp_title="@string/nc_settings_remove_account"/> apc:mp_title="@string/nc_settings_remove_account" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_add_account" android:id="@+id/settings_add_account"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/settings_remove_account" android:layout_below="@id/settings_remove_account"
apc:mp_title="@string/nc_settings_add_account"/> apc:mp_title="@string/nc_settings_add_account" />
</RelativeLayout> </RelativeLayout>
@ -122,23 +121,23 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_call_ringtone_key" apc:mp_key="@string/nc_settings_call_ringtone_key"
apc:mp_title="@string/nc_settings_call_ringtone"/> apc:mp_title="@string/nc_settings_call_ringtone" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_message_sound" android:id="@+id/settings_message_sound"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_message_ringtone_key" apc:mp_key="@string/nc_settings_message_ringtone_key"
apc:mp_title="@string/nc_settings_other_notifications_ringtone"/> apc:mp_title="@string/nc_settings_other_notifications_ringtone" />
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/settings_always_vibrate" android:id="@+id/settings_always_vibrate"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_default_value="true"
apc:mp_key="@string/nc_settings_vibrate_key" 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_summary="@string/nc_settings_vibrate_desc"
apc:mp_default_value="true"/> apc:mp_title="@string/nc_settings_vibrate" />
</com.yarolegovich.mp.MaterialPreferenceCategory> </com.yarolegovich.mp.MaterialPreferenceCategory>
@ -158,8 +157,7 @@
apc:mp_entry_descriptions="@array/proxy_type_descriptions" apc:mp_entry_descriptions="@array/proxy_type_descriptions"
apc:mp_key="@string/nc_settings_proxy_type_key" apc:mp_key="@string/nc_settings_proxy_type_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_settings_proxy_type_title"> apc:mp_title="@string/nc_settings_proxy_type_title"></com.yarolegovich.mp.MaterialChoicePreference>
</com.yarolegovich.mp.MaterialChoicePreference>
<com.yarolegovich.mp.MaterialEditTextPreference <com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_host_edit" android:id="@+id/settings_proxy_host_edit"
@ -167,7 +165,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_host_key" apc:mp_key="@string/nc_settings_proxy_host_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_settings_proxy_host_title"/> apc:mp_title="@string/nc_settings_proxy_host_title" />
<com.yarolegovich.mp.MaterialEditTextPreference <com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_port_edit" android:id="@+id/settings_proxy_port_edit"
@ -175,7 +173,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_port_key" apc:mp_key="@string/nc_settings_proxy_port_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_settings_proxy_port_title"/> apc:mp_title="@string/nc_settings_proxy_port_title" />
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/settings_proxy_use_credentials" android:id="@+id/settings_proxy_use_credentials"
@ -194,7 +192,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_username_key" apc:mp_key="@string/nc_settings_proxy_username_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_username"/> apc:mp_title="@string/nc_username" />
<com.yarolegovich.mp.MaterialEditTextPreference <com.yarolegovich.mp.MaterialEditTextPreference
android:id="@+id/settings_proxy_password_edit" android:id="@+id/settings_proxy_password_edit"
@ -202,7 +200,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="@string/nc_settings_proxy_password_key" apc:mp_key="@string/nc_settings_proxy_password_key"
apc:mp_show_value="onRight" apc:mp_show_value="onRight"
apc:mp_title="@string/nc_password"/> apc:mp_title="@string/nc_password" />
</com.yarolegovich.mp.MaterialPreferenceCategory> </com.yarolegovich.mp.MaterialPreferenceCategory>
@ -217,30 +215,27 @@
android:id="@+id/settings_privacy" android:id="@+id/settings_privacy"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_title="@string/nc_privacy"/> apc:mp_title="@string/nc_privacy" />
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_source_code" android:id="@+id/settings_source_code"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_title="@string/nc_get_source_code"> apc:mp_title="@string/nc_get_source_code"></com.yarolegovich.mp.MaterialStandardPreference>
</com.yarolegovich.mp.MaterialStandardPreference>
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_licence" android:id="@+id/settings_licence"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_summary="@string/nc_license_summary" apc:mp_summary="@string/nc_license_summary"
apc:mp_title="@string/nc_license_title"> apc:mp_title="@string/nc_license_title"></com.yarolegovich.mp.MaterialStandardPreference>
</com.yarolegovich.mp.MaterialStandardPreference>
<com.yarolegovich.mp.MaterialStandardPreference <com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_version" android:id="@+id/settings_version"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_summary="v0.1" apc:mp_summary="v0.1"
apc:mp_title="@string/nc_app_name"> apc:mp_title="@string/nc_app_name"></com.yarolegovich.mp.MaterialStandardPreference>
</com.yarolegovich.mp.MaterialStandardPreference>
</com.yarolegovich.mp.MaterialPreferenceCategory> </com.yarolegovich.mp.MaterialPreferenceCategory>

19
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,23 +19,23 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout 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:keepScreenOn="true" android:keepScreenOn="true"
android:orientation="vertical"> android:orientation="vertical">
<ProgressBar <ProgressBar
android:id="@+id/progress_bar" android:id="@+id/progress_bar"
android:layout_width="@dimen/item_height" android:layout_width="@dimen/item_height"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:layout_centerInParent="true" 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_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:indeterminate="true"
android:indeterminateTint="@color/colorPrimary" android:indeterminateTint="@color/colorPrimary"
android:indeterminateTintMode="src_in"/> android:indeterminateTintMode="src_in" />
<WebView <WebView
android:id="@+id/webview" android:id="@+id/webview"

34
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,19 +19,18 @@
--> -->
<eu.davidea.fastscroller.FastScroller xmlns:android="http://schemas.android.com/apk/res/android" <eu.davidea.fastscroller.FastScroller xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/fast_scroller" android:id="@+id/fast_scroller"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignBottom="@+id/swipe_refresh_layout" android:layout_alignTop="@+id/swipe_refresh_layout"
android:layout_alignParentEnd="true" android:layout_alignBottom="@+id/swipe_refresh_layout"
android:layout_alignTop="@+id/swipe_refresh_layout" android:layout_alignParentEnd="true"
android:layout_centerHorizontal="true" android:layout_centerHorizontal="true"
app:fastScrollerAutoHideDelayInMillis="1000" app:fastScrollerAutoHideDelayInMillis="1000"
app:fastScrollerAutoHideEnabled="true" app:fastScrollerAutoHideEnabled="true"
app:fastScrollerBubbleEnabled="true" app:fastScrollerBubbleEnabled="true"
app:fastScrollerBubblePosition="adjacent" app:fastScrollerBubblePosition="adjacent"
app:fastScrollerIgnoreTouchesOutsideHandle="false" app:fastScrollerIgnoreTouchesOutsideHandle="false"
tools:visibility="visible"> tools:visibility="visible"></eu.davidea.fastscroller.FastScroller>
</eu.davidea.fastscroller.FastScroller>

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

@ -22,8 +22,8 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="2dp"> android:layout_marginBottom="2dp">
<com.stfalcon.chatkit.utils.ShapeImageView <com.stfalcon.chatkit.utils.ShapeImageView
@ -71,7 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_alignParentEnd="true"/> android:layout_alignParentEnd="true" />
</RelativeLayout> </RelativeLayout>

18
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -19,22 +18,21 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginTop="2dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="2dp"> android:layout_marginBottom="2dp">
<com.stfalcon.chatkit.utils.ShapeImageView <com.stfalcon.chatkit.utils.ShapeImageView
android:id="@id/messageUserAvatar" android:id="@id/messageUserAvatar"
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:layout_marginEnd="8dp"/> android:layout_marginEnd="8dp" />
<com.google.android.flexbox.FlexboxLayout <com.google.android.flexbox.FlexboxLayout
android:id="@id/bubble" android:id="@id/bubble"
@ -53,7 +51,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="12sp"/> android:textSize="12sp" />
<com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
android:id="@id/messageText" android:id="@id/messageText"
@ -62,7 +60,7 @@
android:textIsSelectable="true" android:textIsSelectable="true"
app:layout_alignSelf="flex_start" app:layout_alignSelf="flex_start"
app:layout_flexGrow="1" app:layout_flexGrow="1"
app:layout_wrapBefore="true"/> app:layout_wrapBefore="true" />
<TextView <TextView
@ -71,7 +69,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app:layout_alignSelf="center"/> app:layout_alignSelf="center" />
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</RelativeLayout> </RelativeLayout>

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

@ -65,7 +65,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:textColor="@color/white60"/> android:textColor="@color/white60" />
</RelativeLayout> </RelativeLayout>

16
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -19,15 +18,14 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<RelativeLayout <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="2dp"
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
android:layout_marginTop="2dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:layout_marginTop="2dp"> android:layout_marginBottom="2dp">
<com.google.android.flexbox.FlexboxLayout <com.google.android.flexbox.FlexboxLayout
android:id="@id/bubble" android:id="@id/bubble"
@ -44,10 +42,10 @@
android:id="@id/messageText" android:id="@id/messageText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textIsSelectable="true" android:layout_alignWithParentIfMissing="true"
android:textColorHighlight="@color/nc_grey" android:textColorHighlight="@color/nc_grey"
android:layout_alignWithParentIfMissing="true"/> android:textIsSelectable="true" />
<TextView <TextView
android:id="@id/messageTime" android:id="@id/messageTime"
@ -55,7 +53,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/messageText" android:layout_below="@id/messageText"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
app:layout_alignSelf="center"/> app:layout_alignSelf="center" />
</com.google.android.flexbox.FlexboxLayout> </com.google.android.flexbox.FlexboxLayout>
</RelativeLayout> </RelativeLayout>

19
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,17 +19,17 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp" android:layout_marginTop="8dp"
android:layout_marginStart="16dp" android:layout_marginEnd="16dp"
android:layout_marginTop="8dp"> android:layout_marginBottom="8dp">
<RelativeLayout <RelativeLayout
android:id="@id/bubble"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@id/bubble"
android:layout_centerHorizontal="true"> android:layout_centerHorizontal="true">
<TextView <TextView
@ -41,7 +40,7 @@
android:gravity="center_horizontal" android:gravity="center_horizontal"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textSize="12sp"/> android:textSize="12sp" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

12
app/src/main/res/layout/library_fast_scroller_layout.xml
View File

@ -1,15 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<merge xmlns:android="http://schemas.android.com/apk/res/android" <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"> android:layout_height="match_parent">
<View <View
android:id="@+id/fast_scroller_bar" android:id="@+id/fast_scroller_bar"
android:layout_width="7dp" android:layout_width="7dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="end" android:layout_gravity="end"
android:background="@color/transparent"/> android:background="@color/transparent" />
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -30,7 +30,7 @@
android:textSize="38sp" android:textSize="38sp"
android:visibility="gone" android:visibility="gone"
tools:text="A" tools:text="A"
tools:visibility="visible"/> tools:visibility="visible" />
<ImageView <ImageView
android:id="@+id/fast_scroller_handle" android:id="@+id/fast_scroller_handle"
@ -40,7 +40,7 @@
android:alpha="0.5" android:alpha="0.5"
android:contentDescription="@null" android:contentDescription="@null"
android:paddingStart="6dp" android:paddingStart="6dp"
android:src="@drawable/fast_scroller_handle"/> android:src="@drawable/fast_scroller_handle" />
</RelativeLayout> </RelativeLayout>

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_entry_values="@array/message_notification_levels_entry_values"
apc:mp_key="message_notification_level" apc:mp_key="message_notification_level"
apc:mp_show_value="onBottom" apc:mp_show_value="onBottom"
apc:mp_title="@string/nc_plain_old_messages"> apc:mp_title="@string/nc_plain_old_messages"></com.yarolegovich.mp.MaterialChoicePreference>
</com.yarolegovich.mp.MaterialChoicePreference>
<com.yarolegovich.mp.MaterialSwitchPreference <com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_mute_calls" android:id="@+id/conversation_info_mute_calls"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
apc:mp_key="mute_calls"
apc:mp_default_value="false" apc:mp_default_value="false"
apc:mp_key="mute_calls"
apc:mp_summary="@string/nc_mute_calls_description" apc:mp_summary="@string/nc_mute_calls_description"
apc:mp_title="@string/nc_mute_calls" /> apc:mp_title="@string/nc_mute_calls" />

21
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,12 +19,12 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white" android:background="@color/white"
android:paddingBottom="16dp" android:paddingTop="16dp"
android:paddingTop="16dp"> android:paddingBottom="16dp">
<ImageView <ImageView
android:id="@+id/icon_image_view" android:id="@+id/icon_image_view"
@ -35,20 +34,20 @@
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
tools:src="@drawable/ic_add_grey600_24px"/> tools:src="@drawable/ic_add_grey600_24px" />
<TextView <TextView
android:id="@+id/app_title_text_view" android:id="@+id/app_title_text_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_toEndOf="@id/icon_image_view" android:layout_toEndOf="@id/icon_image_view"
android:focusable="false" android:focusable="false"
android:focusableInTouchMode="false" android:focusableInTouchMode="false"
android:textColor="@color/black" android:textColor="@color/black"
android:textSize="16sp" android:textSize="16sp"
tools:text="Start a new conversation"/> tools:text="Start a new conversation" />
</RelativeLayout> </RelativeLayout>

25
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,11 +19,11 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/call_header_layout" android:id="@+id/call_header_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<RelativeLayout <RelativeLayout
android:id="@+id/initial_relative_layout" android:id="@+id/initial_relative_layout"
@ -36,25 +35,25 @@
android:layout_width="32dp" android:layout_width="32dp"
android:layout_height="32dp" android:layout_height="32dp"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginStart="@dimen/activity_horizontal_margin" android:layout_marginStart="@dimen/activity_horizontal_margin"
android:layout_marginEnd="8dp"
android:contentDescription="@null" android:contentDescription="@null"
android:src="@drawable/ic_public_black_24px" android:src="@drawable/ic_public_black_24px"
android:tint="@color/colorPrimary"/> android:tint="@color/colorPrimary" />
<TextView <TextView
android:id="@+id/description_text" android:id="@+id/description_text"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@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:layout_toEndOf="@id/public_call_link"
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:text="@string/nc_public_call" android:text="@string/nc_public_call"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
tools:text="@string/nc_public_call"/> tools:text="@string/nc_public_call" />
</RelativeLayout> </RelativeLayout>
@ -71,12 +70,12 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="24dp"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="24dp"
android:text="@string/nc_public_call_explanation" android:text="@string/nc_public_call_explanation"
android:textAlignment="center" android:textAlignment="center"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
tools:text="@string/nc_public_call_explanation"/> tools:text="@string/nc_public_call_explanation" />
</RelativeLayout> </RelativeLayout>
</RelativeLayout> </RelativeLayout>

19
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -22,22 +21,22 @@
--> -->
<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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:orientation="vertical"> android:orientation="vertical">
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView
android:id="@+id/avatar_flip_view" android:id="@+id/avatar_flip_view"
android:layout_width="@dimen/avatar_size" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="48dp" android:layout_marginStart="48dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:animationDuration="170" app:animationDuration="170"
app:enableInitialAnimation="true" app:enableInitialAnimation="true"
app:rearBackgroundColor="@color/colorPrimary"/> app:rearBackgroundColor="@color/colorPrimary" />
<TextView <TextView
android:id="@+id/name_text" android:id="@+id/name_text"
@ -48,6 +47,6 @@
android:layout_toEndOf="@id/avatar_flip_view" android:layout_toEndOf="@id/avatar_flip_view"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
tools:text="Contact item text"/> tools:text="Contact item text" />
</RelativeLayout> </RelativeLayout>

30
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -22,9 +21,9 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/item_height"> android:layout_height="@dimen/item_height">
<FrameLayout <FrameLayout
@ -34,25 +33,24 @@
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginStart="@dimen/activity_horizontal_margin"> android:layout_marginStart="@dimen/activity_horizontal_margin">
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/avatar_image" android:id="@+id/avatar_image"
android:layout_width="@dimen/avatar_size" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size" android:layout_height="@dimen/avatar_size"
app:animationDuration="170" app:animationDuration="170"
app:checked="false" app:checked="false"
app:enableInitialAnimation="true" app:enableInitialAnimation="true"
app:rearBackgroundColor="@color/colorPrimary"/> app:rearBackgroundColor="@color/colorPrimary" />
<ImageView <ImageView
android:id="@+id/password_protected_image_view" android:id="@+id/password_protected_image_view"
android:layout_width="10dp" android:layout_width="10dp"
android:layout_height="10dp" android:layout_height="10dp"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_marginBottom="6dp"
android:layout_marginEnd="6dp" android:layout_marginEnd="6dp"
android:layout_marginBottom="6dp"
android:src="@drawable/ic_lock_white_24px" android:src="@drawable/ic_lock_white_24px"
android:visibility="visible"/> android:visibility="visible" />
</FrameLayout> </FrameLayout>
@ -62,8 +60,8 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginStart="@dimen/margin_between_elements" android:layout_marginStart="@dimen/margin_between_elements"
android:layout_toEndOf="@id/frame_layout"
android:layout_toStartOf="@+id/more_menu" android:layout_toStartOf="@+id/more_menu"
android:layout_toEndOf="@id/frame_layout"
android:orientation="vertical"> android:orientation="vertical">
<com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonTextView
@ -73,7 +71,7 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
tools:text="Call item text"/> tools:text="Call item text" />
<TextView <TextView
android:id="@+id/secondary_text" android:id="@+id/secondary_text"
@ -81,7 +79,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
tools:text="A week ago"/> tools:text="A week ago" />
</LinearLayout> </LinearLayout>
@ -91,12 +89,12 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="@dimen/margin_between_elements" android:layout_marginStart="@dimen/margin_between_elements"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:background="?android:attr/selectableItemBackground" android:background="?android:attr/selectableItemBackground"
android:paddingEnd="8dp"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingEnd="8dp"
android:scaleType="center" android:scaleType="center"
android:src="@drawable/ic_more_horiz_black_24dp"/> android:src="@drawable/ic_more_horiz_black_24dp" />
</RelativeLayout> </RelativeLayout>

33
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -24,9 +23,9 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<RelativeLayout <RelativeLayout
@ -42,24 +41,24 @@
<ImageView <ImageView
android:id="@id/dialogAvatar" android:id="@id/dialogAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/avatar_size" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size" android:layout_height="@dimen/avatar_size"
tools:src="@drawable/ic_call_black_24dp"/> android:contentDescription="@null"
tools:src="@drawable/ic_call_black_24dp" />
<ImageView <ImageView
android:id="@+id/passwordProtectedRoomImageView" android:id="@+id/passwordProtectedRoomImageView"
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="12dp" android:layout_height="12dp"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:background="@drawable/shape_lock_bubble"/> android:background="@drawable/shape_lock_bubble" />
<ImageView <ImageView
android:id="@+id/favoriteConversationImageView" android:id="@+id/favoriteConversationImageView"
android:layout_width="12dp" android:layout_width="12dp"
android:layout_height="12dp" android:layout_height="12dp"
android:layout_gravity="top|end" android:layout_gravity="top|end"
android:background="@drawable/shape_favorite_bubble"/> android:background="@drawable/shape_favorite_bubble" />
</FrameLayout> </FrameLayout>
<TextView <TextView
@ -68,14 +67,14 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignTop="@id/dialogAvatarFrameLayout" android:layout_alignTop="@id/dialogAvatarFrameLayout"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_toEndOf="@id/dialogAvatarFrameLayout"
android:layout_toStartOf="@id/dialogDate" android:layout_toStartOf="@id/dialogDate"
android:layout_toEndOf="@id/dialogAvatarFrameLayout"
android:ellipsize="end" android:ellipsize="end"
android:includeFontPadding="false" android:includeFontPadding="false"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/nc_incoming_text_default" android:textColor="@color/nc_incoming_text_default"
android:textSize="16sp" android:textSize="16sp"
tools:text="Best conversation"/> tools:text="Best conversation" />
<TextView <TextView
android:id="@id/dialogDate" android:id="@id/dialogDate"
@ -84,7 +83,7 @@
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1" android:maxLines="1"
android:textColor="@color/warm_grey_two"/> android:textColor="@color/warm_grey_two" />
<RelativeLayout <RelativeLayout
android:id="@+id/dialogLastMessageLayout" android:id="@+id/dialogLastMessageLayout"
@ -97,25 +96,25 @@
<ImageView <ImageView
android:id="@id/dialogLastMessageUserAvatar" android:id="@id/dialogLastMessageUserAvatar"
android:contentDescription="@null"
android:layout_width="@dimen/small_item_height" android:layout_width="@dimen/small_item_height"
android:layout_height="@dimen/small_item_height" android:layout_height="@dimen/small_item_height"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
tools:src="@drawable/ic_call_black_24dp"/> android:contentDescription="@null"
tools:src="@drawable/ic_call_black_24dp" />
<TextView <TextView
android:id="@id/dialogLastMessage" android:id="@id/dialogLastMessage"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
android:layout_toStartOf="@id/dialogUnreadBubble" android:layout_toStartOf="@id/dialogUnreadBubble"
android:layout_toEndOf="@id/dialogLastMessageUserAvatar"
android:ellipsize="end" android:ellipsize="end"
android:gravity="top" android:gravity="top"
android:lines="2" android:lines="2"
android:singleLine="false" android:singleLine="false"
android:textColor="@color/warm_grey_four" android:textColor="@color/warm_grey_four"
tools:text="This is the last message\nof an incredibly long two line conversation text"/> tools:text="This is the last message\nof an incredibly long two line conversation text" />
<TextView <TextView
android:id="@id/dialogUnreadBubble" android:id="@id/dialogUnreadBubble"
@ -128,7 +127,7 @@
android:lines="1" android:lines="1"
android:textAlignment="center" android:textAlignment="center"
android:textColor="@color/white" android:textColor="@color/white"
tools:text="1"/> tools:text="1" />
</RelativeLayout> </RelativeLayout>

9
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,8 +19,8 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="48dp" android:layout_height="48dp"
android:orientation="vertical"> android:orientation="vertical">
</LinearLayout> </LinearLayout>

21
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -22,11 +21,11 @@
--> -->
<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" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:orientation="vertical"> android:orientation="vertical">
<FrameLayout <FrameLayout
android:id="@+id/frame_layout" android:id="@+id/frame_layout"
@ -42,7 +41,7 @@
app:animationDuration="170" app:animationDuration="170"
app:checked="false" app:checked="false"
app:enableInitialAnimation="false" app:enableInitialAnimation="false"
app:rearBackgroundColor="@color/colorPrimary"/> app:rearBackgroundColor="@color/colorPrimary" />
</FrameLayout> </FrameLayout>
@ -51,8 +50,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_marginEnd="@dimen/margin_between_elements"
android:layout_marginStart="@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:layout_toEndOf="@id/frame_layout"
android:orientation="vertical"> android:orientation="vertical">
@ -63,7 +62,7 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceListItem" android:textAppearance="?android:attr/textAppearanceListItem"
tools:text="Call item text"/> tools:text="Call item text" />
<TextView <TextView
android:id="@+id/secondary_text" android:id="@+id/secondary_text"
@ -72,7 +71,7 @@
android:ellipsize="middle" android:ellipsize="middle"
android:singleLine="true" android:singleLine="true"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
tools:text="A week ago"/> tools:text="A week ago" />
</LinearLayout> </LinearLayout>

13
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -22,10 +21,10 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="@color/white"> android:background="@color/white">
<TextView <TextView
android:id="@+id/menu_text" android:id="@+id/menu_text"
@ -39,5 +38,5 @@
android:textSize="16sp" android:textSize="16sp"
tools:drawableLeft="@drawable/ic_add_grey600_24px" tools:drawableLeft="@drawable/ic_add_grey600_24px"
tools:drawablePadding="16dp" tools:drawablePadding="16dp"
tools:text="Start a new conversation"/> tools:text="Start a new conversation" />
</RelativeLayout> </RelativeLayout>

18
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,25 +19,24 @@
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/item_height" android:layout_height="@dimen/item_height"
android:orientation="vertical"> android:orientation="vertical">
<com.nextcloud.talk.utils.MagicFlipView <com.nextcloud.talk.utils.MagicFlipView xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/magicFlipView" android:id="@+id/magicFlipView"
android:layout_width="@dimen/avatar_size" android:layout_width="@dimen/avatar_size"
android:layout_height="@dimen/avatar_size" android:layout_height="@dimen/avatar_size"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginStart="24dp" android:layout_marginStart="24dp"
android:layout_marginEnd="@dimen/activity_horizontal_margin"
app:animationDuration="170" app:animationDuration="170"
app:checked="false" app:checked="false"
app:enableInitialAnimation="true" app:enableInitialAnimation="true"
app:frontBackgroundColor="@color/colorPrimary" app:frontBackgroundColor="@color/colorPrimary"
app:frontImage="@drawable/ic_play_circle_outline_white_24dp" app:frontImage="@drawable/ic_play_circle_outline_white_24dp"
app:rearBackgroundColor="@color/colorPrimary"/> app:rearBackgroundColor="@color/colorPrimary" />
<TextView <TextView
android:id="@+id/notificationNameTextView" android:id="@+id/notificationNameTextView"
@ -48,6 +46,6 @@
android:layout_margin="8dp" android:layout_margin="8dp"
android:layout_toEndOf="@id/magicFlipView" android:layout_toEndOf="@id/magicFlipView"
android:ellipsize="end" android:ellipsize="end"
android:textAppearance="?android:attr/textAppearanceListItem"/> android:textAppearance="?android:attr/textAppearanceListItem" />
</RelativeLayout> </RelativeLayout>

10
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -19,8 +18,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<FrameLayout <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -31,7 +29,7 @@
style="@style/Widget.AppCompat.ProgressBar" style="@style/Widget.AppCompat.ProgressBar"
android:layout_width="24dp" android:layout_width="24dp"
android:layout_height="24dp" android:layout_height="24dp"
android:layout_gravity="center"/> android:layout_gravity="center" />
<TextView <TextView
android:id="@+id/progress_message" android:id="@+id/progress_message"
@ -40,6 +38,6 @@
android:layout_gravity="center" android:layout_gravity="center"
android:text="@string/nc_no_more_load_retry" android:text="@string/nc_no_more_load_retry"
android:visibility="gone" android:visibility="gone"
tools:visibility="visible"/> tools:visibility="visible" />
</FrameLayout> </FrameLayout>

19
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -20,25 +19,25 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<View <View
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="1px" android:layout_height="1px"
android:background="?android:attr/listDivider"/> android:background="?android:attr/listDivider" />
<TextView <TextView
android:id="@+id/title_text_view" android:id="@+id/title_text_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="8dp"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
tools:text="A"/> tools:text="A" />
</LinearLayout> </LinearLayout>

15
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 ~ Nextcloud Talk application
~ ~
~ @author Mario Danic ~ @author Mario Danic
@ -19,8 +18,7 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>. ~ along with this program. If not, see <http://www.gnu.org/licenses/>.
--> -->
<merge <merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
@ -29,20 +27,19 @@
android:id="@id/attachmentButton" android:id="@id/attachmentButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true"/> android:layout_centerVertical="true" />
<androidx.legacy.widget.Space <androidx.legacy.widget.Space
android:id="@id/attachmentButtonSpace" android:id="@id/attachmentButtonSpace"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_toEndOf="@id/attachmentButton"/> android:layout_toEndOf="@id/attachmentButton" />
<com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonEditText <com.kevalpatel2106.emoticongifkeyboard.widget.EmoticonEditText
android:id="@id/messageInput" android:id="@id/messageInput"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_toEndOf="@id/attachmentButtonSpace"
android:layout_toStartOf="@id/sendButtonSpace" android:layout_toStartOf="@id/sendButtonSpace"
android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/> android:inputType="textAutoCorrect|textMultiLine|textCapSentences"/>
@ -50,13 +47,13 @@
android:id="@id/sendButtonSpace" android:id="@id/sendButtonSpace"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_toStartOf="@id/messageSendButton"/> android:layout_toStartOf="@id/messageSendButton" />
<ImageButton <ImageButton
android:id="@id/messageSendButton" android:id="@id/messageSendButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_centerVertical="true"/> android:layout_centerVertical="true" />
</merge> </merge>