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
b31e9d44
Commit
b31e9d44
authored
Jan 11, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the settings items working inconsistently.
parent
aede1acb
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
17 additions
and
8 deletions
+17
-8
SettingsFragment.kt
.../java/chat/rocket/android/settings/ui/SettingsFragment.kt
+9
-5
strings.xml
app/src/main/res/values-de/strings.xml
+1
-1
strings.xml
app/src/main/res/values-es/strings.xml
+1
-0
strings.xml
app/src/main/res/values-fr/strings.xml
+1
-0
strings.xml
app/src/main/res/values-ja/strings.xml
+1
-1
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+1
-0
strings.xml
app/src/main/res/values-tr/strings.xml
+1
-0
strings.xml
app/src/main/res/values-uk/strings.xml
+1
-0
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
View file @
b31e9d44
...
...
@@ -23,6 +23,7 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
import
chat.rocket.android.settings.presentation.SettingsView
import
chat.rocket.android.util.extensions.addFragmentBackStack
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.showToast
import
chat.rocket.android.webview.ui.webViewIntent
import
dagger.android.support.AndroidSupportInjection
import
kotlinx.android.synthetic.main.fragment_settings.*
...
...
@@ -73,20 +74,23 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
1
]
->
activity
?.
startActivity
(
Intent
(
activity
,
PasswordActivity
::
class
.
java
))
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
2
]
->
shareApp
()
// TODO (https://github.com/RocketChat/Rocket.Chat.Android/pull/1918)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
2
]
->
showToast
(
"Coming soon"
)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
3
]
->
sh
owAppOnStore
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
3
]
->
sh
areApp
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
4
]
->
contactSupport
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
4
]
->
showAppOnStore
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
5
]
->
activity
?.
startActivity
(
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
5
]
->
contactSupport
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
6
]
->
activity
?.
startActivity
(
context
?.
webViewIntent
(
getString
(
R
.
string
.
license_url
),
getString
(
R
.
string
.
title_licence
)
)
)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
6
]
->
{
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
7
]
->
{
(
activity
as
AppCompatActivity
).
addFragmentBackStack
(
TAG_ABOUT_FRAGMENT
,
R
.
id
.
fragment_container
...
...
app/src/main/res/values-de/strings.xml
View file @
b31e9d44
...
...
@@ -71,12 +71,12 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Eigenschaften
</item>
<item
name=
"item_password"
>
Passwort ändern
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"item_share_app"
>
Link zur App teilen
</item>
<item
name=
"item_rate_us"
>
Bewerten Sie uns
</item>
<item
name=
"item_contact_us"
>
Kontaktieren Sie uns
</item>
<item
name=
"item_licence"
>
Lizenz
</item>
<item
name=
"item_about"
>
Über
</item>
</string-array>
<!-- Regular information messages -->
...
...
app/src/main/res/values-es/strings.xml
View file @
b31e9d44
...
...
@@ -63,6 +63,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-fr/strings.xml
View file @
b31e9d44
...
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-ja/strings.xml
View file @
b31e9d44
...
...
@@ -66,7 +66,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
b31e9d44
...
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferências
</item>
<item
name=
"item_password"
>
Alterar senha
</item>
<item
name=
"change_language"
>
Alterar idioma
</item>
<item
name=
"item_share_app"
>
Compartilhar app
</item>
<item
name=
"item_rate_us"
>
Classifique-nos
</item>
<item
name=
"item_contact_us"
>
Contate-nos
</item>
...
...
app/src/main/res/values-tr/strings.xml
View file @
b31e9d44
...
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-uk/strings.xml
View file @
b31e9d44
...
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values/strings.xml
View file @
b31e9d44
...
...
@@ -76,7 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<item
name=
"item_password"
>
Change password
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"item_share_app"
>
Share app
</item>
<item
name=
"item_rate_us"
>
Rate us
</item>
<item
name=
"item_contact_us"
>
Contact us
</item>
...
...
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