Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
666dff13
Unverified
Commit
666dff13
authored
Nov 14, 2018
by
Samer Alabi
Committed by
GitHub
Nov 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into room-info
parents
748a23c6
40353aef
Changes
12
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
83 additions
and
55 deletions
+83
-55
SettingsFragment.kt
.../java/chat/rocket/android/settings/ui/SettingsFragment.kt
+11
-0
strings.xml
app/src/main/res/values-de/strings.xml
+3
-1
strings.xml
app/src/main/res/values-es/strings.xml
+3
-1
strings.xml
app/src/main/res/values-fr/strings.xml
+3
-1
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+3
-1
strings.xml
app/src/main/res/values-ja/strings.xml
+44
-46
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+3
-1
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+3
-1
strings.xml
app/src/main/res/values-tr/strings.xml
+3
-1
strings.xml
app/src/main/res/values-uk/strings.xml
+3
-1
defaults.xml
app/src/main/res/values/defaults.xml
+1
-0
strings.xml
app/src/main/res/values/strings.xml
+3
-1
No files found.
app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
View file @
666dff13
package
chat.rocket.android.settings.ui
package
chat.rocket.android.settings.ui
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
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.widget.AdapterView
import
android.widget.AdapterView
import
androidx.appcompat.app.AppCompatActivity
import
androidx.appcompat.app.AppCompatActivity
import
androidx.core.net.toUri
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.Fragment
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.about.ui.AboutFragment
import
chat.rocket.android.about.ui.AboutFragment
...
@@ -84,7 +87,15 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
...
@@ -84,7 +87,15 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
shareIntent
.
putExtra
(
Intent
.
EXTRA_TEXT
,
shareSub
)
shareIntent
.
putExtra
(
Intent
.
EXTRA_TEXT
,
shareSub
)
startActivity
(
Intent
.
createChooser
(
shareIntent
,
getString
(
R
.
string
.
msg_share_using
)))
startActivity
(
Intent
.
createChooser
(
shareIntent
,
getString
(
R
.
string
.
msg_share_using
)))
}
}
resources
.
getString
(
R
.
string
.
title_rate_us
)
->
startAppPlayStore
()
}
}
private
fun
startAppPlayStore
()
{
try
{
startActivity
(
Intent
(
Intent
.
ACTION_VIEW
,
getString
(
R
.
string
.
market_link
).
toUri
()))
}
catch
(
error
:
ActivityNotFoundException
)
{
startActivity
(
Intent
(
Intent
.
ACTION_VIEW
,
getString
(
R
.
string
.
play_store_link
).
toUri
()))
}
}
}
}
...
...
app/src/main/res/values-de/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Einstellungen
</string>
<string
name=
"title_settings"
>
Einstellungen
</string>
<string
name=
"title_preferences"
>
Preferences
</string>
<!-- TODO Add translation -->
<string
name=
"title_preferences"
>
Preferences
</string>
<!-- TODO Add translation -->
<string
name=
"title_change_password"
>
Ändere Passwort
</string>
<string
name=
"title_change_password"
>
Ändere Passwort
</string>
<string
name=
"title_rate_us"
>
Bewerten Sie uns
</string>
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<!-- TODO Add translation -->
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<!-- TODO Add translation -->
<string
name=
"title_password"
>
Ändere Passwort
</string>
<string
name=
"title_password"
>
Ändere Passwort
</string>
<string
name=
"title_update_profile"
>
Update Profil
</string>
<string
name=
"title_update_profile"
>
Update Profil
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<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"
>
Ändere Passwort
</item>
<item
name=
"item_password"
>
Über
</item>
<item
name=
"item_share_app"
>
App teilen
</item>
<item
name=
"item_share_app"
>
App teilen
</item>
<item
name=
"item_rate_us"
>
Bewerten Sie uns
</item>
<item
name=
"item_password"
>
Über
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-es/strings.xml
View file @
666dff13
...
@@ -15,6 +15,7 @@
...
@@ -15,6 +15,7 @@
<string
name=
"title_settings"
>
Configuraciones
</string>
<string
name=
"title_settings"
>
Configuraciones
</string>
<string
name=
"title_preferences"
>
Preferences
</string>
<!-- TODO Add translation -->
<string
name=
"title_preferences"
>
Preferences
</string>
<!-- TODO Add translation -->
<string
name=
"title_change_password"
>
Cambia la contraseña
</string>
<string
name=
"title_change_password"
>
Cambia la contraseña
</string>
<string
name=
"title_rate_us"
>
Nos califica
</string>
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<!-- TODO Add translation -->
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<!-- TODO Add translation -->
<string
name=
"title_password"
>
Cambia la contraseña
</string>
<string
name=
"title_password"
>
Cambia la contraseña
</string>
<string
name=
"title_update_profile"
>
Actualización del perfil
</string>
<string
name=
"title_update_profile"
>
Actualización del perfil
</string>
...
@@ -61,8 +62,9 @@
...
@@ -61,8 +62,9 @@
<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"
>
Cambia la contraseña
</item>
<item
name=
"item_password"
>
Acerca de
</item>
<item
name=
"item_share_app"
>
Compartir aplicación
</item>
<item
name=
"item_share_app"
>
Compartir aplicación
</item>
<item
name=
"item_rate_us"
>
Nos califica
</item>
<item
name=
"item_password"
>
Acerca de
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-fr/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Paramètres
</string>
<string
name=
"title_settings"
>
Paramètres
</string>
<string
name=
"title_preferences"
>
Préférences
</string>
<string
name=
"title_preferences"
>
Préférences
</string>
<string
name=
"title_change_password"
>
Changer le mot de passe
</string>
<string
name=
"title_change_password"
>
Changer le mot de passe
</string>
<string
name=
"title_rate_us"
>
évaluez nous
</string>
<string
name=
"title_admin_panel"
>
Administration
</string>
<string
name=
"title_admin_panel"
>
Administration
</string>
<string
name=
"title_password"
>
Changer le mot de passe
</string>
<string
name=
"title_password"
>
Changer le mot de passe
</string>
<string
name=
"title_update_profile"
>
Mettre à jour le profil
</string>
<string
name=
"title_update_profile"
>
Mettre à jour le profil
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Préférences
</item>
<item
name=
"item_preferences"
>
Préférences
</item>
<item
name=
"item_password"
>
Changer le mot de passe
</item>
<item
name=
"item_password"
>
Changer le mot de passe
</item>
<item
name=
"item_password"
>
À propos
</item>
<item
name=
"item_share_app"
>
Partager l\'application
</item>
<item
name=
"item_share_app"
>
Partager l\'application
</item>
<item
name=
"item_rate_us"
>
évaluez nous
</item>
<item
name=
"item_password"
>
À propos
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
सेटिंग्स
</string>
<string
name=
"title_settings"
>
सेटिंग्स
</string>
<string
name=
"title_preferences"
>
प्राथमिकताएँ
</string>
<string
name=
"title_preferences"
>
प्राथमिकताएँ
</string>
<string
name=
"title_change_password"
>
पासवर्ड बदलें
</string>
<string
name=
"title_change_password"
>
पासवर्ड बदलें
</string>
<string
name=
"title_rate_us"
>
हमें रेटिंग दें
</string>
<string
name=
"title_admin_panel"
>
एडमिन पैनल
</string>
<string
name=
"title_admin_panel"
>
एडमिन पैनल
</string>
<string
name=
"title_password"
>
पासवर्ड बदलें
</string>
<string
name=
"title_password"
>
पासवर्ड बदलें
</string>
<string
name=
"title_update_profile"
>
प्रोफ़ाइल अपडेट करें
</string>
<string
name=
"title_update_profile"
>
प्रोफ़ाइल अपडेट करें
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
प्राथमिकताएँ
</item>
<item
name=
"item_preferences"
>
प्राथमिकताएँ
</item>
<item
name=
"item_password"
>
पासवर्ड बदलें
</item>
<item
name=
"item_password"
>
पासवर्ड बदलें
</item>
<item
name=
"item_password"
>
परिचय
</item>
<item
name=
"item_share_app"
>
ऐप शेयर करें
</item>
<item
name=
"item_share_app"
>
ऐप शेयर करें
</item>
<item
name=
"item_rate_us"
>
हमें रेटिंग दें
</item>
<item
name=
"item_password"
>
परिचय
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-ja/strings.xml
View file @
666dff13
This diff is collapsed.
Click to expand it.
app/src/main/res/values-pt-rBR/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Configurações
</string>
<string
name=
"title_settings"
>
Configurações
</string>
<string
name=
"title_preferences"
>
Preferencias
</string>
<string
name=
"title_preferences"
>
Preferencias
</string>
<string
name=
"title_change_password"
>
Alterar senha
</string>
<string
name=
"title_change_password"
>
Alterar senha
</string>
<string
name=
"title_rate_us"
>
nos avalie
</string>
<string
name=
"title_admin_panel"
>
Painel administrativo
</string>
<string
name=
"title_admin_panel"
>
Painel administrativo
</string>
<string
name=
"title_password"
>
Alterar senha
</string>
<string
name=
"title_password"
>
Alterar senha
</string>
<string
name=
"title_update_profile"
>
Editar perfil
</string>
<string
name=
"title_update_profile"
>
Editar perfil
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferencias
</item>
<item
name=
"item_preferences"
>
Preferencias
</item>
<item
name=
"item_password"
>
Alterar senha
</item>
<item
name=
"item_password"
>
Alterar senha
</item>
<item
name=
"item_password"
>
Sobre
</item>
<item
name=
"item_share_app"
>
Compartilhe o aplicativo
</item>
<item
name=
"item_share_app"
>
Compartilhe o aplicativo
</item>
<item
name=
"item_rate_us"
>
nos avalie
</item>
<item
name=
"item_password"
>
Sobre
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-ru-rRU/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Настройки
</string>
<string
name=
"title_settings"
>
Настройки
</string>
<string
name=
"title_preferences"
>
Персональные
</string>
<string
name=
"title_preferences"
>
Персональные
</string>
<string
name=
"title_change_password"
>
Изменить пароль
</string>
<string
name=
"title_change_password"
>
Изменить пароль
</string>
<string
name=
"title_rate_us"
>
оцените нас
</string>
<string
name=
"title_admin_panel"
>
Панель админа
</string>
<string
name=
"title_admin_panel"
>
Панель админа
</string>
<string
name=
"title_password"
>
Изменить пароль
</string>
<string
name=
"title_password"
>
Изменить пароль
</string>
<string
name=
"title_update_profile"
>
Обновить профиль
</string>
<string
name=
"title_update_profile"
>
Обновить профиль
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Персональные
</item>
<item
name=
"item_preferences"
>
Персональные
</item>
<item
name=
"item_password"
>
Изменить пароль
</item>
<item
name=
"item_password"
>
Изменить пароль
</item>
<item
name=
"item_
password"
>
О программе
</item>
<item
name=
"item_
rate_us"
>
оцените нас
</item>
<item
name=
"item_share_app"
>
добавить приложение
</item>
<item
name=
"item_share_app"
>
добавить приложение
</item>
<item
name=
"item_password"
>
О программе
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-tr/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Ayarlar
</string>
<string
name=
"title_settings"
>
Ayarlar
</string>
<string
name=
"title_preferences"
>
Tercihler
</string>
<string
name=
"title_preferences"
>
Tercihler
</string>
<string
name=
"title_change_password"
>
Şifre Değişikliği
</string>
<string
name=
"title_change_password"
>
Şifre Değişikliği
</string>
<string
name=
"title_rate_us"
>
Bizi değerlendirin
</string>
<string
name=
"title_admin_panel"
>
Yönetici Paneli
</string>
<string
name=
"title_admin_panel"
>
Yönetici Paneli
</string>
<string
name=
"title_password"
>
Şifrenizi Değiştirin
</string>
<string
name=
"title_password"
>
Şifrenizi Değiştirin
</string>
<string
name=
"title_update_profile"
>
Profilinizi Düzenleyin
</string>
<string
name=
"title_update_profile"
>
Profilinizi Düzenleyin
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Tercihler
</item>
<item
name=
"item_preferences"
>
Tercihler
</item>
<item
name=
"item_password"
>
Şifre Değiştir
</item>
<item
name=
"item_password"
>
Şifre Değiştir
</item>
<item
name=
"item_password"
>
Hakkında
</item>
<item
name=
"item_share_app"
>
uygulamayı Paylaş
</item>
<item
name=
"item_share_app"
>
uygulamayı Paylaş
</item>
<item
name=
"item_rate_us"
>
Bizi değerlendirin
</item>
<item
name=
"item_password"
>
Hakkında
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-uk/strings.xml
View file @
666dff13
...
@@ -16,6 +16,7 @@
...
@@ -16,6 +16,7 @@
<string
name=
"title_settings"
>
Налаштування
</string>
<string
name=
"title_settings"
>
Налаштування
</string>
<string
name=
"title_preferences"
>
Персональні
</string>
<string
name=
"title_preferences"
>
Персональні
</string>
<string
name=
"title_change_password"
>
Змінити пароль
</string>
<string
name=
"title_change_password"
>
Змінити пароль
</string>
<string
name=
"title_rate_us"
>
Оцініть нас
</string>
<string
name=
"title_admin_panel"
>
Панель адміністратора
</string>
<string
name=
"title_admin_panel"
>
Панель адміністратора
</string>
<string
name=
"title_password"
>
Змінити пароль
</string>
<string
name=
"title_password"
>
Змінити пароль
</string>
<string
name=
"title_update_profile"
>
Оновити профіль
</string>
<string
name=
"title_update_profile"
>
Оновити профіль
</string>
...
@@ -62,8 +63,9 @@
...
@@ -62,8 +63,9 @@
<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_password"
>
About
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
поділитися прикладом
</item>
<item
name=
"item_share_app"
>
поділитися прикладом
</item>
<item
name=
"item_rate_us"
>
Оцініть нас
</item>
<item
name=
"item_password"
>
About
</item>
<!-- TODO Add translation -->
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values/defaults.xml
View file @
666dff13
...
@@ -5,4 +5,5 @@
...
@@ -5,4 +5,5 @@
<string
name=
"community_server_url"
translatable=
"false"
>
open.rocket.chat
</string>
<string
name=
"community_server_url"
translatable=
"false"
>
open.rocket.chat
</string>
<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>
</resources>
</resources>
\ No newline at end of file
app/src/main/res/values/strings.xml
View file @
666dff13
...
@@ -28,6 +28,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -28,6 +28,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"title_settings"
>
Settings
</string>
<string
name=
"title_settings"
>
Settings
</string>
<string
name=
"title_preferences"
>
Preferences
</string>
<string
name=
"title_preferences"
>
Preferences
</string>
<string
name=
"title_change_password"
>
Change Password
</string>
<string
name=
"title_change_password"
>
Change Password
</string>
<string
name=
"title_rate_us"
>
Rate Us
</string>
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<string
name=
"title_admin_panel"
>
Admin panel
</string>
<string
name=
"title_password"
>
Change Password
</string>
<string
name=
"title_password"
>
Change Password
</string>
<string
name=
"title_update_profile"
>
Update profile
</string>
<string
name=
"title_update_profile"
>
Update profile
</string>
...
@@ -74,8 +75,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -74,8 +75,9 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<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_password"
>
About
</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_password"
>
About
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment