diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e073390..e6a80fc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -59,7 +59,9 @@
-
+
diff --git a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
index 101beca..401f634 100644
--- a/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
+++ b/app/src/main/java/be/digitalia/fosdem/activities/MainActivity.java
@@ -189,9 +189,7 @@ public class MainActivity extends ActionBarActivity implements ListView.OnItemCl
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.main);
-
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
- setSupportActionBar(toolbar);
+ setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
progressBar = (ProgressBar) findViewById(R.id.progress);
diff --git a/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java b/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java
index d89bb97..fdf3b60 100644
--- a/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java
+++ b/app/src/main/java/be/digitalia/fosdem/activities/PersonInfoActivity.java
@@ -4,7 +4,10 @@ import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.support.v7.app.ActionBar;
import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
+import android.widget.TextView;
+
import be.digitalia.fosdem.R;
import be.digitalia.fosdem.fragments.PersonInfoListFragment;
import be.digitalia.fosdem.model.Person;
@@ -16,13 +19,15 @@ public class PersonInfoActivity extends ActionBarActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- setContentView(R.layout.content);
+ setContentView(R.layout.content_extended_title);
+ setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
Person person = getIntent().getParcelableExtra(EXTRA_PERSON);
ActionBar bar = getSupportActionBar();
bar.setDisplayHomeAsUpEnabled(true);
- bar.setTitle(R.string.person_info);
+ bar.setDisplayShowTitleEnabled(false);
+ ((TextView) findViewById(R.id.title)).setText(person.getName());
if (savedInstanceState == null) {
Fragment f = PersonInfoListFragment.newInstance(person);
@@ -33,9 +38,9 @@ public class PersonInfoActivity extends ActionBarActivity {
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case android.R.id.home:
- finish();
- return true;
+ case android.R.id.home:
+ finish();
+ return true;
}
return false;
}
diff --git a/app/src/main/java/be/digitalia/fosdem/fragments/PersonInfoListFragment.java b/app/src/main/java/be/digitalia/fosdem/fragments/PersonInfoListFragment.java
index 82a1f86..6c6bd65 100644
--- a/app/src/main/java/be/digitalia/fosdem/fragments/PersonInfoListFragment.java
+++ b/app/src/main/java/be/digitalia/fosdem/fragments/PersonInfoListFragment.java
@@ -13,7 +13,7 @@ import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.widget.ListView;
-import android.widget.TextView;
+
import be.digitalia.fosdem.R;
import be.digitalia.fosdem.activities.EventDetailsActivity;
import be.digitalia.fosdem.adapters.EventsAdapter;
@@ -55,10 +55,10 @@ public class PersonInfoListFragment extends SmoothListFragment implements Loader
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
- case R.id.more_info:
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(person.getUrl()));
- startActivity(intent);
- return true;
+ case R.id.more_info:
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(person.getUrl()));
+ startActivity(intent);
+ return true;
}
return false;
}
@@ -76,7 +76,6 @@ public class PersonInfoListFragment extends SmoothListFragment implements Loader
listView.setScrollBarStyle(ListView.SCROLLBARS_OUTSIDE_OVERLAY);
View headerView = LayoutInflater.from(getActivity()).inflate(R.layout.header_person_info, null);
- ((TextView) headerView.findViewById(R.id.title)).setText(person.getName());
getListView().addHeaderView(headerView, null, false);
setListAdapter(adapter);
diff --git a/app/src/main/res/layout/content_extended_title.xml b/app/src/main/res/layout/content_extended_title.xml
new file mode 100644
index 0000000..c6458ea
--- /dev/null
+++ b/app/src/main/res/layout/content_extended_title.xml
@@ -0,0 +1,43 @@
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/header_person_info.xml b/app/src/main/res/layout/header_person_info.xml
index 9ff6525..658d77a 100644
--- a/app/src/main/res/layout/header_person_info.xml
+++ b/app/src/main/res/layout/header_person_info.xml
@@ -1,21 +1,11 @@
-
-
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3e862c8..9979f16 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,6 +9,6 @@
16sp
14sp
16dp
- 6dp
+ 8dp
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 4f19fc4..c8c7870 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -102,7 +102,6 @@
- Speaker info
TALKS
More info