Merge branch 'myfeature'

This commit is contained in:
Juan Miguel Boyero Corral 2010-11-05 08:07:00 +01:00
commit 5419faa8ca
6 changed files with 34 additions and 16 deletions

1
.gitignore vendored
View File

@ -4,3 +4,4 @@ SWADroid/default.properties
SWADroid/.classpath
SWADroid/.project
SWADroid/.settings/

View File

@ -1,17 +1,17 @@
# SWADroid
Android client for e-learning platform SWAD.
Android client for e-learning platform SWAD. This project is currently under heavy development.
## Content
SWADroid/ Android client.
SWADroid/ Android client.
/LICENSE License file.
/gen/ Files autogenerated by IDE.
/libs/ Libraries required by SWADroid.
/res/ Resources required by SWADroid.
/src/ Source files.
Webservices/ Webservices implemented in SWAD server.
Webservices/ Webservices implemented in SWAD server.
/LICENSE License file.
HISTORY.md Changelog file in GitHub markdown format.
README.md This file in GitHub markdown format.
@ -27,6 +27,8 @@ it under the same terms as [GPLv3][gplv3] license.
[![Copyright and License](http://www.gnu.org/graphics/agplv3-88x31.png)][agplv3] SWADroid Webservices is free software; you can redistribute it and/or modify
it under the same terms as [AGPLv3][agplv3] license.
[![Copyright and License](http://web.mit.edu/facts/img/mitlogo.gif)][mit] SWADroid uses [ksoap2-android][ksoap2-library] library developed by [Manfred Moser][ksoap2-author]. [ksoap2-android][ksoap2-library] library is licensed under [MIT][mit].
## Contributing
@ -44,5 +46,8 @@ The Github team has also been kind enough to write up some great [documentation]
[gplv3]: http://www.gnu.org/licenses/gpl.html
[agplv3]: http://www.gnu.org/licenses/agpl.html
[mit]: http://www.opensource.org/licenses/mit-license.php
[doc_contrib]: http://help.github.com/pull-requests/
[topic_br]: http://progit.org/book/ch3-4.html
[ksoap2-library]: http://code.google.com/p/ksoap2-android
[ksoap2-author]: https://github.com/mosabua

View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="es.ugr.swad.swadroid"
android:versionCode="1" android:versionName="0.1">
android:versionCode="1" android:versionName="0.1" android:installLocation="auto">
<application>
<activity android:name=".SWADMain"
android:label="@string/app_name"

View File

@ -12,13 +12,15 @@ public final class R {
}
public static final class drawable {
public static final int erroricon=0x7f020000;
public static final int swadroid=0x7f020001;
public static final int mainbackground=0x7f020001;
public static final int swadroid=0x7f020002;
}
public static final class id {
public static final int functionsList=0x7f070000;
public static final int functions_menu=0x7f070001;
public static final int login_menu=0x7f070002;
public static final int preferences_menu=0x7f070003;
public static final int functionsList=0x7f070001;
public static final int functions_menu=0x7f070002;
public static final int login_menu=0x7f070003;
public static final int preferences_menu=0x7f070004;
public static final int test=0x7f070000;
}
public static final class layout {
public static final int main=0x7f030000;

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

View File

@ -1,10 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ListView android:layout_width="fill_parent"
android:id="@+id/functionsList"
android:layout_height="wrap_content"
android:layout_weight="1" />
</LinearLayout>
android:layout_height="fill_parent"
android:background="#ffffff">
<ImageView
android:id="@+id/test"
android:src="@drawable/mainbackground"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
/>
<ListView
android:id="@+id/functionsList"
android:layout_width="fill_parent"
android:layout_height="wrap_content" />
</RelativeLayout>