Skip to content

Commit

Permalink
desperate attempt to fix that oppo bug
Browse files Browse the repository at this point in the history
  • Loading branch information
Leif Niemczik committed Jun 17, 2022
1 parent 83c55d7 commit e038b41
Show file tree
Hide file tree
Showing 11 changed files with 187 additions and 156 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,6 @@ new_drawable.xml

*.pyc
__pycache__/
utility_scripts/emails/
utility_scripts/emails/

.vscode/
4 changes: 1 addition & 3 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
plugins {
id 'com.android.application'
}
apply plugin: 'com.android.application'

android {
compileSdkVersion rootProject.ext.CompileSdk
Expand Down
10 changes: 3 additions & 7 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
android:xlargeScreens="true" />

<application
tools:ignore="AllowBackup,GoogleAppIndexingUrlError,GoogleAppIndexingWarning"
tools:ignore="GoogleAppIndexingWarning,GoogleAppIndexingUrlError"
android:name=".applications.CandyBar"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand All @@ -32,8 +32,8 @@
android:launchMode="singleTop"
android:noHistory="true"
android:screenOrientation="portrait"
android:exported="true"
android:theme="@style/CandyBar.Theme.Splash">
android:theme="@style/CandyBar.Theme.Splash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -49,7 +49,6 @@
android:exported="true"
android:theme="@style/CandyBar.Theme.App"
android:configChanges="uiMode|orientation|keyboardHidden|screenSize">

<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand All @@ -61,7 +60,6 @@
</intent-filter>
<intent-filter>
<action android:name="android.intent.action.GET_CONTENT" />

<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.OPENABLE" />

Expand Down Expand Up @@ -239,7 +237,5 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_provider_paths" />
</provider>

</application>

</manifest>
43 changes: 6 additions & 37 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,10 @@
<color name="darkColorPrimary">#222222</color>
<color name="darkColorPrimaryDark">#111111</color>
<color name="darkColorAccent">#ff837d</color>
<!-- <color name="darkColorAccentSecondary">#b75752</color> -->

<!-- Shortcut Icon -->
<color name="shortcutIconBackground">#1A73E9</color> <!-- to edit -->
<color name="shortcutIconForeground">#FFF</color> <!-- to edit -->
<color name="shortcutIconBackground">#1A73E9</color>
<color name="shortcutIconForeground">#FFF</color>

<!-- Navigation Bar
* Must be solid color, no alpha -->
Expand All @@ -41,17 +40,17 @@
<color name="splashColor">#222222</color>

<!-- Navigation View -->
<color name="navigationViewHeaderBackground">#00FFFFFF</color> <!-- to edit-->
<color name="navigationViewHeaderBackgroundDark">#33000000</color> <!-- to edit-->
<color name="navigationViewHeaderBackground">#00FFFFFF</color>
<color name="navigationViewHeaderBackgroundDark">#33000000</color>
<color name="navigationViewTitle">#414345</color>
<color name="navigationViewTitleBack">#33000000</color>

<color name="navigationViewText">#56595B</color>
<color name="navigationViewTextDark">#FFFFFF</color>
<color name="navigationViewTextSelected">#9ABEFF</color>
<color name="navigationViewTextSelectedDark">#b75752</color>
<color name="navigationViewSelectedBackground">#222222</color> <!-- to edit-->
<color name="navigationViewSelectedBackgroundDark">#222222</color> <!-- to edit-->
<color name="navigationViewSelectedBackground">#222222</color>
<color name="navigationViewSelectedBackgroundDark">#222222</color>

<!-- Swipe Refresh -->
<color name="swipeRefresh">#ff837d</color>
Expand All @@ -60,16 +59,6 @@
<color name="toolbarIcon">#FF56595B</color>
<color name="toolbarIconDark">#FFFFFFFF</color>

<!-- Toolbar Search -->
<!--
<color name="searchToolbar">#56595B</color>
<color name="searchToolbarDark">#222</color>
<color name="searchToolbarIcon">#56595B</color>
<color name="searchToolbarIconDark">#4A4A4A</color>
<color name="searchToolbarHintText">#44000000</color>
<color name="searchToolbarHintTextDark">#44FFFFFF</color>
-->

<!-- Tab -->
<color name="tabIndicator">#9ABEFF</color>
<color name="tabIndicatorDark">#ff837d</color>
Expand All @@ -83,10 +72,6 @@
<color name="cardBackgroundDark">#2C2C2C</color>
<color name="cardStroke">#20000000</color>
<color name="cardStrokeDark">#20FFFFFF</color>
<!--
<color name="cardSelected">#20000000</color>
<color name="cardSelectedDark">#20FFFFFF</color>
-->

<!-- Ripple -->
<color name="rippleColor">#10000000</color>
Expand All @@ -101,26 +86,10 @@
<color name="primaryTextDark">#EEFFFFFF</color>
<color name="secondaryText">#A0A5AF</color>
<color name="secondaryTextDark">#99FFFFFF</color>
<!--
<color name="hintText">#44FFFFFF</color>
<color name="hintTextDark">#44FFFFFF</color>
-->

<color name="dividerList">#EEEEEE</color>
<color name="dividerListDark">#00FFFFFF</color>

<!-- Fast Scroll -->
<!--
<color name="fastScrollHandle">#757575</color>
<color name="fastScrollHandleDark">#B2B2B2</color>
-->

<!-- Popup Bubble -->
<!--
<color name="popupBubble">#ff837d</color>
<color name="popupBubbleText">#222</color>
-->

<!-- Wallpaper Preview -->
<color name="wallpaperStatusBar">#88000000</color>
<color name="wallpaperToolbar">#66000000</color>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/dashboard_configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@

<!-- Enables the new flat and outline styled cards everywhere -->
<!-- Crashes Delta when true so disabling this for now -wokija -->
<bool name="use_flat_card">false</bool>
<bool name="use_flat_card">true</bool>


<!--
Expand Down Expand Up @@ -134,7 +134,7 @@
CONFIG: ICONS
-->
<!-- Enable/disable icons sorting
Disabling this will improve performance and icons will load faster (because there is no sorting to do)
Disabling this will improve performance and icons will load faster (because there is no sorting to do)
Switched to false, sorting done inside drawable XML files instead -wokija -->
<bool name="enable_icons_sort">false</bool>
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/values/dashboard_icon_name_replacer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

<string-array name="icon_name_replacer">
<!-- Word "app_" will be replaced with "" -->
<item>app_,</item>
<!-- <item>app_,</item> -->
<!-- Word "icon_" will be replaced with "app_" -->
<item>icon_,app_</item>
<!-- <item>icon_,app_</item> -->
</string-array>

</resources>
4 changes: 0 additions & 4 deletions app/src/main/res/values/ic_launcher_background.xml

This file was deleted.

16 changes: 8 additions & 8 deletions app/src/main/res/values/launchers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
<string-array name="dashboard_launchers">
<!--<item>abc</item>-->
<item>action</item>
<item>adw</item>
<item>apex</item>
<!-- <item>adw</item> -->
<!-- <item>apex</item> -->
<!-- <item>atom</item> -->
<!--<item>aviate</item>-->
<item>blackberry</item>
<item>cm_theme</item>
<!-- <item>blackberry</item> -->
<!-- <item>cm_theme</item> -->
<!--<item>evie</item>-->
<item>flick</item>
<item>go_ex</item>
<item>holo</item>
<item>holo_hd</item>
<!-- <item>go_ex</item> -->
<!-- <item>holo</item>
<item>holo_hd</item> -->
<item>hyperion</item>
<item>lawnchair</item>
<item>lg_home</item>
Expand All @@ -26,7 +26,7 @@
<!--<item>mini</item>-->
<item>niagara</item>
<!--<item>next</item>-->
<item>nougat</item>
<!-- <item>nougat</item> -->
<item>nova</item>
<item>omega</item>
<item>pixel</item>
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,4 @@ function splitJvmOpts() {
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
Loading

0 comments on commit e038b41

Please sign in to comment.