Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-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
xabber-android
Commits
74bb67fa
Commit
74bb67fa
authored
May 18, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'release/1.0.8'
parents
6e28a9e4
20f036bf
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
29 additions
and
31 deletions
+29
-31
build.gradle
app/build.gradle
+2
-2
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-2
ChatViewer.java
app/src/main/java/com/xabber/android/ui/ChatViewer.java
+1
-1
ChatViewerFragment.java
...c/main/java/com/xabber/android/ui/ChatViewerFragment.java
+2
-2
ChatContactSettings.java
...om/xabber/android/ui/preferences/ChatContactSettings.java
+5
-7
ChatContactSettingsFragment.java
...r/android/ui/preferences/ChatContactSettingsFragment.java
+2
-4
ChatGlobalSettings.java
...com/xabber/android/ui/preferences/ChatGlobalSettings.java
+2
-2
ChatGlobalSettingsFragment.java
...er/android/ui/preferences/ChatGlobalSettingsFragment.java
+2
-2
DebugSettingsFragment.java
.../xabber/android/ui/preferences/DebugSettingsFragment.java
+3
-1
preference_chat_contact.xml
app/src/main/res/xml/preference_chat_contact.xml
+7
-7
preference_chat_global.xml
app/src/main/res/xml/preference_chat_global.xml
+0
-0
preference_editor.xml
app/src/main/res/xml/preference_editor.xml
+1
-1
No files found.
app/build.gradle
View file @
74bb67fa
...
...
@@ -7,8 +7,8 @@ android {
defaultConfig
{
minSdkVersion
14
targetSdkVersion
22
versionCode
1
79
versionName
'1.0.
7
'
versionCode
1
80
versionName
'1.0.
8
'
}
compileOptions
{
...
...
app/src/main/AndroidManifest.xml
View file @
74bb67fa
...
...
@@ -199,7 +199,7 @@
</activity>
<activity
android:name=
"
com.xabber.android.ui.preferences.ChatEditor
"
android:name=
"
.ui.preferences.ChatContactSettings
"
android:label=
"@string/chat_settings"
android:parentActivityName=
"com.xabber.android.ui.ChatViewer"
>
...
...
@@ -334,7 +334,7 @@
</activity>
<activity
android:name=
"
com.xabber.android.ui.preferences.Chat
Settings"
android:name=
"
.ui.preferences.ChatGlobal
Settings"
android:parentActivityName=
"com.xabber.android.ui.preferences.PreferenceEditor"
>
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
...
...
app/src/main/java/com/xabber/android/ui/ChatViewer.java
View file @
74bb67fa
...
...
@@ -252,7 +252,7 @@ public class ChatViewer extends ManagedActivity implements OnChatChangedListener
getSelectedPageDataFromIntent
();
if
(
intent
.
getAction
().
equals
(
ACTION_SHORTCUT
))
{
if
(
intent
.
getAction
()
!=
null
&&
intent
.
getAction
()
.
equals
(
ACTION_SHORTCUT
))
{
getInitialChatFromIntent
();
initChats
();
}
...
...
app/src/main/java/com/xabber/android/ui/ChatViewerFragment.java
View file @
74bb67fa
...
...
@@ -50,7 +50,7 @@ import com.xabber.android.ui.adapter.ChatMessageAdapter;
import
com.xabber.android.ui.dialog.ChatExportDialogFragment
;
import
com.xabber.android.ui.helper.AccountPainter
;
import
com.xabber.android.ui.helper.ContactTitleInflater
;
import
com.xabber.android.ui.preferences.Chat
Editor
;
import
com.xabber.android.ui.preferences.Chat
ContactSettings
;
public
class
ChatViewerFragment
extends
Fragment
implements
PopupMenu
.
OnMenuItemClickListener
,
View
.
OnClickListener
,
Toolbar
.
OnMenuItemClickListener
,
ChatMessageAdapter
.
Message
.
MessageClickListener
{
...
...
@@ -442,7 +442,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
return
true
;
case
R
.
id
.
action_chat_settings
:
startActivity
(
Chat
Editor
.
createIntent
(
getActivity
(),
account
,
user
));
startActivity
(
Chat
ContactSettings
.
createIntent
(
getActivity
(),
account
,
user
));
return
true
;
case
R
.
id
.
action_show_history
:
...
...
app/src/main/java/com/xabber/android/ui/preferences/Chat
Editor
.java
→
app/src/main/java/com/xabber/android/ui/preferences/Chat
ContactSettings
.java
View file @
74bb67fa
...
...
@@ -27,17 +27,15 @@ import com.xabber.android.data.intent.EntityIntentBuilder;
import
com.xabber.android.ui.helper.BarPainter
;
import
com.xabber.android.ui.helper.ManagedActivity
;
public
class
Chat
Editor
extends
ManagedActivity
implements
Chat
Editor
Fragment
.
ChatEditorFragmentInteractionListener
{
public
class
Chat
ContactSettings
extends
ManagedActivity
implements
Chat
ContactSettings
Fragment
.
ChatEditorFragmentInteractionListener
{
private
String
account
;
private
String
user
;
private
AccountItem
accountItem
;
public
static
Intent
createIntent
(
Context
context
,
String
account
,
String
user
)
{
return
new
EntityIntentBuilder
(
context
,
ChatEditor
.
class
)
.
setAccount
(
account
).
setUser
(
user
).
build
();
public
static
Intent
createIntent
(
Context
context
,
String
account
,
String
user
)
{
return
new
EntityIntentBuilder
(
context
,
ChatContactSettings
.
class
).
setAccount
(
account
).
setUser
(
user
).
build
();
}
private
static
String
getAccount
(
Intent
intent
)
{
...
...
@@ -72,7 +70,7 @@ public class ChatEditor extends ManagedActivity
if
(
savedInstanceState
==
null
)
{
getFragmentManager
().
beginTransaction
()
.
add
(
R
.
id
.
fragment_container
,
new
Chat
Editor
Fragment
()).
commit
();
.
add
(
R
.
id
.
fragment_container
,
new
Chat
ContactSettings
Fragment
()).
commit
();
}
}
...
...
app/src/main/java/com/xabber/android/ui/preferences/Chat
Editor
Fragment.java
→
app/src/main/java/com/xabber/android/ui/preferences/Chat
ContactSettings
Fragment.java
View file @
74bb67fa
...
...
@@ -12,13 +12,13 @@ import com.xabber.android.data.message.chat.ChatManager;
import
java.util.HashMap
;
import
java.util.Map
;
public
class
Chat
Editor
Fragment
extends
BaseSettingsFragment
{
public
class
Chat
ContactSettings
Fragment
extends
BaseSettingsFragment
{
private
ChatEditorFragmentInteractionListener
mListener
;
@Override
protected
void
onInflate
(
Bundle
savedInstanceState
)
{
addPreferencesFromResource
(
R
.
xml
.
chat_editor
);
addPreferencesFromResource
(
R
.
xml
.
preference_chat_contact
);
AccountItem
accountItem
=
mListener
.
getAccountItem
();
...
...
@@ -101,9 +101,7 @@ public class ChatEditorFragment extends BaseSettingsFragment {
public
interface
ChatEditorFragmentInteractionListener
{
String
getAccount
();
AccountItem
getAccountItem
();
String
getUser
();
}
}
app/src/main/java/com/xabber/android/ui/preferences/ChatSettings.java
→
app/src/main/java/com/xabber/android/ui/preferences/Chat
Global
Settings.java
View file @
74bb67fa
...
...
@@ -8,7 +8,7 @@ import com.xabber.android.ui.helper.BarPainter;
import
com.xabber.android.ui.helper.ManagedActivity
;
import
com.xabber.android.ui.helper.PreferenceSummaryHelper
;
public
class
ChatSettings
extends
ManagedActivity
{
public
class
Chat
Global
Settings
extends
ManagedActivity
{
@Override
protected
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
...
...
@@ -31,7 +31,7 @@ public class ChatSettings extends ManagedActivity {
if
(
savedInstanceState
==
null
)
{
getFragmentManager
().
beginTransaction
()
.
add
(
R
.
id
.
fragment_container
,
new
ChatSettingsFragment
()).
commit
();
.
add
(
R
.
id
.
fragment_container
,
new
Chat
Global
SettingsFragment
()).
commit
();
}
}
}
app/src/main/java/com/xabber/android/ui/preferences/ChatSettingsFragment.java
→
app/src/main/java/com/xabber/android/ui/preferences/Chat
Global
SettingsFragment.java
View file @
74bb67fa
...
...
@@ -5,12 +5,12 @@ import android.os.Bundle;
import
com.xabber.android.R
;
import
com.xabber.android.ui.helper.PreferenceSummaryHelper
;
public
class
ChatSettingsFragment
extends
android
.
preference
.
PreferenceFragment
{
public
class
Chat
Global
SettingsFragment
extends
android
.
preference
.
PreferenceFragment
{
@Override
public
void
onCreate
(
Bundle
savedInstanceState
)
{
super
.
onCreate
(
savedInstanceState
);
addPreferencesFromResource
(
R
.
xml
.
preference_chat
);
addPreferencesFromResource
(
R
.
xml
.
preference_chat
_global
);
PreferenceSummaryHelper
.
updateSummary
(
getPreferenceScreen
());
}
...
...
app/src/main/java/com/xabber/android/ui/preferences/DebugSettingsFragment.java
View file @
74bb67fa
...
...
@@ -13,7 +13,9 @@ public class DebugSettingsFragment extends android.preference.PreferenceFragment
addPreferencesFromResource
(
R
.
xml
.
preference_debug
);
getPreferenceScreen
().
findPreference
(
getString
(
R
.
string
.
debug_log_key
)).
setEnabled
(
LogManager
.
isDebugable
());
if
(!
LogManager
.
isDebugable
())
{
getPreferenceScreen
().
removePreference
(
getPreferenceScreen
().
findPreference
(
getString
(
R
.
string
.
debug_log_key
)));
}
PreferenceSummaryHelper
.
updateSummary
(
getPreferenceScreen
());
}
...
...
app/src/main/res/xml/
chat_editor
.xml
→
app/src/main/res/xml/
preference_chat_contact
.xml
View file @
74bb67fa
...
...
@@ -15,25 +15,25 @@
<PreferenceScreen
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<CheckBoxPreference
android:title=
"@string/save_history"
android:key=
"@string/chat_save_history_key"
android:title=
"@string/save_history"
/>
<com.xabber.android.ui.widget.RingtonePreference
android:title=
"@string/events_sound"
android:key=
"@string/chat_events_sound_key"
android:ringtoneType=
"notification"
android:showDefault=
"true"
android:showSilent=
"true"
android:
showDefault=
"true
"
/>
android:
title=
"@string/events_sound
"
/>
<CheckBoxPreference
android:title=
"@string/events_show_text"
android:key=
"@string/chat_events_show_text_key"
android:title=
"@string/events_show_text"
/>
<CheckBoxPreference
android:title=
"@string/events_vibro"
android:key=
"@string/chat_events_vibro_key"
android:title=
"@string/events_vibro"
/>
<CheckBoxPreference
android:title=
"@string/events_visible_chat"
android:key=
"@string/chat_events_visible_chat_key"
android:title=
"@string/events_visible_chat"
/>
</PreferenceScreen>
app/src/main/res/xml/preference_chat.xml
→
app/src/main/res/xml/preference_chat
_global
.xml
View file @
74bb67fa
File moved
app/src/main/res/xml/preference_editor.xml
View file @
74bb67fa
...
...
@@ -30,7 +30,7 @@
android:key=
"@string/preference_chats"
android:title=
"@string/preference_chats"
>
<intent
android:targetClass=
"com.xabber.android.ui.preferences.ChatSettings"
android:targetClass=
"com.xabber.android.ui.preferences.Chat
Global
Settings"
android:targetPackage=
"@string/application_package"
/>
</Preference>
<Preference
...
...
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