Skip to content
Snippets Groups Projects
Commit c63afb11 authored by Jawn's avatar Jawn
Browse files

Use design FAB instead. Add a color primary and accent.

parent ddeb9933
No related branches found
No related tags found
No related merge requests found
Showing
with 19 additions and 17 deletions
Loading
Loading
@@ -41,7 +41,6 @@ dependencies {
compile 'com.squareup.okhttp:okhttp:2.4.0'
compile 'com.jakewharton:butterknife:7.0.1'
compile 'de.keyboardsurfer.android.widget:crouton:1.8.5@aar'
compile 'com.melnykov:floatingactionbutton:1.0.4'
compile 'com.android.support:appcompat-v7:22.2.1'
compile 'com.android.support:design:22.2.1'
}
Loading
Loading
@@ -19,7 +19,6 @@ import com.commit451.gitlab.adapter.IssuesAdapter;
import com.commit451.gitlab.model.Issue;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.melnykov.fab.FloatingActionButton;
 
import java.util.List;
 
Loading
Loading
@@ -34,7 +33,7 @@ import retrofit.client.Response;
 
public class IssuesFragment extends Fragment implements OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
 
@Bind(R.id.add_issue_button) FloatingActionButton addIssueButton;
@Bind(R.id.add_issue_button) View addIssueButton;
@Bind(R.id.fragmentList) ListView listView;
@Bind(R.id.swipe_layout) SwipeRefreshLayout swipeLayout;
Loading
Loading
@@ -46,7 +45,6 @@ public class IssuesFragment extends Fragment implements OnItemClickListener, Swi
ButterKnife.bind(this, view);
listView.setOnItemClickListener(this);
addIssueButton.attachToListView(listView);
 
swipeLayout.setOnRefreshListener(this);
 
Loading
Loading
Loading
Loading
@@ -18,7 +18,6 @@ import com.commit451.gitlab.adapter.UserAdapter;
import com.commit451.gitlab.model.User;
import com.commit451.gitlab.tools.Repository;
import com.commit451.gitlab.tools.RetrofitHelper;
import com.melnykov.fab.FloatingActionButton;
 
import java.util.List;
 
Loading
Loading
@@ -33,7 +32,7 @@ import retrofit.client.Response;
 
public class UsersFragment extends Fragment implements OnItemClickListener, SwipeRefreshLayout.OnRefreshListener {
@Bind(R.id.add_user_button) FloatingActionButton addUserButton;
@Bind(R.id.add_user_button) View addUserButton;
@Bind(R.id.fragmentList) ListView listView;
@Bind(R.id.error_text) TextView errorText;
@Bind(R.id.swipe_layout) SwipeRefreshLayout swipeLayout;
Loading
Loading
@@ -46,7 +45,6 @@ public class UsersFragment extends Fragment implements OnItemClickListener, Swip
ButterKnife.bind(this, view);
listView.setOnItemClickListener(this);
addUserButton.attachToListView(listView);
 
swipeLayout.setOnRefreshListener(this);
 
Loading
Loading
app/src/main/res/drawable-hdpi/ic_add.png

292 B

app/src/main/res/drawable-hdpi/ic_menu.png

299 B

app/src/main/res/drawable-mdpi/ic_add.png

242 B

app/src/main/res/drawable-mdpi/ic_menu.png

192 B

app/src/main/res/drawable-xhdpi/ic_add.png

413 B

app/src/main/res/drawable-xhdpi/ic_menu.png

330 B

app/src/main/res/drawable-xxhdpi/ic_add.png

608 B

app/src/main/res/drawable-xxhdpi/ic_menu.png

573 B

app/src/main/res/drawable-xxxhdpi/ic_add.png

907 B

app/src/main/res/drawable-xxxhdpi/ic_menu.png

842 B

Loading
Loading
@@ -18,13 +18,12 @@
 
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
 
<com.melnykov.fab.FloatingActionButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/add_issue_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="bottom|right"
android:layout_margin="16dp"
android:enabled="false"
android:src="@drawable/ic_action_add" />
android:src="@drawable/ic_add"
android:layout_margin="@dimen/padding_normal"/>
 
</FrameLayout>
Loading
Loading
@@ -26,13 +26,12 @@
 
</com.commit451.gitlab.views.GitLabSwipeRefreshLayout>
 
<com.melnykov.fab.FloatingActionButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/add_user_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="bottom|right"
android:layout_margin="16dp"
android:enabled="false"
android:src="@drawable/ic_action_add" />
android:src="@drawable/ic_add"
android:layout_margin="@dimen/padding_normal"/>
 
</FrameLayout >
\ No newline at end of file
Loading
Loading
@@ -4,4 +4,5 @@
<color name="orange">#FB6C17</color>
<color name="yellow">#FAA11A</color>
<color name="grey">#373D47</color>
<color name="grey_dark">#1E242E</color>
</resources>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="padding_normal">16dp</dimen>
</resources>
\ No newline at end of file
Loading
Loading
@@ -3,5 +3,9 @@
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/grey</item>
<item name="colorPrimaryDark">@color/grey_dark</item>
<item name="android:navigationBarColor">?attr/colorPrimaryDark</item>
<item name="colorAccent">@color/orange</item>
</style>
</resources>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment