projects
/
unical.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
f3ad474
)
Various cleanups
author
Marius Gavrilescu
<marius@ieval.ro>
Wed, 29 May 2013 11:24:07 +0000
(14:24 +0300)
committer
Marius Gavrilescu
<marius@ieval.ro>
Wed, 29 May 2013 11:24:07 +0000
(14:24 +0300)
AndroidManifest.xml
patch
|
blob
|
blame
|
history
res/layout/addevent.xml
patch
|
blob
|
blame
|
history
res/layout/eventview.xml
patch
|
blob
|
blame
|
history
res/layout/login.xml
patch
|
blob
|
blame
|
history
res/menu/options.xml
patch
|
blob
|
blame
|
history
src/com/google/gson/FieldNamingPolicy.java
patch
|
blob
|
blame
|
history
src/ro/ieval/unical/Attendee.java
patch
|
blob
|
blame
|
history
src/ro/ieval/unical/addEventActivity.java
patch
|
blob
|
blame
|
history
diff --git
a/AndroidManifest.xml
b/AndroidManifest.xml
index 9a8ab728606d4f7ee62d0ea3e7fc662a11e1c3d7..b5b6a8cda89d4ee8e87c04bdfd657d4eb7cd991c 100644
(file)
--- a/
AndroidManifest.xml
+++ b/
AndroidManifest.xml
@@
-22,7
+22,6
@@
</intent-filter>
</activity>
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/app_id"/>
</intent-filter>
</activity>
<meta-data android:name="com.facebook.sdk.ApplicationId" android:value="@string/app_id"/>
- <activity android:name="com.facebook.LoginActivity"></activity>
<activity android:name="loginActivity">
</activity>
<activity android:name=".addEventActivity"></activity>
<activity android:name="loginActivity">
</activity>
<activity android:name=".addEventActivity"></activity>
diff --git
a/res/layout/addevent.xml
b/res/layout/addevent.xml
index 8c166e5b72046e6d75dfa5aaba8998a12b915505..0e57abc89aa16c7c3b3706edeaf36ded52144ecb 100644
(file)
--- a/
res/layout/addevent.xml
+++ b/
res/layout/addevent.xml
@@
-12,7
+12,7
@@
<LinearLayout
android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="
match_par
ent"
+ android:layout_height="
wrap_cont
ent"
android:orientation="vertical" >
<LinearLayout
android:orientation="vertical" >
<LinearLayout
@@
-60,7
+60,7
@@
<CheckBox
android:id="@+id/checkBox1"
<CheckBox
android:id="@+id/checkBox1"
- android:layout_width="
wrap_content
"
+ android:layout_width="
0dip
"
android:layout_height="wrap_content"
android:layout_weight="2.13"
android:text="@string/repeatlabel" />
android:layout_height="wrap_content"
android:layout_weight="2.13"
android:text="@string/repeatlabel" />
diff --git
a/res/layout/eventview.xml
b/res/layout/eventview.xml
index 73fb2d2b97cd00ae1e32d16b96c5ab7eac9ebe7b..b8f77135e3c481e31128812f889ca9f172939594 100644
(file)
--- a/
res/layout/eventview.xml
+++ b/
res/layout/eventview.xml
@@
-31,13
+31,6
@@
android:text="@string/descriptionlabel"
android:textAppearance="?android:attr/textAppearanceMedium" />
android:text="@string/descriptionlabel"
android:textAppearance="?android:attr/textAppearanceMedium" />
- <TextView
- android:id="@+id/description"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Small Text"
- android:textAppearance="?android:attr/textAppearanceSmall" />
-
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" >
@@
-53,7
+46,6
@@
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="Medium Text"
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
android:textAppearance="?android:attr/textAppearanceMedium" />
</LinearLayout>
diff --git
a/res/layout/login.xml
b/res/layout/login.xml
index 664ba30891010a9fa5aead2764197f609e9e5641..c04cf763bf108ec860c16a3c9636c923a6b591c6 100644
(file)
--- a/
res/layout/login.xml
+++ b/
res/layout/login.xml
@@
-14,8
+14,7
@@
<LinearLayout
android:layout_width="match_parent"
<LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_weight="0.00" >
+ android:layout_height="wrap_content">
<TextView
android:id="@+id/location"
<TextView
android:id="@+id/location"
@@
-26,7
+25,7
@@
<EditText
android:id="@+id/editText1"
<EditText
android:id="@+id/editText1"
- android:layout_width="
wrap_content
"
+ android:layout_width="
0dip
"
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10" />
android:layout_height="wrap_content"
android:layout_weight="1"
android:ems="10" />
@@
-45,7
+44,7
@@
<EditText
android:id="@+id/editText2"
<EditText
android:id="@+id/editText2"
- android:layout_width="
wrap_content
"
+ android:layout_width="
0dip
"
android:layout_height="wrap_content"
android:layout_weight="0.62"
android:ems="10"
android:layout_height="wrap_content"
android:layout_weight="0.62"
android:ems="10"
diff --git
a/res/menu/options.xml
b/res/menu/options.xml
index 974e391cf235307ab1c69be079b30c59b23e032f..6060d5ac4c1d278ccff3bc240453e8384f865fe5 100644
(file)
--- a/
res/menu/options.xml
+++ b/
res/menu/options.xml
@@
-1,14
+1,14
@@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
- <item android:id="@+id/NewEvent" android:title="New
E
vent"
+ <item android:id="@+id/NewEvent" android:title="New
e
vent"
android:visible="true" android:showAsAction="always"
android:icon="@android:drawable/ic_menu_add"
android:visible="true" android:showAsAction="always"
android:icon="@android:drawable/ic_menu_add"
- >
+
android:titleCondensed="NEW"
>
</item>
<item android:id="@+id/deleteevent"
android:icon="@android:drawable/ic_menu_delete"
</item>
<item android:id="@+id/deleteevent"
android:icon="@android:drawable/ic_menu_delete"
- ></item>
+
android:titleCondensed="DELETE" android:title="Delete event"
></item>
</menu>
</menu>
diff --git
a/src/com/google/gson/FieldNamingPolicy.java
b/src/com/google/gson/FieldNamingPolicy.java
index 21863f9c57f561288dc6afc7e7cf81b677676ac6..6b4c72ca7bd281feec7242380639011effc73fed 100644
(file)
--- a/
src/com/google/gson/FieldNamingPolicy.java
+++ b/
src/com/google/gson/FieldNamingPolicy.java
@@
-17,6
+17,7
@@
package com.google.gson;
import java.lang.reflect.Field;
package com.google.gson;
import java.lang.reflect.Field;
+import java.util.Locale;
/**
* An enumeration that defines a few standard naming conventions for JSON field names.
/**
* An enumeration that defines a few standard naming conventions for JSON field names.
@@
-88,7
+89,7
@@
public enum FieldNamingPolicy implements FieldNamingStrategy {
*/
LOWER_CASE_WITH_UNDERSCORES() {
public String translateName(Field f) {
*/
LOWER_CASE_WITH_UNDERSCORES() {
public String translateName(Field f) {
- return separateCamelCase(f.getName(), "_").toLowerCase();
+ return separateCamelCase(f.getName(), "_").toLowerCase(
Locale.ENGLISH
);
}
},
}
},
@@
-111,7
+112,7
@@
public enum FieldNamingPolicy implements FieldNamingStrategy {
*/
LOWER_CASE_WITH_DASHES() {
public String translateName(Field f) {
*/
LOWER_CASE_WITH_DASHES() {
public String translateName(Field f) {
- return separateCamelCase(f.getName(), "-").toLowerCase();
+ return separateCamelCase(f.getName(), "-").toLowerCase(
Locale.ENGLISH
);
}
};
}
};
diff --git
a/src/ro/ieval/unical/Attendee.java
b/src/ro/ieval/unical/Attendee.java
index 6afeaf43e12d558484c11230aacfb63a8af88851..6097e7c35e7da051c73ecc81929e4abb561cf5e7 100644
(file)
--- a/
src/ro/ieval/unical/Attendee.java
+++ b/
src/ro/ieval/unical/Attendee.java
@@
-5,7
+5,6
@@
import android.content.Context;
import android.database.Cursor;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
import android.database.Cursor;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
-import android.provider.CalendarContract.Events;
final class Attendee {
private static final String[] PROJECTION = {
final class Attendee {
private static final String[] PROJECTION = {
diff --git
a/src/ro/ieval/unical/addEventActivity.java
b/src/ro/ieval/unical/addEventActivity.java
index d9b04e9bbf833521c170c8d1e8cfcdfd5092a85c..47b48c9cc97caf2ed036cdad0dc34a539d2a4f94 100644
(file)
--- a/
src/ro/ieval/unical/addEventActivity.java
+++ b/
src/ro/ieval/unical/addEventActivity.java
@@
-1,6
+1,5
@@
package ro.ieval.unical;
import ro.ieval.unical.R;
package ro.ieval.unical;
import ro.ieval.unical.R;
-import android.R.string;
import android.app.Activity;
import android.os.Bundle;
import android.widget.Spinner;
import android.app.Activity;
import android.os.Bundle;
import android.widget.Spinner;
This page took
0.015476 seconds
and
4
git commands to generate.