Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fixing an error with the intent swipes #99

Merged
merged 1 commit into from
Dec 23, 2022
Merged

Fixing an error with the intent swipes #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions app/src/main/java/app/mlauncher/helper/ActionService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,10 @@ class ActionService : AccessibilityService() {
override fun onInterrupt() { }

companion object {
private var instance: WeakReference<ActionService>
get() = WeakReference(null)
set(value) = TODO()
private var instance: WeakReference<ActionService> = WeakReference(null)

fun instance(): ActionService? {
return instance.get()
}

}
}
4 changes: 2 additions & 2 deletions app/src/main/java/app/mlauncher/style/SettingsTheme.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,9 +93,9 @@ fun SettingsTheme(
settings = RoundedCornerShape(CORNER_RADIUS),
)
val replacementColor = ReplacementColor(
settings = colorResource( if (isDark) R.color.blackTrans50 else R.color.blackInverseTrans50 ),
settings = colorResource( if (isDark) R.color.blackTrans80 else R.color.blackInverseTrans80 ),
selector = colorResource( if (isDark) R.color.blackTrans80 else R.color.blackInverseTrans80 ),
border = colorResource( if (isDark) R.color.blackInverseTrans50 else R.color.blackTrans50 ),
border = colorResource( if (isDark) R.color.blackInverseTrans25 else R.color.whiteInverseTrans25 ),
)
CompositionLocalProvider(
LocalReplacementTypography provides replacementTypography,
Expand Down
72 changes: 63 additions & 9 deletions app/src/main/res/values-night/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,74 @@
<resources xmlns:tools="http://schemas.android.com/tools">
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar"><item name="android:forceDarkAllowed" tools:targetApi="q"> false</item><item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1"> shortEdges</item><item name="android:windowTranslucentStatus"> true</item><item name="android:windowTranslucentNavigation"> true</item><item name="android:fitsSystemWindows"> false</item><item name="android:windowShowWallpaper"> true</item><item name="android:windowBackground"> @android:color/transparent</item><item name="android:windowFullscreen"> false</item><item name="android:windowLightStatusBar"> false</item><item name="android:windowLightNavigationBar" tools:targetApi="o_mr1"> false</item><item name="android:windowContentOverlay"> @null</item><item name="android:windowAnimationStyle"> @style/WindowAnimationTransition</item><item name="android:colorBackgroundCacheHint"> @null</item><item name="android:statusBarColor"> @android:color/transparent</item><item name="android:navigationBarColor"> @android:color/transparent</item><!-- <item name="android:enforceStatusBarContrast">false</item> --><item name="android:enforceNavigationBarContrast" tools:targetApi="q"> false</item><!-- <item name="android:windowTranslucentStatus">false</item> --><!-- <item name="android:windowTranslucentNavigation">true</item> --><item name="colorPrimary"> @color/white</item><item name="colorPrimaryDark"> @android:color/darker_gray</item><item name="colorAccent"> @color/white</item><item name="primaryColor"> @color/white</item><item name="primaryInverseColor"> @color/whiteInverse</item><item name="primaryTextShadowColor"> @color/whiteInverseTrans50</item><item name="primaryColorTrans50"> @color/whiteTrans50</item><item name="primaryColorTrans80"> @color/whiteTrans80</item><item name="primaryColorInverseTrans50"> @color/whiteInverseTrans50</item><item name="primaryColorInverseTrans80"> @color/whiteInverseTrans80</item><item name="primaryColorInverseTrans90"> @color/whiteInverseTrans90</item><item name="primaryShadeColor"> @color/whiteInverseTrans10</item><item name="primaryShadeDarkColor"> @color/whiteInverseTrans25</item>
<style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
<item name="android:forceDarkAllowed" tools:targetApi="q">false</item>
<item name="android:windowLayoutInDisplayCutoutMode" tools:targetApi="o_mr1">shortEdges</item>
<item name="android:windowTranslucentStatus">true</item>
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowShowWallpaper">true</item>
<item name="android:windowBackground">@color/whiteInverseTrans50</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowLightStatusBar">false</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">false</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:statusBarColor">@color/whiteInverseTrans50</item>
<item name="android:navigationBarColor">@color/whiteInverseTrans50</item>
<!-- <item name="android:enforceStatusBarContrast">false</item> -->
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<!-- <item name="android:windowTranslucentStatus">false</item> -->
<!-- <item name="android:windowTranslucentNavigation">true</item> -->
<item name="colorPrimary">@color/white</item>
<item name="colorPrimaryDark">@android:color/darker_gray</item>
<item name="colorAccent">@color/white</item>
<item name="primaryColor">@color/white</item>
<item name="primaryInverseColor">@color/whiteInverse</item>
<item name="primaryTextShadowColor">@color/whiteInverseTrans50</item>
<item name="primaryColorTrans50">@color/whiteTrans50</item>
<item name="primaryColorTrans80">@color/whiteTrans80</item>
<item name="primaryColorInverseTrans50">@color/whiteInverseTrans50</item>
<item name="primaryColorInverseTrans80">@color/whiteInverseTrans80</item>
<item name="primaryColorInverseTrans90">@color/whiteInverseTrans90</item>
<item name="primaryShadeColor">@color/whiteInverseTrans10</item>
<item name="primaryShadeDarkColor">@color/whiteInverseTrans25</item>
</style>
<style name="WindowAnimationTransition"><item name="android:windowEnterAnimation"> @android:anim/fade_in</item><item name="android:windowExitAnimation"> @android:anim/fade_out</item>
<style name="WindowAnimationTransition">
<item name="android:windowEnterAnimation">@android:anim/fade_in</item>
<item name="android:windowExitAnimation">@android:anim/fade_out</item>
</style>
<style name="AppSearchText" parent="Widget.AppCompat.SearchView"><item name="android:maxLength"> 20</item><item name="android:textSize"> @dimen/text_large</item><item name="android:textColor"> ?attr/primaryColor</item><item name="android:editTextColor"> ?attr/primaryColor</item><item name="android:textColorHint"> ?attr/primaryColor</item><item name="android:fontFamily"> sans-serif-light</item><item name="android:inputType"> textNoSuggestions</item><item name="android:cursorVisible"> false</item>
<style name="AppSearchText" parent="Widget.AppCompat.SearchView">
<item name="android:maxLength">20</item>
<item name="android:textSize">@dimen/text_large</item>
<item name="android:textColor">?attr/primaryColor</item>
<item name="android:editTextColor">?attr/primaryColor</item>
<item name="android:textColorHint">?attr/primaryColor</item>
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:inputType">textNoSuggestions</item>
<item name="android:cursorVisible">false</item>
</style>
<style name="TextDefault" parent="@android:style/TextAppearance.Large"><item name="android:textColor"> @drawable/text_colors_default</item><item name="android:textColorHint"> ?attr/primaryColorTrans80</item><item name="android:shadowColor"> ?attr/primaryTextShadowColor</item><item name="android:shadowDx"> 1</item><item name="android:shadowDy"> 1</item><item name="android:shadowRadius"> 2</item>
<style name="TextDefault" parent="@android:style/TextAppearance.Large">
<item name="android:textColor">@drawable/text_colors_default</item>
<item name="android:textColorHint">?attr/primaryColorTrans80</item>
<item name="android:shadowColor">?attr/primaryTextShadowColor</item>
<item name="android:shadowDx">1</item>
<item name="android:shadowDy">1</item>
<item name="android:shadowRadius">2</item>
</style>
<style name="TextLarge" parent="TextDefault"><item name="android:fontFamily"> sans-serif-light</item><item name="android:textSize"> @dimen/text_large</item>
<style name="TextLarge" parent="TextDefault">
<item name="android:fontFamily">sans-serif-light</item>
<item name="android:textSize">@dimen/text_large</item>
</style>
<style name="TextMedium" parent="TextDefault"><item name="android:textSize"> 20sp</item>
<style name="TextMedium" parent="TextDefault">
<item name="android:textSize">20sp</item>
</style>
<style name="TextSmall" parent="TextDefault"><item name="android:textSize"> @dimen/text_small</item>
<style name="TextSmall" parent="TextDefault">
<item name="android:textSize">@dimen/text_small</item>
</style>
<style name="TextSmallBold" parent="TextSmall"><item name="android:textStyle"> bold</item>
<style name="TextSmallBold" parent="TextSmall">
<item name="android:textStyle">bold</item>
</style>
<style name="TextSmallLight" parent="TextSmall"><item name="android:textColor"> @drawable/text_colors_light</item>
<style name="TextSmallLight" parent="TextSmall">
<item name="android:textColor">@drawable/text_colors_light</item>
</style>
</resources>
6 changes: 3 additions & 3 deletions app/src/main/res/values/styles.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<item name="android:windowTranslucentNavigation">true</item>
<item name="android:fitsSystemWindows">false</item>
<item name="android:windowShowWallpaper">true</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowBackground">@color/blackInverseTrans50</item>
<item name="android:windowFullscreen">false</item>
<item name="android:windowLightStatusBar">true</item>
<item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="android:colorBackgroundCacheHint">@null</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
<item name="android:statusBarColor">@color/blackInverseTrans50</item>
<item name="android:navigationBarColor">@color/blackInverseTrans50</item>
<!-- <item name="android:enforceStatusBarContrast">false</item> -->
<item name="android:enforceNavigationBarContrast" tools:targetApi="q">false</item>
<!-- <item name="android:windowTranslucentStatus">false</item> -->
Expand Down