diff --git a/app/build.gradle b/app/build.gradle index d606f1ce..3f6b5633 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -42,4 +42,7 @@ dependencies { } compile 'com.github.chrisbanes:PhotoView:1.3.1' compile 'com.mikepenz:google-material-typeface:3.0.1.0.original@aar' + compile 'com.github.arimorty:floatingsearchview:2.0.3' + compile 'org.parceler:parceler-api:1.1.6' + annotationProcessor 'org.parceler:parceler:1.1.6' } diff --git a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java index 14d4d950..22c1590e 100644 --- a/app/src/main/java/com/keylesspalace/tusky/MainActivity.java +++ b/app/src/main/java/com/keylesspalace/tusky/MainActivity.java @@ -43,6 +43,7 @@ import com.android.volley.Request; import com.android.volley.Response; import com.android.volley.VolleyError; import com.android.volley.toolbox.JsonObjectRequest; +import com.arlib.floatingsearchview.FloatingSearchView; import com.keylesspalace.tusky.entity.Account; import com.mikepenz.google_material_typeface_library.GoogleMaterial; import com.mikepenz.materialdrawer.AccountHeader; @@ -63,6 +64,7 @@ import org.json.JSONException; import org.json.JSONObject; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Stack; @@ -90,8 +92,8 @@ public class MainActivity extends BaseActivity { // Fetch user info while we're doing other things. fetchUserInfo(); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + //Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + //setSupportActionBar(toolbar); FloatingActionButton floatingBtn = (FloatingActionButton) findViewById(R.id.floating_btn); floatingBtn.setOnClickListener(new View.OnClickListener() { @@ -102,6 +104,8 @@ public class MainActivity extends BaseActivity { } }); + final FloatingSearchView searchView = (FloatingSearchView) findViewById(R.id.floating_search_view); + headerResult = new AccountHeaderBuilder() .withActivity(this) .withSelectionListEnabledForSingleProfile(false) @@ -123,7 +127,7 @@ public class MainActivity extends BaseActivity { drawer = new DrawerBuilder() .withActivity(this) - .withToolbar(toolbar) + //.withToolbar(toolbar) .withAccountHeader(headerResult) .withHasStableIds(true) .withSelectedItem(-1) @@ -175,6 +179,8 @@ public class MainActivity extends BaseActivity { }) .build(); + searchView.attachNavigationDrawerToMenuButton(drawer.getDrawerLayout()); + // Setup the tabs and timeline pager. TimelinePagerAdapter adapter = new TimelinePagerAdapter(getSupportFragmentManager()); String[] pageTitles = { diff --git a/app/src/main/java/com/keylesspalace/tusky/entity/Account.java b/app/src/main/java/com/keylesspalace/tusky/entity/Account.java index d091512e..486dc6f6 100644 --- a/app/src/main/java/com/keylesspalace/tusky/entity/Account.java +++ b/app/src/main/java/com/keylesspalace/tusky/entity/Account.java @@ -15,10 +15,14 @@ package com.keylesspalace.tusky.entity; +import android.os.Parcel; import android.text.Spanned; +import com.arlib.floatingsearchview.suggestions.model.SearchSuggestion; import com.google.gson.annotations.SerializedName; +import org.parceler.Parcels; + public class Account { public String id; diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 004527b6..64251fad 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -16,14 +16,14 @@ android:layout_height="match_parent" android:orientation="vertical"> - + android:background="?attr/toolbar_background_color" />--> + + Unmute That user wasn\'t unmuted. That user wasn\'t muted. + Search accounts... diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 37cb2999..41ce0b58 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -65,6 +65,16 @@ @color/color_primary_dark @color/text_color_primary_dark @color/text_color_primary_dark + + @color/toolbar_background_dark + @color/text_color_secondary_dark + @color/text_color_tertiary_dark + @color/status_divider_dark + @color/toolbar_icon_dark + @color/toolbar_icon_dark + @color/toolbar_icon_dark + @color/toolbar_icon_dark + @color/toolbar_icon_dark-->