this fixes #89 , now using Fab instead borderless button to submit stuff.

This commit is contained in:
Kosh 2017-03-08 21:23:57 +08:00
parent e3271a4320
commit 5b697ba649
5 changed files with 37 additions and 29 deletions

View File

@ -8,7 +8,7 @@ import android.support.annotation.Nullable;
import android.support.design.widget.TextInputLayout;
import android.support.v4.app.Fragment;
import android.view.MotionEvent;
import android.widget.Button;
import android.view.View;
import com.fastaccess.R;
import com.fastaccess.data.dao.IssueModel;
@ -35,7 +35,7 @@ public class CreateIssueView extends BaseActivity<CreateIssueMvp.View, CreateIss
@BindView(R.id.title) TextInputLayout title;
@BindView(R.id.description) FontTextView description;
@BindView(R.id.createSecretGist) Button createIssue;
@BindView(R.id.submit) View submit;
@State String repoId;
@State String login;
@ -153,10 +153,10 @@ public class CreateIssueView extends BaseActivity<CreateIssueMvp.View, CreateIss
if (bundle.getParcelable(BundleConstant.ITEM) != null) {
if (bundle.getParcelable(BundleConstant.ITEM) instanceof IssueModel) {
issue = bundle.getParcelable(BundleConstant.ITEM);
createIssue.setText(R.string.update_issue);
setTitle(getString(R.string.update_issue));
} else if (bundle.getParcelable(BundleConstant.ITEM) instanceof PullRequestModel) {
pullRequest = bundle.getParcelable(BundleConstant.ITEM);
createIssue.setText(R.string.update_pull_request);
setTitle(getString(R.string.update_pull_request));
}
}
if (issue != null) {
@ -198,7 +198,7 @@ public class CreateIssueView extends BaseActivity<CreateIssueMvp.View, CreateIss
return false;
}
@OnClick(R.id.createSecretGist) public void onClick() {
@OnClick(R.id.submit) public void onClick() {
getPresenter().onSubmit(InputHelper.toString(title), savedText, login, repoId, issue, pullRequest);
}
}

View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24"
android:viewportWidth="24">
<path
android:fillColor="@color/primary_text"
android:pathData="M12,3C9.31,3 7.41,4.22 7.41,4.22L6,9H18L16.59,4.22C16.59,4.22 14.69,3 12,3M12,11C9.27,11 5.39,11.54 5.13,11.59C4.09,11.87 3.25,12.15 2.59,12.41C1.58,12.75 1,13 1,13H23C23,13 22.42,12.75 21.41,12.41C20.75,12.15 19.89,11.87 18.84,11.59C18.84,11.59 14.82,11 12,11M7.5,14A3.5,3.5 0 0,0 4,17.5A3.5,3.5 0 0,0 7.5,21A3.5,3.5 0 0,0 11,17.5C11,17.34 11,17.18 10.97,17.03C11.29,16.96 11.63,16.9 12,16.91C12.37,16.91 12.71,16.96 13.03,17.03C13,17.18 13,17.34 13,17.5A3.5,3.5 0 0,0 16.5,21A3.5,3.5 0 0,0 20,17.5A3.5,3.5 0 0,0 16.5,14C15.03,14 13.77,14.9 13.25,16.19C12.93,16.09 12.55,16 12,16C11.45,16 11.07,16.09 10.75,16.19C10.23,14.9 8.97,14 7.5,14M7.5,15A2.5,2.5 0 0,1 10,17.5A2.5,2.5 0 0,1 7.5,20A2.5,2.5 0 0,1 5,17.5A2.5,2.5 0 0,1 7.5,15M16.5,15A2.5,2.5 0 0,1 19,17.5A2.5,2.5 0 0,1 16.5,20A2.5,2.5 0 0,1 14,17.5A2.5,2.5 0 0,1 16.5,15Z"/>
</vector>

View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportHeight="24.0"
android:viewportWidth="24.0">
<path
android:fillColor="@color/primary_text"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>

View File

@ -123,29 +123,22 @@
android:gravity="center"
android:orientation="horizontal">
<com.fastaccess.ui.widgets.FontButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/createSecretGist"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_normal"
android:text="@string/create_secret_gist"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?colorAccent"/>
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_incognito"
android:tint="@color/white"/>
<com.fastaccess.ui.widgets.FontButton
<android.support.design.widget.FloatingActionButton
android:id="@+id/createPublicGist"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_normal"
android:text="@string/create_public_gist"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
android:textColor="?colorAccent"/>
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_brower"
android:tint="@color/white"/>
</LinearLayout>
</LinearLayout>

View File

@ -81,16 +81,13 @@
</LinearLayout>
</android.support.v7.widget.CardView>
<com.fastaccess.ui.widgets.FontButton
android:id="@+id/createSecretGist"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
<android.support.design.widget.FloatingActionButton
android:id="@+id/submit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/spacing_normal"
android:layout_marginStart="@dimen/spacing_normal"
android:text="@string/submit_issue"
android:textAppearance="@style/TextAppearance.AppCompat.Title"/>
android:layout_margin="@dimen/fab_margin"
android:src="@drawable/ic_send"
android:tint="@color/white"/>
</LinearLayout>