Skip to content
This repository was archived by the owner on Jun 7, 2020. It is now read-only.

Commit 0765513

Browse files
rafaelksrafaelks
authored
Merge pull request #1989 from RocketChat/fix/settings-menu
[FIX] Settings menu
2 parents aede1ac + 373602f commit 0765513

File tree

10 files changed

+18
-9
lines changed

10 files changed

+18
-9
lines changed

‎app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ android {
1616
applicationId "chat.rocket.android"
1717
minSdkVersion versions.minSdk
1818
targetSdkVersion versions.targetSdk
19-
versionCode 2056
19+
versionCode 2057
2020
versionName "3.2.0"
2121
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2222
multiDexEnabled true

‎app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt

+9-5
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
2323
import chat.rocket.android.settings.presentation.SettingsView
2424
import chat.rocket.android.util.extensions.addFragmentBackStack
2525
import chat.rocket.android.util.extensions.inflate
26+
import chat.rocket.android.util.extensions.showToast
2627
import chat.rocket.android.webview.ui.webViewIntent
2728
import dagger.android.support.AndroidSupportInjection
2829
import kotlinx.android.synthetic.main.fragment_settings.*
@@ -73,20 +74,23 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
7374
resources.getStringArray(R.array.settings_actions)[1] ->
7475
activity?.startActivity(Intent(activity, PasswordActivity::class.java))
7576

76-
resources.getStringArray(R.array.settings_actions)[2] -> shareApp()
77+
// TODO (https://github.com/RocketChat/Rocket.Chat.Android/pull/1918)
78+
resources.getStringArray(R.array.settings_actions)[2] -> showToast("Coming soon")
7779

78-
resources.getStringArray(R.array.settings_actions)[3] -> showAppOnStore()
80+
resources.getStringArray(R.array.settings_actions)[3] -> shareApp()
7981

80-
resources.getStringArray(R.array.settings_actions)[4] -> contactSupport()
82+
resources.getStringArray(R.array.settings_actions)[4] -> showAppOnStore()
8183

82-
resources.getStringArray(R.array.settings_actions)[5] -> activity?.startActivity(
84+
resources.getStringArray(R.array.settings_actions)[5] -> contactSupport()
85+
86+
resources.getStringArray(R.array.settings_actions)[6] -> activity?.startActivity(
8387
context?.webViewIntent(
8488
getString(R.string.license_url),
8589
getString(R.string.title_licence)
8690
)
8791
)
8892

89-
resources.getStringArray(R.array.settings_actions)[6] -> {
93+
resources.getStringArray(R.array.settings_actions)[7] -> {
9094
(activity as AppCompatActivity).addFragmentBackStack(
9195
TAG_ABOUT_FRAGMENT,
9296
R.id.fragment_container

‎app/src/main/res/values-de/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@
7171
<string-array name="settings_actions">
7272
<item name="item_preferences">Eigenschaften</item>
7373
<item name="item_password">Passwort ändern</item>
74+
<item name="change_language">Change Language</item>
7475
<item name="item_share_app">Link zur App teilen</item>
7576
<item name="item_rate_us">Bewerten Sie uns</item>
7677
<item name="item_contact_us">Kontaktieren Sie uns</item>
7778
<item name="item_licence">Lizenz</item>
7879
<item name="item_about">Über</item>
79-
8080
</string-array>
8181

8282
<!-- Regular information messages -->

‎app/src/main/res/values-es/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@
6363
<string-array name="settings_actions">
6464
<item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
6565
<item name="item_password">Change password</item> <!-- TODO Add translation -->
66+
<item name="change_language">Change Language</item> <!-- TODO Add translation -->
6667
<item name="item_share_app">Share app</item> <!-- TODO Add translation -->
6768
<item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
6869
<item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

‎app/src/main/res/values-fr/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<string-array name="settings_actions">
6565
<item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
6666
<item name="item_password">Change password</item> <!-- TODO Add translation -->
67+
<item name="change_language">Change Language</item> <!-- TODO Add translation -->
6768
<item name="item_share_app">Share app</item> <!-- TODO Add translation -->
6869
<item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
6970
<item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

‎app/src/main/res/values-ja/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@
6666
<string-array name="settings_actions">
6767
<item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
6868
<item name="item_password">Change password</item> <!-- TODO Add translation -->
69-
<item name="change_language">Change Language </item><!-- TODO Add translation -->
69+
<item name="change_language">Change Language</item><!-- TODO Add translation -->
7070
<item name="item_share_app">Share app</item> <!-- TODO Add translation -->
7171
<item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
7272
<item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

‎app/src/main/res/values-pt-rBR/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<string-array name="settings_actions">
6565
<item name="item_preferences">Preferências</item>
6666
<item name="item_password">Alterar senha</item>
67+
<item name="change_language">Alterar idioma</item>
6768
<item name="item_share_app">Compartilhar app</item>
6869
<item name="item_rate_us">Classifique-nos</item>
6970
<item name="item_contact_us">Contate-nos</item>

‎app/src/main/res/values-tr/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<string-array name="settings_actions">
6565
<item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
6666
<item name="item_password">Change password</item> <!-- TODO Add translation -->
67+
<item name="change_language">Change Language</item> <!-- TODO Add translation -->
6768
<item name="item_share_app">Share app</item> <!-- TODO Add translation -->
6869
<item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
6970
<item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

‎app/src/main/res/values-uk/strings.xml

+1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
<string-array name="settings_actions">
6565
<item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
6666
<item name="item_password">Change password</item> <!-- TODO Add translation -->
67+
<item name="change_language">Change Language</item> <!-- TODO Add translation -->
6768
<item name="item_share_app">Share app</item> <!-- TODO Add translation -->
6869
<item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
6970
<item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->

‎app/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
7676
<string-array name="settings_actions">
7777
<item name="item_preferences">Preferences</item>
7878
<item name="item_password">Change password</item>
79-
<item name="change_language">Change Language </item>
79+
<item name="change_language">Change Language</item>
8080
<item name="item_share_app">Share app</item>
8181
<item name="item_rate_us">Rate us</item>
8282
<item name="item_contact_us">Contact us</item>

0 commit comments

Comments
 (0)