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
a9812c9d
Commit
a9812c9d
authored
Dec 26, 2014
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Device default theme (holo or material) is used for API v14 and higher .
parent
9cd3c354
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
85 additions
and
26 deletions
+85
-26
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+2
-26
theme.xml
app/src/main/res/values-v14/theme.xml
+83
-0
No files found.
app/src/main/AndroidManifest.xml
View file @
a9812c9d
...
@@ -23,11 +23,11 @@
...
@@ -23,11 +23,11 @@
android:label=
"@string/application_name"
android:label=
"@string/application_name"
android:icon=
"@drawable/ic_launcher"
android:icon=
"@drawable/ic_launcher"
android:name=
"com.xabber.android.data.Application"
android:name=
"com.xabber.android.data.Application"
android:theme=
"@style/Theme.Light"
>
>
<activity
<activity
android:label=
"@string/application_name"
android:label=
"@string/application_name"
android:name=
"com.xabber.android.ui.ContactList"
android:name=
"com.xabber.android.ui.ContactList"
android:theme=
"@style/Theme.NoTitleBar"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
>
>
<intent-filter>
<intent-filter>
...
@@ -64,37 +64,30 @@
...
@@ -64,37 +64,30 @@
</activity>
</activity>
<activity
<activity
android:name=
"com.xabber.android.ui.LoadActivity"
android:name=
"com.xabber.android.ui.LoadActivity"
android:theme=
"@style/Theme.NoTitleBar"
/>
/>
<activity
<activity
android:label=
"@string/about_viewer"
android:label=
"@string/about_viewer"
android:name=
"com.xabber.android.ui.AboutViewer"
android:name=
"com.xabber.android.ui.AboutViewer"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/preference_accounts"
android:label=
"@string/preference_accounts"
android:name=
"com.xabber.android.ui.AccountList"
android:name=
"com.xabber.android.ui.AccountList"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/account_editor"
android:label=
"@string/account_editor"
android:name=
"com.xabber.android.ui.AccountEditor"
android:name=
"com.xabber.android.ui.AccountEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/chat_list"
android:label=
"@string/chat_list"
android:name=
"com.xabber.android.ui.ChatList"
android:name=
"com.xabber.android.ui.ChatList"
android:theme=
"@android:style/Theme.Dialog"
/>
/>
<activity
<activity
android:label=
"@string/occupant_list"
android:label=
"@string/occupant_list"
android:name=
"com.xabber.android.ui.OccupantList"
android:name=
"com.xabber.android.ui.OccupantList"
android:theme=
"@android:style/Theme.Dialog"
/>
/>
<activity
<activity
android:label=
"@string/chat_viewer"
android:label=
"@string/chat_viewer"
android:name=
"com.xabber.android.ui.ChatViewer"
android:name=
"com.xabber.android.ui.ChatViewer"
android:theme=
"@style/Theme.Light.NoTitleBar"
android:windowSoftInputMode=
"adjustResize"
android:windowSoftInputMode=
"adjustResize"
android:launchMode=
"singleTop"
android:launchMode=
"singleTop"
>
>
...
@@ -105,47 +98,38 @@
...
@@ -105,47 +98,38 @@
<activity
<activity
android:label=
"@string/contact_editor"
android:label=
"@string/contact_editor"
android:name=
"com.xabber.android.ui.ContactEditor"
android:name=
"com.xabber.android.ui.ContactEditor"
android:theme=
"@style/Theme.NoTitleBar"
/>
/>
<activity
<activity
android:label=
"@string/contact_add"
android:label=
"@string/contact_add"
android:name=
"com.xabber.android.ui.ContactAdd"
android:name=
"com.xabber.android.ui.ContactAdd"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/account_add"
android:label=
"@string/account_add"
android:name=
"com.xabber.android.ui.AccountAdd"
android:name=
"com.xabber.android.ui.AccountAdd"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/account_oauth"
android:label=
"@string/account_oauth"
android:name=
"com.xabber.android.ui.OAuthActivity"
android:name=
"com.xabber.android.ui.OAuthActivity"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/muc_add"
android:label=
"@string/muc_add"
android:name=
"com.xabber.android.ui.MUCEditor"
android:name=
"com.xabber.android.ui.MUCEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/status_editor"
android:label=
"@string/status_editor"
android:name=
"com.xabber.android.ui.StatusEditor"
android:name=
"com.xabber.android.ui.StatusEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/preference_editor"
android:label=
"@string/preference_editor"
android:name=
"com.xabber.android.ui.PreferenceEditor"
android:name=
"com.xabber.android.ui.PreferenceEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/chat_settings"
android:label=
"@string/chat_settings"
android:name=
"com.xabber.android.ui.ChatEditor"
android:name=
"com.xabber.android.ui.ChatEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:label=
"@string/contact_viewer"
android:label=
"@string/contact_viewer"
android:name=
"com.xabber.android.ui.ContactViewer"
android:name=
"com.xabber.android.ui.ContactViewer"
android:theme=
"@style/Theme"
android:icon=
"@drawable/ic_information"
android:icon=
"@drawable/ic_information"
>
>
<intent-filter>
<intent-filter>
...
@@ -159,17 +143,12 @@
...
@@ -159,17 +143,12 @@
<activity
<activity
android:name=
"com.xabber.android.ui.FingerprintViewer"
android:name=
"com.xabber.android.ui.FingerprintViewer"
android:label=
"@string/otr_verify_fingerprint"
android:label=
"@string/otr_verify_fingerprint"
android:theme=
"@style/Theme.NoTitleBar"
/>
/>
<activity
<activity
android:name=
"com.xabber.android.ui.QuestionViewer"
android:name=
"com.xabber.android.ui.QuestionViewer"
android:label=
"@string/otr_verify_fingerprint"
android:label=
"@string/otr_verify_fingerprint"
android:theme=
"@style/Theme.NoTitleBar"
/>
<activity
android:name=
"com.xabber.android.ui.OpenSourceViewer"
android:theme=
"@style/Theme.NoTitleBar"
/>
/>
<activity
<activity
android:name=
"com.xabber.android.ui.ContactSubscription"
android:name=
"com.xabber.android.ui.ContactSubscription"
/>
/>
...
@@ -187,12 +166,10 @@
...
@@ -187,12 +166,10 @@
/>
/>
<activity
<activity
android:name=
"com.xabber.android.ui.PhraseList"
android:name=
"com.xabber.android.ui.PhraseList"
android:theme=
"@style/Theme"
android:label=
"@string/events_phrases_title"
android:label=
"@string/events_phrases_title"
/>
/>
<activity
<activity
android:name=
"com.xabber.android.ui.PhraseEditor"
android:name=
"com.xabber.android.ui.PhraseEditor"
android:theme=
"@style/Theme"
/>
/>
<activity
<activity
android:name=
"com.xabber.android.ui.ReconnectionActivity"
android:name=
"com.xabber.android.ui.ReconnectionActivity"
...
@@ -205,7 +182,6 @@
...
@@ -205,7 +182,6 @@
android:noHistory=
"true"
android:noHistory=
"true"
android:stateNotNeeded=
"true"
android:stateNotNeeded=
"true"
android:excludeFromRecents=
"true"
android:excludeFromRecents=
"true"
android:theme=
"@android:style/Theme.NoDisplay"
/>
/>
<service
android:name=
"com.xabber.android.service.XabberService"
/>
<service
android:name=
"com.xabber.android.service.XabberService"
/>
<service
<service
...
...
app/src/main/res/values-v14/theme.xml
0 → 100644
View file @
a9812c9d
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
This file is part of Xabber project; you can redistribute it and/or
modify it under the terms of the GNU General Public License, Version 3.
Xabber is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
See the GNU General Public License for more details.
You should have received a copy of the GNU General Public License,
along with this program. If not, see http://www.gnu.org/licenses/.
-->
<resources>
<style
name=
"Theme"
parent=
"@android:style/Theme.DeviceDefault"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_dark
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimaryInverse
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_dark
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_dark
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_light
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_dark
</item>
</style>
<style
name=
"Theme.NoTitleBar"
parent=
"@android:style/Theme.DeviceDefault.NoActionBar"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_dark
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimaryInverse
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_dark
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_dark
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_light
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_dark
</item>
</style>
<style
name=
"Theme.Dark"
parent=
"@android:style/Theme.DeviceDefault"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_dark
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimaryInverse
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_dark
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_dark
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_dark
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_dark
</item>
</style>
<style
name=
"Theme.Dark.NoTitleBar"
parent=
"@android:style/Theme.DeviceDefault.NoActionBar"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_dark
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimaryInverse
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_dark
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_dark
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_dark
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_dark
</item>
</style>
<style
name=
"Theme.Light"
parent=
"@android:style/Theme.DeviceDefault.Light"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_light
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_light
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_light
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_light
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_light
</item>
</style>
<style
name=
"Theme.Light.NoTitleBar"
parent=
"@android:style/Theme.DeviceDefault.Light.NoActionBar"
>
<item
name=
"expanderBackground"
>
@drawable/expander_background_light
</item>
<item
name=
"expanderGroupColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderAccountColor"
>
?android:attr/textColorPrimary
</item>
<item
name=
"expanderIndicator"
>
@drawable/expander_indicator_light
</item>
<item
name=
"accountBackground"
>
@drawable/account_background
</item>
<item
name=
"titleMainBackground"
>
@drawable/title_main_background_light
</item>
<item
name=
"titleAccountBackground"
>
@drawable/title_account_background_light
</item>
<item
name=
"textColorPrimaryNoSelected"
>
@color/bright_foreground_light
</item>
</style>
</resources>
\ No newline at end of file
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