this commit fixes #34 and fixed #29

This commit is contained in:
Kosh 2017-03-01 00:05:38 +08:00
parent 11dbd6f66f
commit 60cb93071a
8 changed files with 60 additions and 81 deletions

View File

@ -43,15 +43,18 @@
<activity
android:name=".ui.modules.user.UserPagerView"
android:label="@string/user"/>
android:label="@string/user"
android:noHistory="true"/>
<activity
android:name=".ui.modules.repos.RepoPagerView"
android:label="@string/repo"/>
android:label="@string/repo"
android:noHistory="true"/>
<activity
android:name=".ui.modules.repos.issues.issue.details.IssuePagerView"
android:label="@string/issue"/>
android:label="@string/issue"
android:noHistory="true"/>
<activity
android:name=".ui.modules.repos.issues.create.CreateIssueView"
android:configChanges="keyboard|orientation|screenSize"
@ -60,21 +63,24 @@
<activity
android:name=".ui.modules.repos.pull_requests.pull_request.details.PullRequestPagerView"
android:label="@string/pull_request"/>
android:label="@string/pull_request"
android:noHistory="true"/>
<activity
android:name=".ui.modules.repos.code.commit.details.CommitPagerView"
android:label="@string/commit"/>
android:label="@string/commit"
android:noHistory="true"/>
<activity
android:name=".ui.modules.code.CodeViewerView"
android:configChanges="keyboard|orientation|screenSize"
android:label="@string/viewer"/>
android:label="@string/viewer"
android:noHistory="true"/>
<activity
android:name=".ui.modules.editor.EditorView"
android:configChanges="keyboard|orientation|screenSize"
android:label="@string/write"
android:label="@string/markdown"
android:theme="@style/WhenLargeTheme"/>
<activity
@ -85,13 +91,15 @@
<activity
android:name=".ui.modules.gists.gist.GistView"
android:label="@string/gist"/>
android:label="@string/gist"
android:noHistory="true"/>
<activity android:name=".ui.modules.search.SearchView"/>
<activity
android:name=".ui.modules.notification.NotificationActivityView"
android:label="@string/notifictions"/>
android:label="@string/notifictions"
android:noHistory="true"/>
<activity
android:name=".ui.modules.parser.LinksParserActivity"

View File

@ -1,5 +1,6 @@
package com.fastaccess.helper;
import android.app.NotificationManager;
import android.content.Context;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
@ -22,4 +23,9 @@ public class AppHelper {
@Nullable public static Fragment getFragmentByTag(@NonNull FragmentManager fragmentManager, @NonNull String tag) {
return fragmentManager.findFragmentByTag(tag);
}
public static void cancelNotification(@NonNull Context context){
((NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE)).cancel(BundleConstant.REQUEST_CODE);
}
}

View File

@ -5,6 +5,8 @@ import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.support.design.widget.Snackbar;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import com.fastaccess.R;
@ -16,7 +18,6 @@ import com.fastaccess.helper.PrefGetter;
import com.fastaccess.helper.ViewHelper;
import com.fastaccess.provider.markdown.MarkDownProvider;
import com.fastaccess.ui.base.BaseActivity;
import com.fastaccess.ui.widgets.FontButton;
import com.fastaccess.ui.widgets.FontEditText;
import com.fastaccess.ui.widgets.ForegroundImageView;
@ -33,8 +34,6 @@ import uk.co.samuelwall.materialtaptargetprompt.MaterialTapTargetPrompt;
public class EditorView extends BaseActivity<EditorMvp.View, EditorPresenter> implements EditorMvp.View {
private CharSequence savedText;
@BindView(R.id.cancel) FontButton cancel;
@BindView(R.id.ok) FontButton ok;
@BindView(R.id.view) ForegroundImageView viewCode;
@BindView(R.id.editText) FontEditText editText;
@ -95,18 +94,6 @@ public class EditorView extends BaseActivity<EditorMvp.View, EditorPresenter> im
getPresenter().onActionClicked(editText, v.getId());
}
@OnClick(value = {R.id.ok, R.id.cancel}) void onClick(View view) {
if (view.getId() == R.id.ok) {
getPresenter().onHandleSubmission(savedText, extraType, itemId, commentId, login, issueNumber, sha);
} else {
finish();
}
}
@OnClick(R.id.back) void onBack() {
finish();
}
@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
if (savedInstanceState == null) {
@ -158,4 +145,17 @@ public class EditorView extends BaseActivity<EditorMvp.View, EditorPresenter> im
setResult(RESULT_OK, intent);
finish();
}
@Override public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.done_menu, menu);
return super.onCreateOptionsMenu(menu);
}
@Override public boolean onOptionsItemSelected(MenuItem item) {
if (item.getItemId() == R.id.submit) {
getPresenter().onHandleSubmission(savedText, extraType, itemId, commentId, login, issueNumber, sha);
return true;
}
return super.onOptionsItemSelected(item);
}
}

