gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #911 from nextcloud/addBrandingSupport

Browse Source 
Add branding support
This commit is contained in:
Tobias Kaminsky 2020-10-27 10:44:58 +01:00 committed by GitHub
commit 410dcc10c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 144 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt
View File

@ -108,7 +108,7 @@ open class BaseActivity : AppCompatActivity() {
LovelyStandardDialog(this)
.setTopColorRes(R.color.nc_darkRed)
.setNegativeButtonColorRes(R.color.nc_darkRed)
.setPositiveButtonColorRes(R.color.colorPrimaryDark)
.setPositiveButtonColorRes(R.color.colorPrimary)
.setIcon(R.drawable.ic_security_white_24dp)
.setTitle(R.string.nc_certificate_dialog_title)
.setMessage(dialogText)

29
app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
View File

@ -25,6 +25,7 @@ import android.content.Context
import android.content.Intent
import android.os.Build
import android.os.Bundle
import android.text.TextUtils
import android.view.ViewGroup
import androidx.annotation.RequiresApi
import autodagger.AutoInjector
@ -38,10 +39,7 @@ import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler
import com.google.android.material.appbar.MaterialToolbar
import com.nextcloud.talk.R
import com.nextcloud.talk.application.NextcloudTalkApplication
import com.nextcloud.talk.controllers.CallNotificationController
import com.nextcloud.talk.controllers.ConversationsListController
import com.nextcloud.talk.controllers.LockedController
import com.nextcloud.talk.controllers.ServerSelectionController
import com.nextcloud.talk.controllers.*
import com.nextcloud.talk.controllers.base.providers.ActionBarProvider
import com.nextcloud.talk.utils.ConductorRemapping
import com.nextcloud.talk.utils.SecurityUtils
@ -102,16 +100,29 @@ class MainActivity : BaseActivity(), ActionBarProvider {
router!!.setRoot(RouterTransaction.with(ConversationsListController())
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
} else {
if (!TextUtils.isEmpty(resources.getString(R.string.weblogin_url))) {
router!!.pushController(RouterTransaction.with(
WebViewLoginController(resources.getString(R.string.weblogin_url), false))
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
} else {
router!!.setRoot(RouterTransaction.with(ServerSelectionController())
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
}
}
} else {
if (!TextUtils.isEmpty(resources.getString(R.string.weblogin_url))) {
router!!.pushController(RouterTransaction.with(
WebViewLoginController(resources.getString(R.string.weblogin_url), false))
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
} else {
router!!.setRoot(RouterTransaction.with(ServerSelectionController())
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
}
} else {
router!!.setRoot(RouterTransaction.with(ServerSelectionController())
.pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()))
}
}
}

2
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
View File

@ -243,7 +243,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
if (!holder.contactMentionId.getText().equals(userType)) {
holder.contactMentionId.setText(userType);
holder.contactMentionId.setTextColor(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getColor(R.color.colorPrimary));
holder.contactMentionId.setTextColor(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getColor(R.color.textColorMaxContrast));
}
}
}

6
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicIncomingTextMessageViewHolder.kt
View File

@ -247,14 +247,14 @@ class MagicIncomingTextMessageViewHolder(incomingView: View) : MessageHolders
?: context!!.getText(R.string.nc_nick_guest)
quotedMessage?.text = parentChatMessage.text
quotedUserName?.setTextColor(context!!.resources.getColor(R.color.colorPrimary))
quotedUserName?.setTextColor(context!!.resources.getColor(R.color.textColorMaxContrast))
quotedMessageTime?.text = DateFormatter.format(parentChatMessage.createdAt, DateFormatter.Template.TIME)
quotedMessageTime?.setTextColor(context!!.resources.getColor(R.color.warm_grey_four))
quoteColoredView?.setBackgroundResource(R.color.colorPrimary)
quoteColoredView?.setBackgroundResource(R.color.textColorMaxContrast)
quotedChatMessageView?.visibility = View.VISIBLE
} ?: run {
quotedChatMessageView?.visibility = View.GONE
}
}
}
}

