Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
QuasselDroid-ng
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Janne Mareike Koschinski
QuasselDroid-ng
Commits
a36244f1
Verified
Commit
a36244f1
authored
7 years ago
by
Janne Mareike Koschinski
Browse files
Options
Downloads
Patches
Plain Diff
Fixes translation issues
parent
4f5e5256
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
+10
-8
10 additions, 8 deletions
...uasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
app/src/main/res/values/strings_settings.xml
+1
-0
1 addition, 0 deletions
app/src/main/res/values/strings_settings.xml
with
11 additions
and
8 deletions
app/src/main/java/de/kuschku/quasseldroid/ui/setup/accounts/edit/AccountEditActivity.kt
+
10
−
8
View file @
a36244f1
...
@@ -24,13 +24,13 @@ import android.content.Context
...
@@ -24,13 +24,13 @@ import android.content.Context
import
android.content.Intent
import
android.content.Intent
import
android.os.Bundle
import
android.os.Bundle
import
android.support.design.widget.TextInputLayout
import
android.support.design.widget.TextInputLayout
import
android.support.v7.app.AlertDialog
import
android.text.Editable
import
android.text.Editable
import
android.view.Menu
import
android.view.Menu
import
android.view.MenuItem
import
android.view.MenuItem
import
android.widget.EditText
import
android.widget.EditText
import
butterknife.BindView
import
butterknife.BindView
import
butterknife.ButterKnife
import
butterknife.ButterKnife
import
com.afollestad.materialdialogs.MaterialDialog
import
dagger.android.support.DaggerAppCompatActivity
import
dagger.android.support.DaggerAppCompatActivity
import
de.kuschku.quasseldroid.Keys
import
de.kuschku.quasseldroid.Keys
import
de.kuschku.quasseldroid.R
import
de.kuschku.quasseldroid.R
...
@@ -156,10 +156,14 @@ class AccountEditActivity : DaggerAppCompatActivity() {
...
@@ -156,10 +156,14 @@ class AccountEditActivity : DaggerAppCompatActivity() {
override
fun
onOptionsItemSelected
(
item
:
MenuItem
?)
=
when
(
item
?.
itemId
)
{
override
fun
onOptionsItemSelected
(
item
:
MenuItem
?)
=
when
(
item
?.
itemId
)
{
R
.
id
.
action_delete
->
{
R
.
id
.
action_delete
->
{
AlertDialog
.
Builder
(
this
)
MaterialDialog
.
Builder
(
this
)
.
setTitle
(
"Delete?"
)
.
content
(
R
.
string
.
delete_confirmation
)
.
setMessage
(
"Are you sure?"
)
.
positiveText
(
R
.
string
.
label_yes
)
.
setPositiveButton
(
"Delete"
)
{
_
,
_
->
.
negativeText
(
R
.
string
.
label_no
)
.
negativeColorAttr
(
R
.
attr
.
colorTextPrimary
)
.
backgroundColorAttr
(
R
.
attr
.
colorBackgroundCard
)
.
contentColorAttr
(
R
.
attr
.
colorTextPrimary
)
.
onPositive
{
_
,
_
->
val
it
=
account
val
it
=
account
if
(
it
!=
null
)
if
(
it
!=
null
)
handler
.
post
{
handler
.
post
{
...
@@ -174,9 +178,7 @@ class AccountEditActivity : DaggerAppCompatActivity() {
...
@@ -174,9 +178,7 @@ class AccountEditActivity : DaggerAppCompatActivity() {
setResult
(
Activity
.
RESULT_OK
)
setResult
(
Activity
.
RESULT_OK
)
finish
()
finish
()
}
}
.
setNegativeButton
(
"Cancel"
)
{
dialogInterface
,
_
->
.
build
()
dialogInterface
.
cancel
()
}
.
show
()
.
show
()
true
true
}
}
...
...
This diff is collapsed.
Click to expand it.
app/src/main/res/values/strings_settings.xml
+
1
−
0
View file @
a36244f1
...
@@ -83,6 +83,7 @@
...
@@ -83,6 +83,7 @@
<string
name=
"settings_chatlist_sort_alphabetically"
>
Sort Alphabetically
</string>
<string
name=
"settings_chatlist_sort_alphabetically"
>
Sort Alphabetically
</string>
<string
name=
"settings_chatlist_add_new_buffers_automatically"
>
Add new chats automatically
</string>
<string
name=
"settings_chatlist_add_new_buffers_automatically"
>
Add new chats automatically
</string>
<string
name=
"settings_chatlist_network"
>
Network
</string>
<string
name=
"settings_chatlist_network"
>
Network
</string>
<string
name=
"settings_chatlist_network_all"
>
All Networks
</string>
<string
name=
"settings_chatlist_show_status_buffer"
>
Show Status Buffer
</string>
<string
name=
"settings_chatlist_show_status_buffer"
>
Show Status Buffer
</string>
<string
name=
"settings_chatlist_types"
>
Chat Types
</string>
<string
name=
"settings_chatlist_types"
>
Chat Types
</string>
<string
name=
"settings_chatlist_show_channels"
>
Show Channels
</string>
<string
name=
"settings_chatlist_show_channels"
>
Show Channels
</string>
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment