Skip to content

A
AloqaIM-Android
Commit eda5e0d3 authored by Filipe de Lima Brito's avatar Filipe de Lima Brito
Browse files
Options

Merge branch 'improvement/chat-list-layout' of... 

Merge branch 'improvement/chat-list-layout' of github.com:RocketChat/Rocket.Chat.Android into improvement/chat-list-layout
parents f661b3aa 1d1f9ba1
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 453 additions and 345 deletions
app/build.gradle
View file @ eda5e0d3
...@@ -16,8 +16,8 @@ android { ...@@ -16,8 +16,8 @@ android {
applicationId "chat.rocket.android" applicationId "chat.rocket.android"
minSdkVersion versions.minSdk minSdkVersion versions.minSdk
targetSdkVersion versions.targetSdk targetSdkVersion versions.targetSdk
versionCode 2050 versionCode 2051
versionName "3.1.1" versionName "3.2.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled true multiDexEnabled true
......
app/src/main/java/chat/rocket/android/chatroom/adapter/AttachmentViewHolder.kt
View file @ eda5e0d3
...@@ -146,7 +146,8 @@ class AttachmentViewHolder( ...@@ -146,7 +146,8 @@ class AttachmentViewHolder(
private fun bindAudioOrVideo(data: AttachmentUiModel) { private fun bindAudioOrVideo(data: AttachmentUiModel) {
with(itemView) { with(itemView) {
text_file_name.content = data.title file_name.isVisible = data.hasTitle
file_name.text = data.title
file_text.isVisible = data.hasText file_text.isVisible = data.hasText
file_text.text = data.text file_text.text = data.text
......
app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
View file @ eda5e0d3
...@@ -170,7 +170,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) { ...@@ -170,7 +170,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
fun processRooms(rooms: List<ChatRoom>) { fun processRooms(rooms: List<ChatRoom>) {
launch(dbManagerContext) { launch(dbManagerContext) {
val entities = rooms.map { mapChatRoom(it) } val entities = rooms.map { mapChatRoom(it) }
sendOperation(Operation.InsertRooms(entities)) sendOperation(Operation.CleanInsertRooms(entities))
} }
} }
......
app/src/main/java/chat/rocket/android/helper/TextHelper.kt
View file @ eda5e0d3
package chat.rocket.android.helper package chat.rocket.android.helper
import android.os.Build
import android.text.SpannableString import android.text.SpannableString
import android.text.Spanned import android.text.Spanned
import android.text.method.LinkMovementMethod import android.text.method.LinkMovementMethod
import android.text.style.ClickableSpan import android.text.style.ClickableSpan
import android.widget.TextView import android.widget.TextView
import chat.rocket.android.BuildConfig
import chat.rocket.android.util.extensions.ifEmpty import chat.rocket.android.util.extensions.ifEmpty
object TextHelper { object TextHelper {
...@@ -23,7 +25,12 @@ object TextHelper { ...@@ -23,7 +25,12 @@ object TextHelper {
val link = links[i] val link = links[i]
val startIndexOfLink = textView.text.indexOf(link) val startIndexOfLink = textView.text.indexOf(link)
spannableString.setSpan(clickableSpan, startIndexOfLink, startIndexOfLink + link.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE) spannableString.setSpan(
clickableSpan,
startIndexOfLink,
startIndexOfLink + link.length,
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
)
} }
textView.movementMethod = LinkMovementMethod.getInstance() textView.movementMethod = LinkMovementMethod.getInstance()
textView.setText(spannableString, TextView.BufferType.SPANNABLE) textView.setText(spannableString, TextView.BufferType.SPANNABLE)
...@@ -39,4 +46,13 @@ object TextHelper { ...@@ -39,4 +46,13 @@ object TextHelper {
string.ifEmpty("?") string.ifEmpty("?")
return string.substring(0, 1).toUpperCase() return string.substring(0, 1).toUpperCase()
} }
/**
* Returns the user device information as well as the app information being used by the user.
*/
fun getDeviceAndAppInformation(): String {
return "v${BuildConfig.VERSION_NAME} - (${BuildConfig.VERSION_CODE}) \n" +
"${Build.MANUFACTURER} - ${Build.MODEL} \n" +
"Android ${Build.VERSION.RELEASE}"
}
} }
\ No newline at end of file
app/src/main/java/chat/rocket/android/server/ui/ChangeServerActivity.kt
View file @ eda5e0d3
...@@ -23,6 +23,7 @@ fun Context.changeServerIntent(serverUrl: String? = null, chatRoomId: String? = ...@@ -23,6 +23,7 @@ fun Context.changeServerIntent(serverUrl: String? = null, chatRoomId: String? =
flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK flags = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_CLEAR_TASK
} }
} }
class ChangeServerActivity : AppCompatActivity(), ChangeServerView { class ChangeServerActivity : AppCompatActivity(), ChangeServerView {
@Inject lateinit var presenter: ChangeServerPresenter @Inject lateinit var presenter: ChangeServerPresenter
......
app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
View file @ eda5e0d3
...@@ -2,7 +2,6 @@ package chat.rocket.android.settings.ui ...@@ -2,7 +2,6 @@ package chat.rocket.android.settings.ui
import android.content.ActivityNotFoundException import android.content.ActivityNotFoundException
import android.content.Intent import android.content.Intent
import android.net.Uri
import android.os.Bundle import android.os.Bundle
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
...@@ -16,6 +15,7 @@ import chat.rocket.android.about.ui.AboutFragment ...@@ -16,6 +15,7 @@ import chat.rocket.android.about.ui.AboutFragment
import chat.rocket.android.about.ui.TAG_ABOUT_FRAGMENT import chat.rocket.android.about.ui.TAG_ABOUT_FRAGMENT
import chat.rocket.android.analytics.AnalyticsManager import chat.rocket.android.analytics.AnalyticsManager
import chat.rocket.android.analytics.event.ScreenViewEvent import chat.rocket.android.analytics.event.ScreenViewEvent
import chat.rocket.android.helper.TextHelper.getDeviceAndAppInformation
import chat.rocket.android.main.ui.MainActivity import chat.rocket.android.main.ui.MainActivity
import chat.rocket.android.preferences.ui.PreferencesFragment import chat.rocket.android.preferences.ui.PreferencesFragment
import chat.rocket.android.preferences.ui.TAG_PREFERENCES_FRAGMENT import chat.rocket.android.preferences.ui.TAG_PREFERENCES_FRAGMENT
...@@ -23,10 +23,11 @@ import chat.rocket.android.settings.password.ui.PasswordActivity ...@@ -23,10 +23,11 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
import chat.rocket.android.settings.presentation.SettingsView import chat.rocket.android.settings.presentation.SettingsView
import chat.rocket.android.util.extensions.addFragmentBackStack import chat.rocket.android.util.extensions.addFragmentBackStack
import chat.rocket.android.util.extensions.inflate import chat.rocket.android.util.extensions.inflate
import chat.rocket.android.webview.ui.webViewIntent
import dagger.android.support.AndroidSupportInjection import dagger.android.support.AndroidSupportInjection
import kotlinx.android.synthetic.main.fragment_settings.* import kotlinx.android.synthetic.main.fragment_settings.*
import timber.log.Timber
import javax.inject.Inject import javax.inject.Inject
import kotlin.reflect.KClass
internal const val TAG_SETTINGS_FRAGMENT = "SettingsFragment" internal const val TAG_SETTINGS_FRAGMENT = "SettingsFragment"
...@@ -34,7 +35,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen ...@@ -34,7 +35,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
@Inject @Inject
lateinit var analyticsManager: AnalyticsManager lateinit var analyticsManager: AnalyticsManager
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
AndroidSupportInjection.inject(this) AndroidSupportInjection.inject(this)
} }
...@@ -60,7 +61,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen ...@@ -60,7 +61,7 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) { override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
when (parent?.getItemAtPosition(position).toString()) { when (parent?.getItemAtPosition(position).toString()) {
resources.getString(R.string.title_preferences) -> { resources.getStringArray(R.array.settings_actions)[0] -> {
(activity as AppCompatActivity).addFragmentBackStack( (activity as AppCompatActivity).addFragmentBackStack(
TAG_PREFERENCES_FRAGMENT, TAG_PREFERENCES_FRAGMENT,
R.id.fragment_container R.id.fragment_container
...@@ -68,9 +69,24 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen ...@@ -68,9 +69,24 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
PreferencesFragment.newInstance() PreferencesFragment.newInstance()
} }
} }
resources.getString(R.string.title_change_password) ->
startNewActivity(PasswordActivity::class) resources.getStringArray(R.array.settings_actions)[1] ->
resources.getString(R.string.title_about) -> { activity?.startActivity(Intent(activity, PasswordActivity::class.java))
resources.getStringArray(R.array.settings_actions)[2] -> shareApp()
resources.getStringArray(R.array.settings_actions)[3] -> showAppOnStore()
resources.getStringArray(R.array.settings_actions)[4] -> contactSupport()
resources.getStringArray(R.array.settings_actions)[5] -> activity?.startActivity(
context?.webViewIntent(
getString(R.string.license_url),
getString(R.string.title_licence)
)
)
resources.getStringArray(R.array.settings_actions)[6] -> {
(activity as AppCompatActivity).addFragmentBackStack( (activity as AppCompatActivity).addFragmentBackStack(
TAG_ABOUT_FRAGMENT, TAG_ABOUT_FRAGMENT,
R.id.fragment_container R.id.fragment_container
...@@ -78,20 +94,10 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen ...@@ -78,20 +94,10 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
AboutFragment.newInstance() AboutFragment.newInstance()
} }
} }
resources.getString(R.string.title_share_the_app) ->{
val shareIntent = Intent(Intent.ACTION_SEND)
shareIntent.type = "text/plain"
val shareBody = getString(R.string.msg_check_this_out)
val shareSub = getString(R.string.play_store_link)
shareIntent.putExtra(Intent.EXTRA_SUBJECT, shareBody)
shareIntent.putExtra(Intent.EXTRA_TEXT, shareSub)
startActivity(Intent.createChooser(shareIntent, getString(R.string.msg_share_using)))
}
resources.getString(R.string.title_rate_us) -> startAppPlayStore()
} }
} }
private fun startAppPlayStore() { private fun showAppOnStore() {
try { try {
startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri())) startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
} catch (error: ActivityNotFoundException) { } catch (error: ActivityNotFoundException) {
...@@ -108,9 +114,27 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen ...@@ -108,9 +114,27 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
getString(R.string.title_settings) getString(R.string.title_settings)
} }
private fun startNewActivity(classType: KClass<out AppCompatActivity>) { private fun shareApp() {
startActivity(Intent(activity, classType.java)) with(Intent(Intent.ACTION_SEND)) {
activity?.overridePendingTransition(R.anim.open_enter, R.anim.open_exit) type = "text/plain"
putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_check_this_out))
putExtra(Intent.EXTRA_TEXT, getString(R.string.play_store_link))
startActivity(Intent.createChooser(this, getString(R.string.msg_share_using)))
}
}
private fun contactSupport() {
with(Intent(Intent.ACTION_SEND)) {
type = "message/rfc822"
putExtra(Intent.EXTRA_EMAIL, arrayOf("support@rocket.chat"))
putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_android_app_support))
putExtra(Intent.EXTRA_TEXT, getDeviceAndAppInformation())
try {
startActivity(Intent.createChooser(this, getString(R.string.msg_send_email)))
} catch (ex: ActivityNotFoundException) {
Timber.e(ex)
}
}
} }
companion object { companion object {
......
app/src/main/res/drawable/ic_camera.xml 0 → 100644
View file @ eda5e0d3
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="18dp"
android:viewportWidth="20"
android:viewportHeight="18">
<path
android:fillColor="#1D74F5"
android:fillType="nonZero"
android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
android:strokeWidth="1"
android:strokeColor="#00000000" />
<path
android:fillColor="#1D74F5"
android:fillType="nonZero"
android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>
\ No newline at end of file
app/src/main/res/layout/item_message.xml
View file @ eda5e0d3
...@@ -52,7 +52,7 @@ ...@@ -52,7 +52,7 @@
android:layout_width="40dp" android:layout_width="40dp"
android:layout_height="40dp" android:layout_height="40dp"
app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="@+id/text_sender" /> app:layout_constraintTop_toTopOf="@+id/message_header" />
<LinearLayout <LinearLayout
android:id="@+id/new_messages_notif" android:id="@+id/new_messages_notif"
...@@ -88,18 +88,18 @@ ...@@ -88,18 +88,18 @@
android:background="@color/colorRed" /> android:background="@color/colorRed" />
</LinearLayout> </LinearLayout>
<TextView <LinearLayout
android:id="@+id/text_sender" android:id="@+id/message_header"
style="@style/Sender.Name.TextView" android:layout_width="0dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintLeft_toRightOf="@+id/layout_avatar" app:layout_constraintLeft_toRightOf="@+id/layout_avatar"
app:layout_constraintStart_toEndOf="@+id/layout_avatar" app:layout_constraintStart_toEndOf="@+id/layout_avatar"
app:layout_constraintTop_toBottomOf="@+id/day_marker_layout" app:layout_constraintEnd_toEndOf="parent"
tools:text="Ronald Perkins" /> app:layout_constraintTop_toBottomOf="@+id/day_marker_layout">
<<<<<<< HEAD
<TextView <TextView
android:id="@+id/text_message_time" android:id="@+id/text_message_time"
style="@style/ChatList.Timestamp.TextView" style="@style/ChatList.Timestamp.TextView"
...@@ -110,46 +110,54 @@ ...@@ -110,46 +110,54 @@
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
app:layout_constraintStart_toEndOf="@+id/text_sender" app:layout_constraintStart_toEndOf="@+id/text_sender"
tools:text="11:45 PM" /> tools:text="11:45 PM" />
=======
<TextView
android:id="@+id/text_sender"
style="@style/Sender.Name.TextView"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginEnd="8dp"
tools:text="User Name with long name" />
>>>>>>> 1d1f9ba1c422f9bea486a0b4d356753f68f10ca0
<TextView <TextView
android:id="@+id/text_edit_indicator" android:id="@+id/text_message_time"
android:layout_width="wrap_content" style="@style/Timestamp.TextView"
android:layout_height="wrap_content" android:layout_width="wrap_content"
android:layout_marginStart="4dp" android:layout_height="wrap_content"
android:text="@string/msg_edited" android:layout_marginStart="4dp"
android:textStyle="italic" tools:text="11:45 PM" />
android:visibility="gone"
app:layout_constraintBaseline_toBaselineOf="@+id/text_sender" <TextView
app:layout_constraintHorizontal_bias="0.5" android:id="@+id/text_edit_indicator"
app:layout_constraintStart_toEndOf="@+id/text_message_time" android:layout_width="wrap_content"
tools:visibility="visible" /> android:layout_height="wrap_content"
android:layout_marginStart="4dp"
<ImageView android:text="@string/msg_edited"
android:id="@+id/image_star_indicator" android:textStyle="italic"
android:layout_width="14dp" android:visibility="gone"
android:layout_height="14dp" tools:visibility="visible" />
android:layout_gravity="center_vertical"
android:layout_marginStart="4dp" <ImageView
android:layout_marginTop="2dp" android:id="@+id/image_star_indicator"
android:visibility="gone" android:layout_width="14dp"
app:layout_constraintBottom_toBottomOf="@+id/text_sender" android:layout_height="14dp"
app:layout_constraintHorizontal_bias="0.5" android:layout_gravity="center_vertical"
app:layout_constraintStart_toEndOf="@+id/text_edit_indicator" android:layout_marginStart="4dp"
app:layout_constraintTop_toTopOf="@+id/text_sender" android:layout_marginTop="2dp"
app:srcCompat="@drawable/ic_action_message_star_24dp" android:visibility="gone"
tools:visibility="visible" /> app:srcCompat="@drawable/ic_action_message_star_24dp"
tools:visibility="visible" />
<ImageView
android:id="@+id/read_receipt_view" <ImageView
android:layout_width="24dp" android:id="@+id/read_receipt_view"
android:layout_height="24dp" android:layout_width="24dp"
android:visibility="gone" android:layout_height="24dp"
app:layout_constraintBottom_toBottomOf="@+id/text_sender" android:visibility="gone"
app:layout_constraintHorizontal_bias="0.5" app:srcCompat="@drawable/ic_check_unread_24dp"
app:layout_constraintStart_toEndOf="@+id/image_star_indicator" tools:visibility="visible" />
app:layout_constraintTop_toTopOf="@+id/text_sender" </LinearLayout>
app:srcCompat="@drawable/ic_check_unread_24dp"
tools:visibility="visible" />
<TextView <TextView
android:id="@+id/text_content" android:id="@+id/text_content"
...@@ -160,8 +168,8 @@ ...@@ -160,8 +168,8 @@
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="2dp" android:layout_marginBottom="2dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/text_sender" app:layout_constraintStart_toStartOf="@+id/message_header"
app:layout_constraintTop_toBottomOf="@+id/text_sender" app:layout_constraintTop_toBottomOf="@+id/message_header"
tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" /> tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
<include <include
......
app/src/main/res/layout/message_attachment_options.xml
View file @ eda5e0d3
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:drawablePadding="20dp" android:drawablePadding="20dp"
android:drawableStart="@drawable/ic_photo_camera_black_24dp" android:drawableStart="@drawable/ic_camera"
android:gravity="start|center" android:gravity="start|center"
android:text="@string/action_take_a_photo" /> android:text="@string/action_take_a_photo" />
......
app/src/main/res/values-de/strings.xml
View file @ eda5e0d3
...@@ -22,7 +22,8 @@ ...@@ -22,7 +22,8 @@
<string name="title_update_profile">Update Profil</string> <string name="title_update_profile">Update Profil</string>
<string name="title_about">Über</string> <string name="title_about">Über</string>
<string name="title_create_channel">Erstelle Raum</string> <string name="title_create_channel">Erstelle Raum</string>
<string name="title_are_you_sure">Are you sure?</string><!-- TODO Add translation --> <string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
<string name="action_connect">Verbinde</string> <string name="action_connect">Verbinde</string>
...@@ -58,10 +59,12 @@ ...@@ -58,10 +59,12 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferences</item> <!-- TODO Add translation --> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Ändere Passwort</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">App teilen</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">Bewerten Sie uns</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">Über</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -172,12 +175,11 @@ ...@@ -172,12 +175,11 @@
<string name="msg_message_copied">Nachricht kopiert</string> <string name="msg_message_copied">Nachricht kopiert</string>
<string name="msg_delete_message">Lösche Nachricht</string> <string name="msg_delete_message">Lösche Nachricht</string>
<string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string> <string name="msg_delete_description">Sind Sie sicher, dass Sie diese Nachricht löschen wollen?</string>
<!-- TODO - Add proper translation --> <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
<string name="msg_view_more">view more</string> <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_view_less">view less</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string>
<!-- Preferences messages --> <!-- Preferences messages -->
<string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation --> <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
......
app/src/main/res/values-es/strings.xml
View file @ eda5e0d3
...@@ -21,6 +21,7 @@ ...@@ -21,6 +21,7 @@
<string name="title_update_profile">Actualización del perfil</string> <string name="title_update_profile">Actualización del perfil</string>
<string name="title_about">Acerca de</string> <string name="title_about">Acerca de</string>
<string name="title_create_channel">Crear canal</string> <string name="title_create_channel">Crear canal</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -57,10 +58,12 @@ ...@@ -57,10 +58,12 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferences</item> <!-- TODO Add translation --> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Cambia la contraseña</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">Compartir aplicación</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">Nos califica</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">Acerca de</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -162,18 +165,15 @@ ...@@ -162,18 +165,15 @@
<string name="msg_member_already_added">Ya has seleccionado este usuario</string> <string name="msg_member_already_added">Ya has seleccionado este usuario</string>
<string name="msg_member_not_found">Miembro no encontrado</string> <string name="msg_member_not_found">Miembro no encontrado</string>
<string name="msg_channel_created_successfully">Canal creado con éxito</string> <string name="msg_channel_created_successfully">Canal creado con éxito</string>
<!-- TODO - Add proper translation --> <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
<string name="msg_view_more">view more</string> <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_view_less">view less</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string>
<!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="other">%1$s reacted with %2$s</item> <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Preferences messages --> <!-- Preferences messages -->
......
app/src/main/res/values-fr/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Mettre à jour le profil</string> <string name="title_update_profile">Mettre à jour le profil</string>
<string name="title_about">À propos</string> <string name="title_about">À propos</string>
<string name="title_create_channel">Créer salon</string> <string name="title_create_channel">Créer salon</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Préférences</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Changer le mot de passe</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">Partager l\'application</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">évaluez nous</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">À propos</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -154,18 +157,15 @@ ...@@ -154,18 +157,15 @@
<string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation --> <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
<string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation --> <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
<string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation --> <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
<!-- TODO - Add proper translation --> <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
<string name="msg_view_more">view more</string> <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_view_less">view less</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string>
<!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="other">%1$s reacted with %2$s</item> <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Create channel messages --> <!-- Create channel messages -->
......
app/src/main/res/values-hi-rIN/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string> <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
<string name="title_about">परिचय</string> <string name="title_about">परिचय</string>
<string name="title_create_channel">चैनल बनाएं</string> <string name="title_create_channel">चैनल बनाएं</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">प्राथमिकताएँ</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">पासवर्ड बदलें</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">ऐप शेयर करें</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">हमें रेटिंग दें</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">परिचय</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -170,14 +173,14 @@ ...@@ -170,14 +173,14 @@
<string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string> <string name="msg_channel_created_successfully">चैनल सफलतापूर्वक बनाया गया</string>
<string name="msg_view_more">और देखें</string> <string name="msg_view_more">और देखें</string>
<string name="msg_view_less">कम देखें</string> <string name="msg_view_less">कम देखें</string>
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="other">%1$s reacted with %2$s</item> <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Preferences messages --> <!-- Preferences messages -->
......
app/src/main/res/values-it/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Aggiorna Profilo</string> <string name="title_update_profile">Aggiorna Profilo</string>
<string name="title_about">Informazioni</string> <string name="title_about">Informazioni</string>
<string name="title_create_channel">Crea Canale</string> <string name="title_create_channel">Crea Canale</string>
<string name="title_licence">Licence</string> <!-- TODO ADD translation -->
<string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string> <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferenze</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Cambiare Password</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">Condividi App</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">Valutaci</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">Informazioni</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -151,6 +154,8 @@ ...@@ -151,6 +154,8 @@
<string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string> <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
<string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string> <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
<string name="msg_permalink_copied">Permalink copiato</string> <string name="msg_permalink_copied">Permalink copiato</string>
<string name="msg_send_email">Send email</string>
<string name="msg_android_app_support">Android app support</string>
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s ha reagito con %2$s</item> <item quantity="one">%1$s ha reagito con %2$s</item>
<item quantity="other">%1$s ha reagito con %2$s</item> <item quantity="other">%1$s ha reagito con %2$s</item>
......
app/src/main/res/values-ja/strings.xml
View file @ eda5e0d3
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
<string name="title_password">パスワードの変更</string> <string name="title_password">パスワードの変更</string>
<string name="title_update_profile">プロフィールの更新</string> <string name="title_update_profile">プロフィールの更新</string>
<string name="title_about">About</string> <string name="title_about">About</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_create_channel">新しいチャネルを作成</string> <string name="title_create_channel">新しいチャネルを作成</string>
<string name="title_are_you_sure">本気ですか？</string> <string name="title_are_you_sure">本気ですか？</string>
...@@ -59,11 +60,13 @@ ...@@ -59,11 +60,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">環境設定</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">パスワードの変更</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">アプリを共有する</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">私たちを評価してください</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">アプリ情報</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -178,8 +181,9 @@ ...@@ -178,8 +181,9 @@
<string name="msg_message_copied">メッセージをコピー</string> <string name="msg_message_copied">メッセージをコピー</string>
<string name="msg_delete_message">メッセージを削除</string> <string name="msg_delete_message">メッセージを削除</string>
<string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string> <string name="msg_delete_description">このメッセージを削除してもよろしいですか?</string>
<string name="msg_permalink_copied">パーマリンクのコピー</string> <string name="msg_permalink_copied">パーマリンクのコピー</string>
<string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<!-- Preferences messages --> <!-- Preferences messages -->
<string name="msg_analytics_tracking">トラッキングの分析</string> <string name="msg_analytics_tracking">トラッキングの分析</string>
......
app/src/main/res/values-pt-rBR/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Editar perfil</string> <string name="title_update_profile">Editar perfil</string>
<string name="title_about">Sobre</string> <string name="title_about">Sobre</string>
<string name="title_create_channel">Criar chat</string> <string name="title_create_channel">Criar chat</string>
<string name="title_licence">Licença</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Você tem certeza?</string> <string name="title_are_you_sure">Você tem certeza?</string>
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferencias</item> <item name="item_preferences">Preferências</item>
<item name="item_password">Alterar senha</item> <item name="item_password">Alterar senha</item>
<item name="item_share_app">Compartilhe o aplicativo</item> <item name="item_share_app">Compartilhar app</item>
<item name="item_rate_us">nos avalie</item> <item name="item_rate_us">Classifique-nos</item>
<item name="item_password">Sobre</item> <item name="item_contact_us">Contate-nos</item>
<item name="item_licence">Licença</item>
<item name="item_about">Sobre</item>
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -157,8 +160,9 @@ ...@@ -157,8 +160,9 @@
<string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation --> <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
<string name="msg_view_more">visualizar mais</string> <string name="msg_view_more">visualizar mais</string>
<string name="msg_view_less">visualizar menos</string> <string name="msg_view_less">visualizar menos</string>
<!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copiado</string> <string name="msg_permalink_copied">Permalink copiado</string>
<string name="msg_send_email">Enviar e-mail</string>
<string name="msg_android_app_support">Suporte ao aplicativo Android</string>
<string name="msg_muted_on_this_channel">Você está silenciado neste canal</string> <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reagiu com %2$s</item> <item quantity="one">%1$s reagiu com %2$s</item>
......
app/src/main/res/values-ru-rRU/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Обновить профиль</string> <string name="title_update_profile">Обновить профиль</string>
<string name="title_about">О программе</string> <string name="title_about">О программе</string>
<string name="title_create_channel">Создать новый канал</string> <string name="title_create_channel">Создать новый канал</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Персональные</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Изменить пароль</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_rate_us">оцените нас</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_share_app">добавить приложение</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">О программе</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -156,13 +159,13 @@ ...@@ -156,13 +159,13 @@
<string name="msg_view_more">больше</string> <string name="msg_view_more">больше</string>
<string name="msg_view_less">меньше</string> <string name="msg_view_less">меньше</string>
<string name="msg_permalink_copied">Ссылка скопирована</string> <string name="msg_permalink_copied">Ссылка скопирована</string>
<!-- TODO - Add proper translation --> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="few">%1$s reacted with %2$s</item> <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="many">%1$s reacted with %2$s</item> <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Create channel messages --> <!-- Create channel messages -->
......
app/src/main/res/values-tr/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Profilinizi Düzenleyin</string> <string name="title_update_profile">Profilinizi Düzenleyin</string>
<string name="title_about">Hakkında</string> <string name="title_about">Hakkında</string>
<string name="title_create_channel">Yeni Kanal Oluştur</string> <string name="title_create_channel">Yeni Kanal Oluştur</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -57,11 +58,13 @@ ...@@ -57,11 +58,13 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Tercihler</item> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Şifre Değiştir</item> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">uygulamayı Paylaş</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">Bizi değerlendirin</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">Hakkında</item> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -171,16 +174,14 @@ ...@@ -171,16 +174,14 @@
<string name="msg_delete_description">Bu mesajı silmek istediğinizden emin misiniz</string> <string name="msg_delete_description">Bu mesajı silmek istediğinizden emin misiniz</string>
<string name="msg_view_more">Daha fazla göster</string> <string name="msg_view_more">Daha fazla göster</string>
<string name="msg_view_less">Daha az göster</string> <string name="msg_view_less">Daha az göster</string>
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="other">%1$s reacted with %2$s</item> <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Preferences messages --> <!-- Preferences messages -->
<string name="msg_analytics_tracking">İstatistik takibi</string> <string name="msg_analytics_tracking">İstatistik takibi</string>
<string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string> <string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string>
......
app/src/main/res/values-uk/strings.xml
View file @ eda5e0d3
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
<string name="title_update_profile">Оновити профіль</string> <string name="title_update_profile">Оновити профіль</string>
<string name="title_about">"Про програму"</string> <string name="title_about">"Про програму"</string>
<string name="title_create_channel">Створити новий канал</string> <string name="title_create_channel">Створити новий канал</string>
<string name="title_licence">Licence</string> <!-- TODO Add translation -->
<string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation --> <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
<!-- Actions --> <!-- Actions -->
...@@ -58,10 +59,12 @@ ...@@ -58,10 +59,12 @@
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferences</item> <!-- TODO Add translation --> <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
<item name="item_password">Change Password</item> <!-- TODO Add translation --> <item name="item_password">Change password</item> <!-- TODO Add translation -->
<item name="item_share_app">поділитися прикладом</item> <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
<item name="item_rate_us">Оцініть нас</item> <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
<item name="item_password">About</item> <!-- TODO Add translation --> <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
<item name="item_licence">Licence</item> <!-- TODO Add translation -->
<item name="item_about">About</item> <!-- TODO Add translation -->
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -152,19 +155,16 @@ ...@@ -152,19 +155,16 @@
<string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation --> <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
<string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation --> <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
<string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation --> <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
<!-- TODO - Add proper translation --> <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
<string name="msg_view_more">view more</string> <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
<string name="msg_view_less">view less</string> <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation --> <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_muted_on_this_channel">You are muted on this channel</string> <!-- TODO - Add proper translation -->
<!-- TODO - Add proper translation -->
<string name="msg_muted_on_this_channel">You are muted on this channel</string>
<!-- TODO - Add proper translation -->
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="few">%1$s reacted with %2$s</item> <item quantity="few">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
<item quantity="many">%1$s reacted with %2$s</item> <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
</plurals> </plurals>
<!-- Create channel messages --> <!-- Create channel messages -->
......
app/src/main/res/values/defaults.xml
View file @ eda5e0d3
...@@ -6,4 +6,5 @@ ...@@ -6,4 +6,5 @@
<string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string> <string name="create_server_url" translatable="false">cloud.rocket.chat/trial</string>
<string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string> <string name="play_store_link" translatable="false">https://play.google.com/store/apps/details?id=chat.rocket.android</string>
<string name="market_link" translatable="false">market://details?id=chat.rocket.android</string> <string name="market_link" translatable="false">market://details?id=chat.rocket.android</string>
<string name="license_url" translatable="false">https://github.com/RocketChat/Rocket.Chat.Android/blob/develop/LICENSE</string>
</resources> </resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @ eda5e0d3
...@@ -34,6 +34,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin ...@@ -34,6 +34,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string name="title_update_profile">Update profile</string> <string name="title_update_profile">Update profile</string>
<string name="title_about">About</string> <string name="title_about">About</string>
<string name="title_create_channel">Create Channel</string> <string name="title_create_channel">Create Channel</string>
<string name="title_licence">Licence</string>
<string name="title_are_you_sure">Are you sure?</string> <string name="title_are_you_sure">Are you sure?</string>
<!-- Actions --> <!-- Actions -->
...@@ -70,10 +71,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin ...@@ -70,10 +71,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<!-- Settings List --> <!-- Settings List -->
<string-array name="settings_actions"> <string-array name="settings_actions">
<item name="item_preferences">Preferences</item> <item name="item_preferences">Preferences</item>
<item name="item_password">Change Password</item> <item name="item_password">Change password</item>
<item name="item_share_app">Share App</item> <item name="item_share_app">Share app</item>
<item name="item_rate_us">Rate Us</item> <item name="item_rate_us">Rate us</item>
<item name="item_password">About</item> <item name="item_contact_us">Contact us</item>
<item name="item_licence">Licence</item>
<item name="item_about">About</item>
</string-array> </string-array>
<!-- Regular information messages --> <!-- Regular information messages -->
...@@ -168,6 +171,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin ...@@ -168,6 +171,8 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string name="msg_two_factor_authentication">Two-factor Authentication</string> <string name="msg_two_factor_authentication">Two-factor Authentication</string>
<string name="msg__your_2fa_code">What’s your 2FA code?</string> <string name="msg__your_2fa_code">What’s your 2FA code?</string>
<string name="msg_permalink_copied">Permalink copied</string> <string name="msg_permalink_copied">Permalink copied</string>
<string name="msg_send_email">Send email</string>
<string name="msg_android_app_support">Android app support</string>
<plurals name="msg_reacted_with_"> <plurals name="msg_reacted_with_">
<item quantity="one">%1$s reacted with %2$s</item> <item quantity="one">%1$s reacted with %2$s</item>
<item quantity="other">%1$s reacted with %2$s</item> <item quantity="other">%1$s reacted with %2$s</item>
......
util/src/main/java/chat/rocket/android/util/extension/Text.kt
View file @ eda5e0d3
...@@ -4,6 +4,9 @@ import java.math.BigInteger ...@@ -4,6 +4,9 @@ import java.math.BigInteger
import java.security.MessageDigest import java.security.MessageDigest
import java.security.NoSuchAlgorithmException import java.security.NoSuchAlgorithmException
/**
* Returns a SHA-256 hash for a string.
*/
@Throws(NoSuchAlgorithmException::class) @Throws(NoSuchAlgorithmException::class)
fun String.gethash(): ByteArray { fun String.gethash(): ByteArray {
val digest = MessageDigest.getInstance("SHA-256") val digest = MessageDigest.getInstance("SHA-256")
...@@ -11,4 +14,7 @@ fun String.gethash(): ByteArray { ...@@ -11,4 +14,7 @@ fun String.gethash(): ByteArray {
return digest.digest(this.toByteArray()) return digest.digest(this.toByteArray())
} }
fun ByteArray.toHex(): String = String.format("%0" + this.size * 2 + "X", BigInteger(1, this)) /**
* Return the hex of a [ByteArray].
*/
fun ByteArray.toHex(): String = String.format("%0" + this.size * 2 + "X", BigInteger(1, this))
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023