Skip to content

Commit

Permalink
stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
jpblanco committed Nov 11, 2011
1 parent b465036 commit 903b177
Show file tree
Hide file tree
Showing 17 changed files with 123 additions and 53 deletions.
104 changes: 61 additions & 43 deletions RubyConfTalks/.idea/workspace.xml

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion RubyConfTalks/gen/com/mooveit/rubyconftalks/R.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -23,11 +23,15 @@ public static final class drawable {
public static final int icon=0x7f020009; public static final int icon=0x7f020009;
} }
public static final class id { public static final class id {
public static final int time=0x7f050000; public static final int name=0x7f050002;
public static final int talk=0x7f050000;
public static final int talks=0x7f050003;
public static final int time=0x7f050001;
} }
public static final class layout { public static final class layout {
public static final int main=0x7f030000; public static final int main=0x7f030000;
public static final int talk=0x7f030001; public static final int talk=0x7f030001;
public static final int talk_list=0x7f030002;
} }
public static final class string { public static final class string {
public static final int app_name=0x7f040000; public static final int app_name=0x7f040000;
Expand Down
Binary file modified RubyConfTalks/out/production/RubyConfTalks/RubyConfTalks.apk
Binary file not shown.
Binary file modified RubyConfTalks/out/production/RubyConfTalks/RubyConfTalks.apk.res
Binary file not shown.
Binary file not shown.
Binary file modified RubyConfTalks/out/production/RubyConfTalks/classes.dex
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
16 changes: 13 additions & 3 deletions RubyConfTalks/res/layout/talk.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -4,12 +4,22 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:id="@+id/talk"
android:padding="6dip"
> >
<TextView <TextView
android:id="@+id/time" android:id="@+id/time"
android:layout_width="fill_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="fill_parent"

android:textSize="35dip" >
</TextView> </TextView>
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:gravity="center_vertical"
android:textSize="15dip"
android:paddingLeft="10dip" >
</TextView>


</LinearLayout> </LinearLayout>
9 changes: 9 additions & 0 deletions RubyConfTalks/res/layout/talk_list.xml
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
<ListView android:id="@+id/talks"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
</ListView>
</LinearLayout>
7 changes: 7 additions & 0 deletions RubyConfTalks/src/com/mooveit/rubyconftalks/Friday.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@


import android.app.Activity; import android.app.Activity;
import android.os.Bundle; import android.os.Bundle;
import android.widget.ListView;


import java.util.ArrayList; import java.util.ArrayList;
import java.util.Date; import java.util.Date;
Expand All @@ -11,11 +12,17 @@ public class Friday extends Activity {
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);


setContentView(R.layout.talk_list);

List<Talk> talks = new ArrayList<Talk>(); List<Talk> talks = new ArrayList<Talk>();


talks.add(new Talk(new Date(2011,11,11,9,0),new Date(2011,11,11,9,45),"lala")); talks.add(new Talk(new Date(2011,11,11,9,0),new Date(2011,11,11,9,45),"lala"));
talks.add(new Talk(new Date(2011,11,11,9,45),new Date(2011,11,11,10,45),"lala2")); talks.add(new Talk(new Date(2011,11,11,9,45),new Date(2011,11,11,10,45),"lala2"));


ListView talks_list = (ListView) findViewById(R.id.talks);
talks_list.setAdapter(new TalkListAdapter(this, R.layout.talk, talks));






} }
Expand Down
34 changes: 28 additions & 6 deletions RubyConfTalks/src/com/mooveit/rubyconftalks/TalkListAdapter.java
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -5,10 +5,14 @@
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;


import java.util.Date;
import java.util.List; import java.util.List;


import static android.graphics.Color.parseColor;

public class TalkListAdapter extends ArrayAdapter<Talk> { public class TalkListAdapter extends ArrayAdapter<Talk> {
final Activity context; final Activity context;


Expand All @@ -26,13 +30,31 @@ public View getView(int position, View convertView, ViewGroup parent){
LayoutInflater vi = (LayoutInflater) LayoutInflater.from(context); LayoutInflater vi = (LayoutInflater) LayoutInflater.from(context);
View view = vi.inflate(R.layout.talk, null, true); View view = vi.inflate(R.layout.talk, null, true);


Talk issue = talks.get(position); Talk talk = talks.get(position);



Date now = new Date(2011,11,11,9,20);

if(now.after(talk.getStart()) && now.before(talk.getEnd())){
LinearLayout talkLayout = (LinearLayout) view.findViewById(R.id.talk);
talkLayout.setBackgroundColor(parseColor("#aaaa00"));
}

TextView date = (TextView) view.findViewById(R.id.time);
String minutes = "";
if (talk.getStart().getMinutes() < 10){
minutes = "0" + talk.getStart().getMinutes();
}
else{
minutes = talk.getStart().getMinutes() + "";
}
date.setText(talk.getStart().getHours() + ":" + minutes);
//date.setText(talk.getStart().toLocaleString());



// TextView issueKeyTextView = (TextView) view.findViewById(R.id.issue_key); TextView name = (TextView) view.findViewById(R.id.name);
// issueKeyTextView.setText(issue.getKey()); name.setText(talk.getName());
//
// TextView issueSummaryTextView = (TextView) view.findViewById(R.id.issue_summary);
// issueSummaryTextView.setText(issue.getSummary());


return view; return view;
} }
Expand Down

0 comments on commit 903b177

Please sign in to comment.