Commit efccfef6 authored by Thomas Krex's avatar Thomas Krex

insert new drawer icon

parent c58bb4bf
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -2,48 +2,54 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="5" >
android:background="@color/abs__background_holo_light"
android:orientation="vertical" >
<ViewStub
<TextView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:text="Please Enter the Name and the Url of the Lecture-Feed you want to add."
android:textSize="18sp" >
</TextView>
<EditText
android:id="@+id/tx_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginBottom="20dp"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:layout_marginTop="10dp"
android:background="@android:color/white"
android:ems="10"
android:hint="Name"
android:singleLine="true" />
<ViewStub
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
android:singleLine="true"
android:textColor="@android:color/black" />
<EditText
android:id="@+id/tx_url"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_marginLeft="5dp"
android:layout_marginRight="5dp"
android:background="@android:color/white"
android:ems="10"
android:hint="Url"
android:inputType="textUri"
android:singleLine="true" >
android:singleLine="true"
android:textColor="@android:color/black" >
</EditText>
<Button
android:id="@+id/button_paste"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/paste_url" />
<ViewStub
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1" />
android:layout_marginLeft="5dp"
android:layout_marginTop="10dp"
android:background="@color/light_gray"
android:text="@string/paste_url"
android:textSize="18sp" />
</LinearLayout>
\ No newline at end of file
......@@ -2,6 +2,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/abs__background_holo_light"
android:orientation="vertical" >
<TextView
......@@ -18,6 +19,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:calendarViewShown="false" />
</LinearLayout>
\ No newline at end of file
......@@ -83,7 +83,7 @@ public class FeedActivity extends SherlockActivity implements
// addDialog.show();
Intent intent = new Intent(this, FeedWizardActivity.class);
startActivity(intent);
startActivityForResult(intent, 0);
}
......
......@@ -172,8 +172,9 @@ public class FeedDetailActivity extends SherlockActivity implements
// manager.deleteTable();
Cursor cursor = manager.getAllFromDB(feed.getId());
adapter = new SimpleCursorAdapter(this, R.layout.fragment_feed_list_items,
cursor, new String[] { FeedItemDbManager.COLUMN_TITLE,
adapter = new SimpleCursorAdapter(this,
R.layout.fragment_feed_list_items, cursor, new String[] {
FeedItemDbManager.COLUMN_TITLE,
FeedItemDbManager.COLUMN_STATUS,
FeedItemDbManager.COLUMN_DATE }, new int[] {
R.id.itemTitle, R.id.statusIcon, R.id.listHeader });
......
......@@ -27,6 +27,7 @@ public class FeedWizardActivity extends SherlockFragmentActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_feed_wizard);
setTitle("Adding new Feed");
container = (FrameLayout) findViewById(R.id.fragmentContainer);
firstFragment = new FeedWizardFirstFragement();
......
......@@ -18,9 +18,9 @@ import de.tum.in.tttclient.R;
*
*/
public class MainActivity extends SherlockActivity {
private FeedbackDialog feedBack;
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -37,21 +37,21 @@ public class MainActivity extends SherlockActivity {
}
});
Button feedbackButton = (Button) findViewById(R.id.feedback_button);
feedbackButton.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
feedBack.show();
}
});
}
@Override
protected void onPause() {
super.onPause();
feedBack.dismiss();
super.onPause();
feedBack.dismiss();
}
}
......@@ -85,7 +85,7 @@ public class PlayerActivity extends SherlockFragmentActivity implements
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
mDrawerToggle = new ActionBarSherlockDrawerToggle(this, /* host Activity */
mDrawerLayout, /* DrawerLayout object */
R.drawable.ttt24, /* nav drawer icon to replace 'Up' caret */
R.drawable.ic_drawer, /* nav drawer icon to replace 'Up' caret */
R.string.drawer_open, /* "open drawer" description */
R.string.drawer_close /* "close drawer" description */
);
......
......@@ -14,6 +14,7 @@ import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
import android.view.View;
import android.view.ViewGroup.LayoutParams;
import android.widget.ImageButton;
import android.widget.LinearLayout;
......@@ -52,8 +53,8 @@ public class IndexEntry extends ImageButton {
this.setBackgroundColor(Color.LTGRAY);
this.setLayoutParams(new LinearLayout.LayoutParams(
LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.WRAP_CONTENT));
LayoutParams.MATCH_PARENT,
LayoutParams.WRAP_CONTENT));
setScaleType(ScaleType.CENTER_INSIDE);
// needed to get correct height
......
package tttclient.models;
import java.util.Date;
import android.os.Parcel;
import android.os.Parcelable;
......
......@@ -4,8 +4,6 @@ import java.util.Date;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import android.util.Log;
public class Utils {
public static Date stringToDate(String string){
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment