Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Removes improvements which are not related to this branch

This commit is contained in:
stom79 2017-10-24 16:02:21 +02:00
parent 41eaabf517
commit 7112b45dfc
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java
View File

@ -179,9 +179,7 @@ public abstract class BaseMainActivity extends AppCompatActivity
Helper.fillMapEmoji(getApplicationContext());
//Here, the user is authenticated
Toolbar toolbar = findViewById(R.id.toolbar);
Toolbar toolbarBottom = findViewById(R.id.toolbarBottom);
setSupportActionBar(toolbar);
setSupportActionBar(toolbarBottom);
toolbarTitle = toolbar.findViewById(R.id.toolbar_title);
toolbar_search = toolbar.findViewById(R.id.toolbar_search);
tabLayout = findViewById(R.id.tabLayout);

10
app/src/main/res/layout/activity_main.xml
View File

@ -39,7 +39,6 @@
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
app:layout_scrollFlags="scroll|enterAlways"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/AppThemeDark_NoActionBar"
@ -111,15 +110,6 @@
tools:context="fr.gouv.etalab.mastodon.activities.MainActivity"
>
</RelativeLayout>
<android.support.v7.widget.Toolbar
app:layout_scrollFlags="scroll|enterAlways"
android:id="@+id/toolbarBottom"
android:layout_gravity="bottom"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:theme="@style/AppThemeDark_NoActionBar"
app:popupTheme="?attr/popupOverlay"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/toot"