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

released 1.3.1 fixing an issue I discovered in DarkTheme where I find there is a typo in prettify_dark.css file that causes code highlighting in dark theme to not work, also separated themes from styles.

Browse Source
This commit is contained in:
Kosh 2017-03-21 21:59:14 +08:00
parent 33a9cad75e
commit 86c93a8d46
9 changed files with 206 additions and 199 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -27,8 +27,8 @@ android {
applicationId "com.fastaccess.github"
minSdkVersion 21
targetSdkVersion 25
versionCode 130
versionName "1.3.0"
versionCode 131
versionName "1.3.1"
signingConfig signingConfigs.signing
buildConfigString "GITHUB_CLIENT_ID", (buildProperties.secrets['github_client_id'] | buildProperties.notThere['github_client_id']).string
buildConfigString "GITHUB_SECRET", (buildProperties.secrets['github_secret'] | buildProperties.notThere['github_secret']).string

2
app/src/main/java/com/fastaccess/helper/AppHelper.java
View File

@ -46,6 +46,6 @@ public class AppHelper {
public static boolean isNightMode(@NonNull Resources resources) {
int currentNightMode = resources.getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
return currentNightMode == Configuration.UI_MODE_NIGHT_YES;
return currentNightMode == Configuration.UI_MODE_NIGHT_YES || PrefGetter.getThemeType(resources) == PrefGetter.DARK;
}
}

11
app/src/main/java/com/fastaccess/helper/PrefGetter.java
View File

@ -1,6 +1,7 @@
package com.fastaccess.helper;
import android.content.Context;
import android.content.res.Resources;
import android.support.annotation.IntDef;
import android.support.annotation.NonNull;
@ -129,13 +130,17 @@ public class PrefGetter {
}
@ThemeType public static int getThemeType(@NonNull Context context) {
return getThemeType(context.getResources());
}
@ThemeType public static int getThemeType(@NonNull Resources resources) {
String appTheme = PrefHelper.getString("appTheme");
if (!InputHelper.isEmpty(appTheme)) {
if (appTheme.equalsIgnoreCase(context.getString(R.string.auto_theme_mode))) {
if (appTheme.equalsIgnoreCase(resources.getString(R.string.auto_theme_mode))) {
return AUTO;
} else if (appTheme.equalsIgnoreCase(context.getString(R.string.dark_theme_mode))) {
} else if (appTheme.equalsIgnoreCase(resources.getString(R.string.dark_theme_mode))) {
return DARK;
} else if (appTheme.equalsIgnoreCase(context.getString(R.string.light_theme_mode))) {
} else if (appTheme.equalsIgnoreCase(resources.getString(R.string.light_theme_mode))) {
return LIGHT;
} /* add future themes here */
}

2
app/src/main/java/com/prettifier/pretty/helper/PrettifyHelper.java
View File

@ -31,7 +31,7 @@ public class PrettifyHelper {
}
@NonNull private static String getStyle(boolean isDark) {
return !isDark ? "prettify.css" : "prettify_darkG.css";
return !isDark ? "prettify.css" : "prettify_dark.css";
}
}

50
app/src/main/res/layouts/row_layouts/layout/releases_row_item.xml
View File

@ -31,44 +31,46 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:orientation="horizontal">
<com.fastaccess.ui.widgets.FontTextView
android:id="@+id/title"
style="@style/TextAppearance.AppCompat.Subhead"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="3"
android:textColor="@color/primary_text"
tools:text="When one acquires music and afterlife, one is able to capture heaven\nWhen one acquires music and afterlife, one is able to capture heaven\n."/>
<LinearLayout
android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_weight="1"
android:orientation="vertical">
<com.fastaccess.ui.widgets.FontTextView
android:id="@+id/title"
style="@style/TextAppearance.AppCompat.Subhead"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="3"
android:textColor="@color/primary_text"
tools:text="When one acquires music and afterlife, one is able to capture heaven\nWhen one acquires music and afterlife, one is able to capture heaven\n."/>
<com.fastaccess.ui.widgets.FontTextView
android:id="@+id/details"
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:textColor="@color/secondary_text"
app:drawableColor="@color/secondary_text"
tools:text="1000"/>
<com.fastaccess.ui.widgets.ForegroundImageView
android:id="@+id/download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/spacing_normal"
android:scaleType="centerCrop"
android:src="@drawable/ic_download"/>
</LinearLayout>
<com.fastaccess.ui.widgets.ForegroundImageView
android:id="@+id/download"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:background="?selectableItemBackgroundBorderless"
android:padding="@dimen/spacing_normal"
android:scaleType="centerCrop"
android:src="@drawable/ic_download"/>
</LinearLayout>
</LinearLayout>

84
app/src/main/res/values-night/styles.xml
View File

@ -1,71 +1,4 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="AppTheme.Base"/>
<style name="WhenLargeTheme" parent="WhenLargeTheme.Base"/>
<style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</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/DialogTheme</item>
<item name="android:textColorTertiary">@color/secondary_text</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
<style name="WhenLargeTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:dialogTheme">@style/DialogTheme</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
<style name="DialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:windowBackground">@color/windowBackground</item>
</style>
<style name="Transparent_Activity" parent="Theme.AppCompat.DayNight.Dialog">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">@color/accent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="android:textColor">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<resources>
<style name="ToolbarStyle">
<item name="android:textColorPrimary">@color/black</item>
@ -88,21 +21,6 @@
<item name="behavior_peekHeight">220dp</item>
</style>
<style name="AppTheme.AboutActivity" parent="AppTheme.Base">
<item name="mal_lightActionBar">false</item>
<item name="mal_popupOverlay">@style/Theme.Mal.Dark.PopupOverlay</item>
<item name="mal_color_primary">@color/primary_text</item>
<item name="mal_color_secondary">@color/secondary_text</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
<style name="LoginTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/material_indigo_700</item>
<item name="colorPrimaryDark">@color/material_indigo_900</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
</style>
<style name="TimeLineBackground">
<item name="android:background">@drawable/ic_timeline_arrow_left</item>
<item name="android:backgroundTint">@color/primary</item>

79
app/src/main/res/values-night/themes.xml Normal file
View File

@ -0,0 +1,79 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="AppTheme.Base"/>
<style name="WhenLargeTheme" parent="WhenLargeTheme.Base"/>
<style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</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/DialogTheme</item>
<item name="android:textColorTertiary">@color/secondary_text</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
<style name="WhenLargeTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:dialogTheme">@style/DialogTheme</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
<style name="DialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:windowBackground">@color/windowBackground</item>
</style>
<style name="Transparent_Activity" parent="Theme.AppCompat.DayNight.Dialog">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">@color/accent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="android:textColor">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AboutActivity" parent="AppTheme.Base">
<item name="mal_lightActionBar">false</item>
<item name="mal_popupOverlay">@style/Theme.Mal.Dark.PopupOverlay</item>
<item name="mal_color_primary">@color/primary_text</item>
<item name="mal_color_secondary">@color/secondary_text</item>
<item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
</style>
</resources>

85
app/src/main/res/values/styles.xml
View File

@ -4,70 +4,6 @@
<style name="WhenLargeTheme" parent="WhenLargeTheme.Base"/>
<style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</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/DialogTheme</item>
</style>
<style name="WhenLargeTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:dialogTheme">@style/DialogTheme</item>
</style>
<style name="DialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowCloseOnTouchOutside">false</item>
</style>
<style name="Transparent_Activity" parent="Theme.AppCompat.DayNight.Dialog">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">@color/accent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="android:textColor">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="ToolbarStyle">
<item name="android:textColorPrimary">@color/white</item>
<item name="colorControlNormal">@color/white</item>
@ -88,29 +24,8 @@
<item name="behavior_peekHeight">220dp</item>
</style>
<style name="AppTheme.AboutActivity" parent="Theme.Mal.Light.LightActionBar">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</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>
</style>
<style name="LoginTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/material_indigo_700</item>
<item name="colorPrimaryDark">@color/material_indigo_900</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
</style>
<style name="TimeLineBackground">
<item name="android:background">@drawable/ic_timeline_arrow_left</item>
</style>
<style name="SplashTheme" parent="AppTheme">
<item name="android:windowBackground">@drawable/splash_screen_drawable</item>
</style>
</resources>

88
app/src/main/res/values/themes.xml Normal file
View File

@ -0,0 +1,88 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="AppTheme.Base" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:textColorTertiary">@color/secondary_text</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/DialogTheme</item>
</style>
<style name="WhenLargeTheme.Base" parent="Theme.AppCompat.DayNight.DialogWhenLarge">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="windowActionModeOverlay">true</item>
<item name="bottomSheetDialogTheme">@style/AppBottomSheetDialogTheme</item>
<item name="android:textColorPrimary">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:textColorTertiary">@color/secondary_text</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
<item name="android:windowAllowReturnTransitionOverlap">true</item>
<item name="android:colorEdgeEffect">?colorPrimary</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowDrawsSystemBarBackgrounds">true</item>
<item name="android:statusBarColor">@color/transparent</item>
<item name="android:dialogTheme">@style/DialogTheme</item>
</style>
<style name="Transparent_Activity" parent="Theme.AppCompat.DayNight.Dialog">
<item name="android:windowBackground">@color/windowBackground</item>
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">@color/accent</item>
<item name="actionModeBackground">@color/primary</item>
<item name="android:textColor">@color/primary_text</item>
<item name="android:textColorSecondary">@color/secondary_text</item>
<item name="android:textColorTertiary">@color/secondary_text</item>
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AboutActivity" parent="Theme.Mal.Light.LightActionBar">
<item name="colorPrimary">@color/primary</item>
<item name="colorPrimaryDark">@color/primary_dark</item>
<item name="colorAccent">@color/accent</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>
</style>
<style name="LoginTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/material_indigo_700</item>
<item name="colorPrimaryDark">@color/material_indigo_900</item>
<item name="colorAccent">@color/accent</item>
<item name="colorControlNormal">?colorAccent</item>
</style>
<style name="DialogTheme" parent="Theme.AppCompat.DayNight.Dialog.Alert">
<item name="android:windowBackground">@color/windowBackground</item>
</style>
<style name="SplashTheme" parent="AppTheme">
<item name="android:windowBackground">@drawable/splash_screen_drawable</item>
</style>
</resources>