From 444e37a3fea5c213653da2f9bcda906d1fd7a97d Mon Sep 17 00:00:00 2001
From: Marius Gavrilescu <marius@ieval.ro>
Date: Wed, 29 May 2013 14:24:07 +0300
Subject: [PATCH] Various cleanups

---
 AndroidManifest.xml                        | 1 -
 res/layout/addevent.xml                    | 4 ++--
 res/layout/eventview.xml                   | 8 --------
 res/layout/login.xml                       | 7 +++----
 res/menu/options.xml                       | 6 +++---
 src/com/google/gson/FieldNamingPolicy.java | 5 +++--
 src/ro/ieval/unical/Attendee.java          | 1 -
 src/ro/ieval/unical/addEventActivity.java  | 1 -
 8 files changed, 11 insertions(+), 22 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 9a8ab72..b5b6a8c 100644
--- 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"/>
-        <activity android:name="com.facebook.LoginActivity"></activity>
         <activity android:name="loginActivity">
         </activity>
         <activity android:name=".addEventActivity"></activity>
diff --git a/res/layout/addevent.xml b/res/layout/addevent.xml
index 8c166e5..0e57abc 100644
--- a/res/layout/addevent.xml
+++ b/res/layout/addevent.xml
@@ -12,7 +12,7 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:orientation="vertical" >
 
             <LinearLayout
@@ -60,7 +60,7 @@
 
                 <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" />
diff --git a/res/layout/eventview.xml b/res/layout/eventview.xml
index 73fb2d2..b8f7713 100644
--- a/res/layout/eventview.xml
+++ b/res/layout/eventview.xml
@@ -31,13 +31,6 @@
         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" >
@@ -53,7 +46,6 @@
             android:id="@+id/location"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="Medium Text"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
     </LinearLayout>
diff --git a/res/layout/login.xml b/res/layout/login.xml
index 664ba30..c04cf76 100644
--- a/res/layout/login.xml
+++ b/res/layout/login.xml
@@ -14,8 +14,7 @@
 
     <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"
@@ -26,7 +25,7 @@
 
         <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" />
@@ -45,7 +44,7 @@
 
         <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"
diff --git a/res/menu/options.xml b/res/menu/options.xml
index 974e391..6060d5a 100644
--- 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" >
-    <item android:id="@+id/NewEvent" android:title="New Event" 
+    <item android:id="@+id/NewEvent" android:title="New event" 
         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>
+        android:titleCondensed="DELETE" android:title="Delete event"></item>
     
 
 </menu>
diff --git a/src/com/google/gson/FieldNamingPolicy.java b/src/com/google/gson/FieldNamingPolicy.java
index 21863f9..6b4c72c 100644
--- 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;
+import java.util.Locale;
 
 /**
  * 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) {
-      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) {
-      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 6afeaf4..6097e7c 100644
--- 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.provider.CalendarContract.Events;
 
 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 d9b04e9..47b48c9 100644
--- 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;
-import android.R.string;
 import android.app.Activity;
 import android.os.Bundle;
 import android.widget.Spinner;
-- 
2.30.2