nilsnh/uib-events
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'addedButton'

Browse source 
Conflicts:
	app/src/main/res/layout/fragment_detail.xml
This commit is contained in:
Nils Norman Haukås 2015-04-21 19:41:07 +02:00
parent cae8e25922 cfb15cbb66
commit d969f1db1f
3 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/src/main/java/no/nilsnh/uibevents/DetailFragment.java
View file

@ -31,6 +31,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.ImageView;
import android.widget.TextView;
@ -62,6 +63,7 @@ public class DetailFragment extends Fragment implements LoaderManager.LoaderCall
private TextView detailView;
private TextView dateFromView;
private TextView dateToView;
private Button eventUrlButton;
public DetailFragment() {
setHasOptionsMenu(true);
@ -81,6 +83,7 @@ public class DetailFragment extends Fragment implements LoaderManager.LoaderCall
detailView = (TextView) rootView.findViewById(R.id.list_item_details_textview);
dateFromView = (TextView) rootView.findViewById(R.id.list_item_date_from_textview);
dateToView = (TextView) rootView.findViewById(R.id.list_item_date_to_textview);
eventUrlButton = (Button) rootView.findViewById(R.id.event_url_button);
return rootView;
}
@ -113,13 +116,20 @@ public class DetailFragment extends Fragment implements LoaderManager.LoaderCall
}
@Override
public void onLoadFinished(Loader<Cursor> loader, Cursor data) {
public void onLoadFinished(Loader<Cursor> loader, final Cursor data) {
if (data != null && data.moveToFirst()) {
titleView.setText(data.getString(COL_EVENT_TITLE));
categoryView.setText(data.getString(COL_EVENT_TYPE));
detailView.setText(Utility.parseDetailsText(data.getString(COL_EVENT_DETAILS)));
dateFromView.setText(Utility.getFriendLyDate(data.getString(COL_EVENT_DATE_FROM)));
dateToView.setText(Utility.getFriendLyDate(data.getString(COL_EVENT_DATE_TO)));
eventUrlButton.setOnClickListener(new View.OnClickListener() {
public void onClick(View v) {
Intent intent = new Intent(Intent.ACTION_VIEW).setData(Uri.parse("http://www.uib.no/" + data.getString(COL_EVENT_URL)));
startActivity(intent);
}
});
}
}

34
app/src/main/res/layout/fragment_detail.xml
View file

@ -8,6 +8,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:id="@+id/list_item_title_textview"
android:text="@string/list_item_title_textview"
android:padding="10dp" />
<LinearLayout
@ -17,13 +18,29 @@
android:weightSum="1"
android:gravity="fill_horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/list_item_details_textview"
android:paddingLeft="10dp"
android:layout_weight="1" />
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/list_item_details_textview"
android:text="@string/list_item_details_textview"
android:paddingLeft="10dp" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/event_url_button"
android:id="@+id/event_url_button"
android:layout_gravity="right"
android:padding="10dp" />
</LinearLayout>
<LinearLayout
android:orientation="vertical"
@ -36,6 +53,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/list_item_category_textview"
android:id="@+id/list_item_category_textview" />
<TextView
@ -43,6 +61,7 @@
android:layout_height="match_parent"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/list_item_date_from_textview"
android:text="@string/list_item_date_from_textview"
android:padding="10dp"
android:gravity="center_vertical|right" />
@ -51,6 +70,7 @@
android:layout_height="match_parent"
android:textAppearance="?android:attr/textAppearanceMedium"
android:id="@+id/list_item_date_to_textview"
android:text="@string/list_item_date_to_textview"
android:padding="10dp"
android:gravity="center_vertical|right" />

1
app/src/main/res/values/strings.xml
View file

@ -11,4 +11,5 @@
<string name="sync_account_type">uibevents.nilsnh.no</string>
<string name="list_item_details_textview">Studentteateret immaturus inviterer til jubileumsforestillingen \\\"Alice i Eventyrland\\\", med premiere 11. April.</string>
<string name="title_activity_detail">UiB event details</string>
<string name="event_url_button">Åpne event i nettleser</string>
</resources>