From f4bc65dae13d66735d66892e2e584418f73b43b5 Mon Sep 17 00:00:00 2001 From: stom79 Date: Mon, 30 Oct 2017 17:58:47 +0100 Subject: [PATCH] Same action bar --- .../fr/gouv/etalab/mastodon/activities/EditProfileActivity.java | 2 +- .../gouv/etalab/mastodon/activities/RemoteFollowActivity.java | 2 +- .../{profileedition_action_bar.xml => simple_action_bar.xml} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename app/src/main/res/layout/{profileedition_action_bar.xml => simple_action_bar.xml} (100%) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java index 49b4203af..8a4669424 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/EditProfileActivity.java @@ -111,7 +111,7 @@ public class EditProfileActivity extends AppCompatActivity implements OnRetrieve if( actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(android.content.Context.LAYOUT_INFLATER_SERVICE); assert inflater != null; - @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.profileedition_action_bar, null); + @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_action_bar, null); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java index 8b351f559..9632576a5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java @@ -128,7 +128,7 @@ public class RemoteFollowActivity extends AppCompatActivity implements OnRetriev if( actionBar != null) { LayoutInflater inflater = (LayoutInflater) this.getSystemService(android.content.Context.LAYOUT_INFLATER_SERVICE); assert inflater != null; - @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.conversation_action_bar, null); + @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.simple_action_bar, null); actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT)); actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM); TextView title = actionBar.getCustomView().findViewById(R.id.toolbar_title); diff --git a/app/src/main/res/layout/profileedition_action_bar.xml b/app/src/main/res/layout/simple_action_bar.xml similarity index 100% rename from app/src/main/res/layout/profileedition_action_bar.xml rename to app/src/main/res/layout/simple_action_bar.xml