10
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicOutcomingTextMessageViewHolder.kt
View File

@ -133,16 +133,16 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
val resources = sharedApplication!!.resources
if (message.isGrouped) {
val bubbleDrawable = getMessageSelector(
resources.getColor(R.color.bg_message_list_outcoming_bubble),
resources.getColor(R.color.colorPrimary),
resources.getColor(R.color.transparent),
resources.getColor(R.color.bg_message_list_outcoming_bubble),
resources.getColor(R.color.colorPrimary),
R.drawable.shape_grouped_outcoming_message)
ViewCompat.setBackground(bubble, bubbleDrawable)
} else {
val bubbleDrawable = getMessageSelector(
resources.getColor(R.color.bg_message_list_outcoming_bubble),
resources.getColor(R.color.colorPrimary),
resources.getColor(R.color.transparent),
resources.getColor(R.color.bg_message_list_outcoming_bubble),
resources.getColor(R.color.colorPrimary),
R.drawable.shape_outcoming_message)
ViewCompat.setBackground(bubble, bubbleDrawable)
}
@ -187,4 +187,4 @@ class MagicOutcomingTextMessageViewHolder(itemView: View) : OutcomingTextMessage
ButterKnife.bind(this, itemView)
this.realView = itemView
}
}
}

7
app/src/main/java/com/nextcloud/talk/adapters/messages/MagicSystemMessageViewHolder.java
View File

