Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: ge0rg/yaxim
...
head fork: ge0rg/yaxim
Commits on Mar 12, 2012
@tuxmobil tuxmobil Add hint to chat window EditText widget d3b39c2
@tuxmobil tuxmobil Drop support for SDK < 5, as Service.setForeground() appears to be mi…
…ssing from 11 onwards.
31f64e4
@tuxmobil tuxmobil Preparations for themed actionBar icons
Add new plug/unplug icon for connect/deconnect,
Change show/hide offline friends into dark and light variant
71c49fa
@tuxmobil tuxmobil Regenerate icon set with new plug/unplug icons, dark/light offline fr…
…iends icons
e119803
@tuxmobil tuxmobil Remove unneeded icons for ActionBar change 15dad11
@tuxmobil tuxmobil Reorder menu options for ActionBar a89b83c
@tuxmobil tuxmobil Layout adjustments in preparation of ActionBarSherlock
Change group row background
Ajust gravity of child row text and font size
Drop custom ActionBar for MainWindow and ChatWindow activities
050c11a
@tuxmobil tuxmobil Remove unneeded colors.xml for custom ActionBar 88a10df
@tuxmobil tuxmobil Add strings for theme selection in preferences 783c1e3
@tuxmobil tuxmobil Add theme preference setting 08b46df
@tuxmobil tuxmobil Repair spinner widget appearance 834e475
@tuxmobil tuxmobil Create custom themes for dark/light a23fc5e
@tuxmobil tuxmobil Switch to ActionBarSherlock (needs to be imported as library project) 443e696
@tuxmobil tuxmobil Manifest: Build against SDK 14, minSDK to 5 c847d3a
@tuxmobil tuxmobil Action.SEND listener re-added cff1f59
Commits on Mar 13, 2012
@tuxmobil tuxmobil Fix ActionBarSherlock MenuItem imports
Option Menu (as used in the ActionBar) needs the MenuItem import from
ActionBarSherlock, the conext menu however needs the android.view.MenuItem,
otherwise onContextItemSelected does not work.
29b954c
Commits on Mar 14, 2012
@tuxmobil tuxmobil Add padding to dialogs, use View.GONE to avoid empty space 4c09403
Commits on Mar 17, 2012
@tuxmobil tuxmobil Use onStartCommand() in service instead of deprecated onStart()
This should guarantee that the service is always restarted.
a1807b9
Commits on Mar 18, 2012
@tuxmobil tuxmobil Replace plug/unplug icons with a new design, rendered for 2.x menu op…
…tions
5649eb5
@tuxmobil tuxmobil Remove connect/disconnect from action bar, use 2.x menu icons 83983b4
@tuxmobil tuxmobil Redo group row background as 9-patch, makes display of list selector …
…easier
af9e25c
Commits on Mar 20, 2012
@tuxmobil tuxmobil Restore indeterminate ProgressBar in action bar 267f05c
@tuxmobil tuxmobil Retrieve current editTextColor for JID coloring in first start and ac…
…count prefs dialogs
3c9fb94
@ge0rg Add ABS submodule, update target 67f91d8
@ge0rg add minimal ABS support to proguard.cfg 1b552af
@tuxmobil tuxmobil Pre-Honeycomb: Retrieve current editTextColor for JID coloring in fir…
…st start and account prefs dialogs
6a4e94f
@tuxmobil tuxmobil Change icon in chat window to app icon with "up" indicator da85414
Commits on Mar 21, 2012
@tuxmobil tuxmobil Accountprefs: EditText color, use default font size 135d466
Commits on Mar 22, 2012
@ge0rg move accout settings into preferences 930d691
@ge0rg lookup edittext color in XMPPHelper 04f43f5
@ge0rg implement priority in status dialog 403de99
@tuxmobil tuxmobil Add font size preference for chat window 0c1464a
Commits on Mar 23, 2012
@ge0rg finally delete remains of old actionbar 18dce9a
@ge0rg implement imto://jabber/ intent filter and handler 6e40479
Commits on Mar 24, 2012
@ge0rg chat window: implement roster update listener e45e330
@ge0rg chat: use custom title view for status icon f387d70
Commits on Mar 26, 2012
@jan-kiszka jan-kiszka Remove unused variables and imports
And another chunk of warnings gets eliminated.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
17d32f6
@jan-kiszka jan-kiszka Initiate reconnect on XMPPConnection drops
If Smackable reports a disconnectOnError, forward this to the registered
XMPPServiceCallback and a postConnectionFailed from callback that our
XMPPService provides. This ensures that we do not end up stuck in
offline state even if the user wishes to reconnect.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
9612c2e
@jan-kiszka jan-kiszka Fix export-icons script
Paths were broken after f26f0b9.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
65588ab
@ge0rg fix build.xml for SDK r17 acb78b1
Commits on Mar 29, 2012
@ge0rg use theme colors in chat 3acfa03
@ge0rg move yaxim config into app context (singleton) a7fe8e0
@tuxmobil tuxmobil centralize theme setting in activities b79d13e
@ge0rg theme roster error view 035ac03
@jan-kiszka jan-kiszka Replace ... with ellipse code
Eliminates warnings.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
361d7aa
@jan-kiszka jan-kiszka Replace (c) with copyright code
Eliminates warnings.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
ceda075
Commits on Mar 30, 2012
@jan-kiszka jan-kiszka Add speech bubble as status bar notification icon
The bubble was derived from the status icons.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
b702826
@jan-kiszka jan-kiszka Signal unread messages in roster view
If some contact has unread messages pending, tag the roster entry with a
speech bubble.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
7e68050
@jan-kiszka jan-kiszka Add new string resources for status bar ticker rework
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
eacbac9
@jan-kiszka jan-kiszka Rework ticker text on new message notifications
There are privacy concerns regarding the ticker text of incoming
messages. Ticker texts are readable even without unlocking the device.

So far we show the sender name, other apps also provide a preview on the
message content. Being consequent, we shouldn't show either if the user
prefers privacy over the preview.

This introduces a configuration options for this. If it's enables, which
is the default, both the sender's name and the first line of the message
is shown in the ticker.

Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
3e918fd
@jan-kiszka jan-kiszka Remove unused imports
Signed-off-by: Jan Kiszka <jan.kiszka@web.de>
e213880
Commits on Apr 01, 2012
@ge0rg translation import, typo fix 4df8c64
@ge0rg ABS4 requires minSdk 7 519398d