View File

@ -1,7 +1,5 @@
package com.fastaccess.ui.modules.main;
import android.app.NotificationManager;
import android.content.Context;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
@ -23,6 +21,7 @@ import com.fastaccess.BuildConfig;
import com.fastaccess.R;
import com.fastaccess.data.dao.LoginModel;
import com.fastaccess.data.dao.NotificationThreadModel;
import com.fastaccess.helper.AppHelper;
import com.fastaccess.helper.BundleConstant;
import com.fastaccess.helper.PrefGetter;
import com.fastaccess.helper.TypeFaceHelper;
@ -96,7 +95,7 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
onHideShowFab();
hideShowShadow(navType != MainMvp.PROFILE);
enableAds.setChecked(PrefGetter.isAdsEnabled());
((NotificationManager) getSystemService(Context.NOTIFICATION_SERVICE)).cancel(BundleConstant.REQUEST_CODE);//cancel notification if any.
AppHelper.cancelNotification(this);
}
@Override protected void onActivityResult(int requestCode, int resultCode, Intent data) {

View File

@ -1,8 +1,11 @@
package com.fastaccess.ui.modules.notification;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import com.fastaccess.R;
import com.fastaccess.helper.AppHelper;
import com.fastaccess.ui.base.BaseActivity;
import com.fastaccess.ui.base.mvp.presenter.BasePresenter;
@ -32,4 +35,9 @@ public class NotificationActivityView extends BaseActivity {
@NonNull @Override public TiPresenter providePresenter() {
return new BasePresenter();
}
@Override protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
AppHelper.cancelNotification(this);
}
}

View File

@ -30,6 +30,7 @@ public class NotificationsBottomSheet extends BaseBottomSheetDialog {
@Override public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
super.onViewCreated(view, savedInstanceState);
toolbar.setNavigationIcon(R.drawable.ic_arrow_drop_down);
toolbar.setNavigationContentDescription(getString(R.string.back));
toolbar.setTitle(R.string.notifictions);
toolbar.setNavigationOnClickListener(v -> dismiss());
if (savedInstanceState == null) {

View File

@ -6,60 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:layout_gravity="center"
android:gravity="end"
android:orientation="horizontal">
<com.fastaccess.ui.widgets.ForegroundImageView
android:id="@+id/back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:foreground="?selectableItemBackgroundBorderless"
android:padding="@dimen/spacing_xs_large"
android:scaleType="centerCrop"
android:src="@drawable/ic_back"
android:tint="@color/black"/>
<com.fastaccess.ui.widgets.FontTextView
style="@style/Base.TextAppearance.AppCompat.Title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginEnd="@dimen/spacing_xs_large"
android:layout_marginStart="@dimen/spacing_xs_large"
android:layout_weight="1"
android:text="@string/markdown"/>
<com.fastaccess.ui.widgets.FontButton
android:id="@+id/cancel"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/cancel"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/bluish_primary"/>
<com.fastaccess.ui.widgets.FontButton
android:id="@+id/ok"
style="@style/Widget.AppCompat.Button.Borderless.Colored"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/submit"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColor="@color/bluish_accent"/>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="4dp"
android:background="@drawable/toolbar_shadow"/>
<include layout="@layout/appbar_elevation_dark"/>
<ScrollView
android:layout_width="match_parent"

View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/submit"
android:icon="@drawable/ic_done"
android:title="@string/submit"
app:showAsAction="ifRoom"/>
</menu>