@ -26,7 +26,7 @@ import android.graphics.drawable.Drawable;
import android.text.Spannable;
import android.text.SpannableString;
import android.view.View;
import androidx.core.view.ViewCompat;
import com.nextcloud.talk.R;
import com.nextcloud.talk.application.NextcloudTalkApplication;
import com.nextcloud.talk.models.json.chat.ChatMessage;
@ -35,7 +35,10 @@ import com.nextcloud.talk.utils.preferences.AppPreferences;
import com.stfalcon.chatkit.messages.MessageHolders;
import java.util.Map;
import javax.inject.Inject;
import androidx.core.view.ViewCompat;
import autodagger.AutoInjector;
@AutoInjector(NextcloudTalkApplication.class)
@ -63,7 +66,7 @@ public class MagicSystemMessageViewHolder extends MessageHolders.IncomingTextMes
pressedColor = normalColor;
mentionColor = resources.getColor(R.color.nc_author_text);
mentionColor = resources.getColor(R.color.textColorMaxContrast);
Drawable bubbleDrawable = DisplayUtils.getMessageSelector(normalColor,
resources.getColor(R.color.transparent), pressedColor,

31
app/src/main/java/com/nextcloud/talk/controllers/ServerSelectionController.java
View File

@ -35,10 +35,7 @@ import android.view.ViewGroup;
import android.view.inputmethod.EditorInfo;
import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.NonNull;
import autodagger.AutoInjector;
import butterknife.BindView;
import butterknife.OnClick;
import com.bluelinelabs.conductor.RouterTransaction;
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
import com.nextcloud.talk.R;
@ -51,15 +48,21 @@ import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.preferences.AppPreferences;
import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder;
import java.security.cert.CertificateException;
import javax.inject.Inject;
import androidx.annotation.NonNull;
import autodagger.AutoInjector;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import studio.carbonylgroup.textfieldboxes.ExtendedEditText;
import studio.carbonylgroup.textfieldboxes.TextFieldBoxes;
import javax.inject.Inject;
import java.security.cert.CertificateException;
@AutoInjector(NextcloudTalkApplication.class)
public class ServerSelectionController extends BaseController {
@ -128,8 +131,13 @@ public class ServerSelectionController extends BaseController {
textFieldBoxes.getEndIconImageButton().setVisibility(View.VISIBLE);
textFieldBoxes.getEndIconImageButton().setOnClickListener(view1 -> checkServerAndProceed());
if (TextUtils.isEmpty(getResources().getString(R.string.nc_providers_url)) && (TextUtils.isEmpty(getResources
().getString(R.string.nc_import_account_type)))) {
if (getResources().getBoolean(R.bool.hide_auth_cert)) {
certTextView.setVisibility(View.GONE);
}
if (getResources().getBoolean(R.bool.hide_provider) ||
TextUtils.isEmpty(getResources().getString(R.string.nc_providers_url)) &&
(TextUtils.isEmpty(getResources().getString(R.string.nc_import_account_type)))) {
providersTextView.setVisibility(View.INVISIBLE);
} else {
if ((TextUtils.isEmpty(getResources
@ -178,6 +186,11 @@ public class ServerSelectionController extends BaseController {
}
serverEntry.requestFocus();
if (!TextUtils.isEmpty(getResources().getString(R.string.weblogin_url))) {
serverEntry.setText(getResources().getString(R.string.weblogin_url));
checkServerAndProceed();
}
serverEntry.addTextChangedListener(new TextWatcher() {
@Override

67
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -37,15 +37,7 @@ import android.view.ViewGroup;
import android.view.WindowManager;
import android.widget.Checkable;
import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.emoji.widget.EmojiTextView;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
import autodagger.AutoInjector;
import butterknife.BindView;
import butterknife.OnClick;
import com.bluelinelabs.conductor.RouterTransaction;
import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler;
import com.bluelinelabs.conductor.changehandler.VerticalChangeHandler;
@ -61,7 +53,11 @@ import com.nextcloud.talk.controllers.base.BaseController;
import com.nextcloud.talk.jobs.AccountRemovalWorker;
import com.nextcloud.talk.models.RingtoneSettings;
import com.nextcloud.talk.models.database.UserEntity;
import com.nextcloud.talk.utils.*;
import com.nextcloud.talk.utils.ApiUtils;
import com.nextcloud.talk.utils.DisplayUtils;
import com.nextcloud.talk.utils.DoNotDisturbUtils;
import com.nextcloud.talk.utils.LoggingUtils;
import com.nextcloud.talk.utils.SecurityUtils;
import com.nextcloud.talk.utils.bundle.BundleKeys;
import com.nextcloud.talk.utils.database.user.UserUtils;
import com.nextcloud.talk.utils.preferences.AppPreferences;
@ -69,18 +65,38 @@ import com.nextcloud.talk.utils.preferences.MagicUserInputModule;
import com.nextcloud.talk.utils.singletons.ApplicationWideMessageHolder;
import com.yarolegovich.lovelydialog.LovelySaveStateHandler;
import com.yarolegovich.lovelydialog.LovelyStandardDialog;
import com.yarolegovich.mp.*;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener;
import org.greenrobot.eventbus.EventBus;
import com.yarolegovich.mp.MaterialChoicePreference;
import com.yarolegovich.mp.MaterialEditTextPreference;
import com.yarolegovich.mp.MaterialPreferenceCategory;
import com.yarolegovich.mp.MaterialPreferenceScreen;
import com.yarolegovich.mp.MaterialStandardPreference;
import com.yarolegovich.mp.MaterialSwitchPreference;
import net.orange_box.storebox.listeners.OnPreferenceValueChangedListener;
import javax.inject.Inject;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.*;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Locale;
import java.util.Objects;
import javax.inject.Inject;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.view.ViewCompat;
import androidx.emoji.widget.EmojiTextView;
import androidx.work.OneTimeWorkRequest;
import androidx.work.WorkManager;
import autodagger.AutoInjector;
import butterknife.BindView;
import butterknife.OnClick;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.Disposable;
import io.reactivex.schedulers.Schedulers;
@AutoInjector(NextcloudTalkApplication.class)
public class SettingsController extends BaseController {
@ -159,6 +175,7 @@ public class SettingsController extends BaseController {
private Disposable profileQueryDisposable;
private Disposable dbQueryDisposable;
@NonNull
@Override
protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
return inflater.inflate(R.layout.controller_settings, container, false);
@ -264,11 +281,15 @@ public class SettingsController extends BaseController {
.popChangeHandler(new HorizontalChangeHandler()));
});
addAccountButton.addPreferenceClickListener(view15 -> {
getRouter().pushController(RouterTransaction.with(new
ServerSelectionController()).pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()));
});
if (getResources().getBoolean(R.bool.multiaccount_support)) {
addAccountButton.addPreferenceClickListener(view15 -> {
getRouter().pushController(RouterTransaction.with(new
ServerSelectionController()).pushChangeHandler(new VerticalChangeHandler())
.popChangeHandler(new VerticalChangeHandler()));
});
} else {
addAccountButton.setVisibility(View.GONE);
}
switchAccountButton.addPreferenceClickListener(view16 -> {
getRouter().pushController(RouterTransaction.with(new

2
app/src/main/res/drawable/accent_circle.xml
View File

@ -22,5 +22,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid
android:color="@color/colorAccent"/>
android:color="@color/colorPrimary"/>
</shape>

4
app/src/main/res/drawable/ic_logo.xml
View File

@ -18,9 +18,9 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector android:autoMirrored="true" android:height="24dp"
<vector android:autoMirrored="true" android:height="128dp"
android:viewportHeight="128" android:viewportWidth="128"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff"
android:pathData="M63.992,0.689C29.031,0.689 0.691,29.031 0.692,63.992c0,34.96 28.34,63.301 63.3,63.302 6.982,-0.014 13.881,-1.183 20.426,-3.43 4.317,-1.482 8.48,-3.433 12.411,-5.831 3.383,1.344 8.59,3.838 13.736,5.902 6.688,2.683 13.274,4.639 15.618,2.399 2.317,-2.212 0.703,-8.809 -1.647,-15.575 -2.046,-5.892 -4.649,-11.913 -5.701,-15.282 2.544,-4.415 4.535,-9.101 5.945,-13.954 1.648,-5.674 2.5,-11.574 2.512,-17.532C127.291,29.032 98.952,0.692 63.992,0.691ZM63.999,24.756l0.001,0c21.677,0 39.25,17.573 39.25,39.251 -0.001,21.677 -17.574,39.249 -39.251,39.249 -21.676,0 -39.249,-17.572 -39.25,-39.249 0,-21.678 17.573,-39.251 39.25,-39.251z" android:strokeWidth="4.78543139"/>
</vector>

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

@ -108,8 +108,8 @@
app:outcomingBubblePaddingLeft="@dimen/message_bubble_corners_padding"
app:outcomingBubblePaddingRight="@dimen/message_bubble_corners_padding"
app:outcomingBubblePaddingTop="@dimen/message_bubble_corners_padding"
app:outcomingDefaultBubbleColor="@color/bg_message_list_outcoming_bubble"
app:outcomingDefaultBubblePressedColor="@color/bg_message_list_outcoming_bubble"
app:outcomingDefaultBubbleColor="@color/colorPrimary"
app:outcomingDefaultBubblePressedColor="@color/colorPrimary"
app:outcomingDefaultBubbleSelectedColor="@color/transparent"
app:outcomingImageTimeTextSize="12sp"
app:outcomingTextColor="@color/nc_outcoming_text_default"

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

@ -35,7 +35,7 @@
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTint="@color/textColorMaxContrast"
android:indeterminateTintMode="src_in" />
<ScrollView
@ -102,7 +102,7 @@
android:visibility="gone"
apc:mpc_title="@string/nc_participants"
apc:mpc_action="@string/nc_add"
apc:mpc_title_color="@color/colorPrimary"
apc:mpc_title_color="@color/textColorMaxContrast"
tools:ignore="UnknownIdInLayout">
<androidx.recyclerview.widget.RecyclerView

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

@ -91,6 +91,7 @@
android:layout_gravity="bottom|end"
android:backgroundTint="@color/colorPrimary"
android:layout_margin="16dp"
app:borderWidth="0dp"
app:tint="@color/white"
app:srcCompat="@drawable/ic_add_white_24px"/>

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

@ -28,11 +28,10 @@
<ImageView
android:id="@+id/image_logo"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="92dp"
android:layout_marginBottom="36dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_logo" />
<!-- Server selection window should be ignorant of theme colour
@ -65,7 +64,8 @@
android:text="@string/nc_get_from_provider"
android:textAlignment="center"
android:textAllCaps="true"
android:textColor="@color/nc_light_blue_color" />
android:alpha="0.5"
android:textColor="@color/textColorOnPrimaryBackground" />
<TextView
android:id="@+id/cert_text_view"
@ -80,7 +80,8 @@
android:text="@string/nc_configure_cert_auth"
android:textAlignment="center"
android:textAllCaps="true"
android:textColor="@color/nc_light_blue_color" />
android:alpha="0.5"
android:textColor="@color/textColorOnPrimaryBackground" />
<studio.carbonylgroup.textfieldboxes.TextFieldBoxes
android:id="@+id/text_field_boxes"

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

@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_appearance"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_theme"
@ -138,7 +138,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_notification_sounds"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_call_sound"
@ -170,7 +170,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_privacy"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_screen_lock_timeout"
@ -224,7 +224,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_proxy_title"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_proxy_choice"
@ -285,7 +285,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_about"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_privacy"

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

@ -54,7 +54,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
android:textColor="@color/colorPrimary"
android:textColor="@color/textColorMaxContrast"
android:textSize="12sp" />
<androidx.emoji.widget.EmojiTextView

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

@ -47,7 +47,7 @@
android:gravity="center_horizontal"
android:textAlignment="center"
tools:text="System message"
android:textColor="@color/colorPrimary"
android:textColor="@color/textColorMaxContrast"
android:textSize="14sp"
app:layout_alignSelf="flex_start"
app:layout_flexGrow="1"

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

@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_notification_settings"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_priority_conversation"

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

@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textColor="@color/textColorMaxContrast"
tools:text="A week ago" />
</LinearLayout>

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

@ -83,7 +83,7 @@
android:gravity="top"
android:lines="1"
android:singleLine="true"
android:textColor="@color/conversation_last_message"
android:textColor="@color/textColorMaxContrast"
tools:text="This is the last message\nof an incredibly long two line conversation text" />
<TextView
@ -110,7 +110,7 @@
android:layout_alignParentEnd="true"
android:ellipsize="end"
android:maxLines="1"
android:textColor="@color/conversation_date" />
android:textColor="@color/textColorMaxContrast" />
<androidx.emoji.widget.EmojiTextView
android:id="@id/dialogName"

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

@ -58,7 +58,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="@color/nc_author_text"
android:textColor="@color/textColorMaxContrast"
android:textSize="16sp"
tools:text="Call item text" />

10
app/src/main/res/values-night/colors.xml
View File

@ -22,23 +22,19 @@
-->
<resources>
<color name="conversation_item_header">#9FBDCC</color>
<!--<color name="conversation_item_header">#CFCFCF</color>-->
<color name="conversation_item_header">#ffffff</color>
<color name="bg_default">#222222</color>
<color name="bg_alt">#222222</color>
<!-- Chat window incoming message text & informational -->
<color name="nc_incoming_text_default">#D8D8D8</color>
<color name="nc_author_text">#65A7CA</color>
<color name="nc_chip_mention_you_background">#0083C9</color>
<color name="nc_chip_mention_others_background">#6F6F6F</color>
<color name="nc_grey">@android:color/holo_purple</color>
<color name="bg_bottom_sheet">#222222</color>
<color name="bg_message_list_incoming_bubble">#484848</color>
<color name="bg_message_list_outcoming_bubble">#003F62</color>
<color name="textColorMaxContrast">#8c8c8c</color>
<color name="emoji_background">#313031</color>
<color name="emoji_divider">#15FFFFFF</color>
</resources>
</resources>

16
app/src/main/res/values/colors.xml
View File

@ -20,9 +20,8 @@
-->
<resources>
<color name="colorPrimary">#0082C9</color>
<color name="colorPrimaryDark">#006AA3</color>
<color name="colorAccent">#007CC2</color>
<color name="colorPrimary">#043F21</color>
<color name="textColorOnPrimaryBackground">#ffffff</color> <!-- white/black depending on primary color -->
<!-- Text color of sent messages -->
<color name="nc_outcoming_text_default">#FFFFFF</color>
@ -30,9 +29,7 @@
<color name="nc_incoming_text_default">#37505D</color>
<!-- Name of person or group for the chat conversation -->
<color name="conversation_item_header">#37505D</color>
<color name="conversation_date">@color/warm_grey_two</color>
<color name="conversation_last_message">@color/warm_grey_four</color>
<color name="conversation_item_header">#000000</color>
<color name="conversation_unread_bubble">#FFFFFF</color>
<color name="nc_incoming_text_mention_you">#C98879</color>
@ -41,12 +38,12 @@
<color name="nc_darkRed">#D32F2F</color>
<color name="nc_darkGreen">#006400</color>
<color name="nc_white_color">@color/per70white</color>
<color name="nc_light_blue_color">#7FC0E3</color>
<color name="controller_chat_separator">#E8E8E8</color>
<color name="grey_600">#757575</color>
<color name="nc_grey">#D5D5D5</color>
<color name="controller_call_incomingCallTextView">#E9FFFFFF</color>
<color name="grey950">#111111</color>
<color name="textColorMaxContrast">#767676</color>
<color name="whiteHalfTransparent">#7Fffffff</color>
<!-- Emoji list in chat window -->
@ -59,14 +56,9 @@
<color name="bg_default">#FFFFFF</color>
<color name="bg_alt">@color/white60</color>
<color name="nc_chip_mention_you_background">#0083C9</color>
<color name="nc_chip_mention_others_background">@color/white</color>
<color name="bg_dark_mention_chips">#333333</color>
<color name="bg_message_list_incoming_bubble">#EFEFEF</color>
<color name="bg_message_list_outcoming_bubble">@color/colorPrimary</color>
<color name="nc_author_text">#65A7CA</color>
<color name="bg_bottom_sheet">#46ffffff</color>
</resources>

6
app/src/main/res/values/setup.xml
View File

@ -30,6 +30,12 @@
<string name="nc_push_server_url" translatable="false">https://push-notifications.nextcloud.com</string>
<!-- Branding -->
<bool name="hide_provider">false</bool>
<bool name="hide_auth_cert">false</bool>
<bool name="multiaccount_support">true</bool>
<string name="weblogin_url" translatable="false"></string>
<!-- Will not be shown if empty -->
<string name="nc_privacy_url" translatable="false">https://nextcloud.com/privacy/</string>
<string name="nc_gpl3_url" translatable="false">https://www.gnu.org/licenses/gpl-3.0.en.html</string>

6
app/src/main/res/values/styles.xml
View File

@ -24,7 +24,7 @@
<style name="AppTheme" parent="Theme.MaterialComponents.DayNight.NoActionBar.Bridge">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorPrimaryDark">@color/colorPrimary</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="android:panelFullBackground">@color/colorPrimary</item>
<item name="android:itemBackground">@color/nc_outcoming_text_default</item>
@ -48,11 +48,11 @@
</style>
<style name="ChipOutgoingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
<item name="android:textColor">@color/nc_incoming_text_default</item>
<item name="android:textColor">@color/textColorOnPrimaryBackground</item>
</style>
<style name="ChipMentionTextAppearance" parent="TextAppearance.MaterialComponents.Chip">
<item name="android:textColor">@color/colorAccent</item>
<item name="android:textColor">@color/colorPrimary</item>
</style>
<style name="appActionBarStyle" parent="@style/Widget.MaterialComponents.ActionBar.Solid">

2
app/src/main/res/xml/chip_others.xml
View File

@ -22,5 +22,5 @@
<chip xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:textAppearance="@style/ChipIncomingTextAppearance"
app:chipBackgroundColor="@color/nc_chip_mention_others_background"
app:chipBackgroundColor="@color/white"
app:closeIconEnabled="false" />

2
app/src/main/res/xml/chip_you.xml
View File

@ -22,5 +22,5 @@
<chip xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:textAppearance="@style/ChipOutgoingTextAppearance"
app:chipBackgroundColor="@color/nc_chip_mention_you_background"
app:chipBackgroundColor="@color/colorPrimary"
app:closeIconEnabled="false"/>