archive-gh-me/FastHub
1
0
Fork 0
mirror of https://github.com/k0shk0sh/FastHub.git synced 2025-12-08 19:05:54 +00:00
Code Issues Projects Releases Wiki Activity

fixed mark as read where it breaks opening the associated view.

Browse Source
This commit is contained in:
Kosh 2017-04-06 10:04:22 +08:00
parent a6d8f5aa75
commit 80d3a5ad79
12 changed files with 75 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -21,7 +21,7 @@
tools:replace="android:allowBackup">
<activity
android:name="com.fastaccess.ui.modules.main.MainView"
android:launchMode="singleInstance">
android:launchMode="singleTask">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>

3
app/src/main/java/com/fastaccess/provider/scheme/SchemeParser.java
View File

@ -51,8 +51,7 @@ public class SchemeParser {
Intent intent = convert(context, data, showRepoBtn);
if (intent != null) {
if (context instanceof Service || context instanceof Application) {
Logger.e("instanceof");
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
}
context.startActivity(intent);
} else {

2
app/src/main/java/com/fastaccess/provider/tasks/notification/NotificationSchedulerJobTask.java
View File

@ -189,7 +189,7 @@ public class NotificationSchedulerJobTask extends JobService {
private PendingIntent getReadOnlyPendingIntent(long id, @NonNull String url) {
Intent intent = ReadNotificationService.start(this, id, url, true);
return PendingIntent.getService(this, (int) id, intent,
return PendingIntent.getService(this, (int) (id / 2), intent,
PendingIntent.FLAG_UPDATE_CURRENT);
}

4
app/src/main/java/com/fastaccess/provider/tasks/notification/ReadNotificationService.java
View File

@ -15,6 +15,7 @@ import com.fastaccess.R;
import com.fastaccess.helper.AppHelper;
import com.fastaccess.helper.BundleConstant;
import com.fastaccess.helper.Bundler;
import com.fastaccess.helper.Logger;
import com.fastaccess.helper.PrefGetter;
import com.fastaccess.provider.rest.RestProvider;
import com.fastaccess.provider.scheme.SchemeParser;
@ -47,6 +48,7 @@ public class ReadNotificationService extends IntentService {
}
public static Intent start(@NonNull Context context, long id, @NonNull String url, boolean onlyRead) {
Logger.e(onlyRead);
Intent intent = new Intent(context.getApplicationContext(), ReadNotificationService.class);
intent.putExtras(Bundler.start()
.put(BundleConstant.EXTRA_TYPE, OPEN_NOTIFICATIO)
@ -91,7 +93,7 @@ public class ReadNotificationService extends IntentService {
if (!PrefGetter.isMarkAsReadEnabled() || readOnly) {
markSingleAsRead(id);
}
if (!readOnly) SchemeParser.launchUri(this, Uri.parse(url), true);
if (!readOnly) SchemeParser.launchUri(getBaseContext(), Uri.parse(url), true);
}
}

5
app/src/main/java/com/fastaccess/ui/base/BaseActivity.java
View File

@ -238,9 +238,9 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
return true;
} else if (item.getItemId() == R.id.mainView) {
Intent intent = new Intent(this, MainView.class);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP);
startActivity(intent);
finishAffinity();
finish();
}
return false;
}
@ -402,6 +402,7 @@ public abstract class BaseActivity<V extends BaseMvp.FAView, P extends BasePrese
drawerView.postDelayed(() -> {
if (drawer != null) {
drawer.closeDrawer(GravityCompat.START);
drawer.removeDrawerListener(this);
}
}, 1000);
}

1
app/src/main/java/com/fastaccess/ui/modules/main/MainView.java
View File

@ -37,7 +37,6 @@ public class MainView extends BaseActivity<MainMvp.View, MainPresenter> implemen
@BindView(R.id.bottomNavigation) BottomNavigation bottomNavigation;
@BindView(R.id.navigation) NavigationView navigationView;
@BindView(R.id.drawerLayout) DrawerLayout drawerLayout;
private long backPressTimer;
@NonNull @Override public MainPresenter providePresenter() {

3
app/src/main/java/com/prettifier/pretty/PrettifyWebView.java
View File

@ -161,8 +161,7 @@ public class PrettifyWebView extends NestedWebView {
if (MarkDownProvider.isImage(url.toString())) {
CodeViewerView.startActivity(getContext(), url.toString());
} else {
String anchorLink = url.getEncodedFragment();
if (anchorLink != null && anchorLink.startsWith("#")) {
if (url.toString().startsWith("#")) {
return;
}
SchemeParser.launchUri(getContext(), url, true);

60
app/src/main/res/values/theme_midnight_blue.xml Normal file
View File

@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<color name="midNightBlueWindowBackground">#1B2837</color>
<style name="ThemeMidNightBlue" parent="ThemeMidNightBlue.Base"/>
<style name="ThemeMidNightBlue.Base" parent="Theme.AppCompat.NoActionBar">
<item name="card_background">#213040</item>
<item name="icon_color">#fff</item>
<item name="timeLineBackground">@style/TimeLineBackgroundMidNightBlue</item>
<item name="patch_addition">@color/dark_patch_addition_color</item>
<item name="patch_deletion">@color/dark_patch_deletion_color</item>
<item name="patch_ref">@color/dark_patch_ref_color</item>
<item name="dividerColor">@color/darkDivider</item>
<item name="android:windowBackground">@color/midNightBlueWindowBackground</item>
<item name="colorPrimary">#213040</item>
<item name="colorPrimaryDark">#101B27</item>
<item name="colorAccent">#4C5B6A</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">?colorPrimary</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">#fff</item>
<item name="android:textColorSecondary">#9E9E9E</item>
<item name="android:textColorTertiary">#ffe0e0e0</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:dialogTheme">@style/DialogThemeMidNight</item>
<item name="android:toolbarStyle">@style/ToolbarStyleDark</item>
<item name="android:windowLightStatusBar" tools:targetApi="m">false</item>
</style>
<style name="TimeLineBackgroundMidNightBlue">
<item name="android:background">@drawable/ic_timeline_arrow_left</item>
<item name="android:backgroundTint">#213040</item>
</style>
<style name="DialogThemeMidNight" parent="@style/Theme.AppCompat.Dialog">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
<item name="android:windowBackground">@color/midNightBlueWindowBackground</item>
</style>
<style name="AppTheme.AboutActivity.MidNight" parent="ThemeMidNightBlue">
<item name="mal_popupOverlay">@style/Theme.Mal.Dark.PopupOverlay</item>
<item name="colorPrimary">#213040</item>
<item name="colorPrimaryDark">#4C5B6A</item>
<item name="colorAccent">#2196F3</item>
<item name="mal_lightActionBar">false</item>
<item name="mal_color_primary">#fff</item>
<item name="mal_color_secondary">#ffe0e0e0</item>
</style>
</resources>

3
markdown/src/main/res/values/strings.xml
View File

@ -1,3 +0,0 @@
<resources>
<string name="app_name">MarkDown</string>
</resources>

13
pago/src/main/AndroidManifest.xml
View File

@ -1,16 +1,13 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="io.octo.bear.pago">
<manifest package="io.octo.bear.pago"
xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="com.android.vending.BILLING" />
<uses-permission android:name="com.android.vending.BILLING"/>
<application
android:allowBackup="true"
android:label="@string/app_name"
android:supportsRtl="true">
<application>
<activity
android:name=".BillingActivity"
android:theme="@android:style/Theme.Translucent.NoTitleBar" />
android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
</application>

4
pago/src/main/res/values/id.xml
View File

@ -1,4 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="test_button" type="id" />
</resources>

3
pago/src/main/res/values/strings.xml
View File

@ -1,3 +0,0 @@
<resources>
<string name="app_name">Pago</string>
</resources>