aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Related to FS#140: avatar dimensions moved from hardcoded to dimens.xmlsteckbrief2016-06-071-1/+1
|
* Related to FS#140, Logo implementation moved to FloatingActionButtonsteckbrief2016-06-071-68/+21
| | | | | - Appcompat v7 dependency added - References adjusted to work correctly with appcompat v7
* Open conference details or contact details while clicking on avatar logosteckbrief2016-05-171-4/+7
|
* avatar displayed as a circle, positioning adjusted, colors changed back to ↵steckbrief2016-05-161-51/+45
| | | | correct ones, positioning moved to own class file
* Merge branch 'master' into message_display_reworksteckbrief2016-05-131-2/+3
|\
| * XmppConnectionService.markMessage moved to MessageUtilsteckbrief2016-05-091-2/+3
| | | | | | | | XmppConnectionService.attachLocationToConversation moved to ConversationUtil
* | Merge branch 'master' into message_display_reworksteckbrief2016-04-201-47/+46
|\|
| * Related to FS#199: Removed unnecessary differentiation between a ↵steckbrief2016-04-181-1/+0
| | | | | | | | conversation with the own account
| * Merge branch 'trz/rebase' into trz/renamelookshe2016-04-171-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/services/AvatarService.java src/main/res/values-bg/strings.xml src/main/res/values-cs/strings.xml src/main/res/values-fr/strings.xml src/main/res/values-ja/strings.xml src/main/res/values-nl/strings.xml src/main/res/values-pt/strings.xml src/main/res/values-ro-rRO/strings.xml src/main/res/values-sv/strings.xml src/main/res/values-zh-rCN/strings.xml src/main/res/values/strings.xml
| * Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferencessteckbrief2016-04-061-44/+43
| |
* | basic overlay for avatar as 'logo' added to action barsteckbrief2016-04-061-0/+63
|/
* Merge branch 'trz/rebase' into trz/renamelookshe2016-04-051-5/+24
|
* Logging for FS#80 to identify calling methodlookshe2016-03-301-0/+2
|
* Merge branch 'trz/rebase' (early part) into trz/renamelookshe2016-03-201-0/+5
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-081-51/+71
|
* Merge branch 'trz/rebase' into trz/renamelookshe2016-03-061-230/+538
|
* FileBackend splitted into several util classes for separate concerns: ↵steckbrief2015-11-061-1/+2
| | | | AvatarUtil, StreamUtil, ImageUtil. Unused imports removed.
* Implements FS#26: Introduction of dialog to choose whether to resize a ↵steckbrief2015-11-031-23/+5
| | | | picture or not
* Implements FS#24: Introduce setting for picture resizingsteckbrief2015-10-301-0/+1
|
* Access to preferences moved to global utility class ↵steckbrief2015-10-211-88/+74
| | | | ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.
* Fixes FS#49: Highlight the selected conversation in liststeckbrief2015-09-021-2/+3
|
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-161-58/+59
| | | | | | Conflicts: src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
* Merge branch 'trz/rebase' into trz/renamelookshe2015-08-111-130/+302
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: build.gradle src/main/java/de/thedevstack/conversationsplus/crypto/OtrEngine.java src/main/java/de/thedevstack/conversationsplus/entities/Account.java src/main/java/de/thedevstack/conversationsplus/entities/Contact.java src/main/java/de/thedevstack/conversationsplus/entities/Downloadable.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadableFile.java src/main/java/de/thedevstack/conversationsplus/entities/DownloadablePlaceholder.java src/main/java/de/thedevstack/conversationsplus/entities/Message.java src/main/java/de/thedevstack/conversationsplus/generator/IqGenerator.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnection.java src/main/java/de/thedevstack/conversationsplus/http/HttpConnectionManager.java src/main/java/de/thedevstack/conversationsplus/parser/AbstractParser.java src/main/java/de/thedevstack/conversationsplus/parser/MessageParser.java src/main/java/de/thedevstack/conversationsplus/parser/PresenceParser.java src/main/java/de/thedevstack/conversationsplus/persistance/DatabaseBackend.java src/main/java/de/thedevstack/conversationsplus/persistance/FileBackend.java src/main/java/de/thedevstack/conversationsplus/services/NotificationService.java src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/AccountAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java src/main/java/de/thedevstack/conversationsplus/utils/UIHelper.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnection.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleConnectionManager.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleInbandTransport.java src/main/java/de/thedevstack/conversationsplus/xmpp/jingle/JingleSocks5Transport.java src/main/java/de/thedevstack/conversationsplus/xmpp/stanzas/MessagePacket.java src/main/java/eu/siacs/conversations/crypto/OtrEngine.java src/main/java/eu/siacs/conversations/crypto/OtrService.java src/main/java/eu/siacs/conversations/entities/DownloadablePlaceholder.java src/main/java/eu/siacs/conversations/entities/TransferablePlaceholder.java src/main/java/eu/siacs/conversations/http/HttpConnection.java src/main/java/eu/siacs/conversations/http/HttpDownloadConnection.java src/main/res/layout/activity_about.xml
* renaming eu.siacs.conversations to de.thedevstack.conversationsplussteckbrief2015-06-191-0/+1115
"renaming eu.siacs.conversations to de.thedevstack.conversationsplus" package renaming completed
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 23:31:49 +0000