Skip to content

Commit

Permalink
Rekado 3.4
Browse files Browse the repository at this point in the history
- Updated: Fusee-Primary and Hekate to the latest versions.
- Added: Ability to follow theme of the system or set it based on "Battery Saver" mode.
- Improved: Color of icons in the "Rose" theme.
- Improved: Color of text and icons in navigation bottom bar for all themes.
  • Loading branch information
MenosGrante committed Mar 30, 2020
1 parent 017eedf commit a0ff1b9
Show file tree
Hide file tree
Showing 11 changed files with 15 additions and 29 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ android {
applicationId "com.pavelrekun.rekado"
minSdkVersion minimumSDKVersion
targetSdkVersion currentSDKVersion
versionCode 63
versionName "3.3.4"
versionCode 64
versionName "3.4"
}

buildTypes {
Expand Down
Binary file modified app/libs/penza.aar
Binary file not shown.
Binary file modified app/src/main/assets/fusee-primary.bin
Binary file not shown.
Binary file modified app/src/main/assets/hekate.bin
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ class MainSettingsView(private val activity: BaseActivity, private val fragment:
override fun initAppearanceCategory() {
val themePickerFragment = ThemePickerFragment().apply {
setClickListener { openRestartDialog() }
setControlClickListener { openRestartDialog() }
}

appearanceTheme.setOnPreferenceClickListener {
Expand Down
5 changes: 0 additions & 5 deletions app/src/main/res/drawable/state_navigation_item.xml

This file was deleted.

4 changes: 2 additions & 2 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
android:layout_alignParentBottom="true"
android:background="?attr/colorBackgroundSecondary"
android:elevation="5dp"
app:itemIconTint="@drawable/state_navigation_item"
app:itemTextColor="@drawable/state_navigation_item"
app:itemIconTint="@drawable/state_navigation_default_icon"
app:itemTextColor="@drawable/state_navigation_default_text"
app:menu="@menu/menu_bottom_navigation" />

</RelativeLayout>
6 changes: 4 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,10 @@
<string name="settings_picker_color_title">Choose color</string>
<string name="settings_picker_color_button_close">Close</string>
<string name="settings_picker_theme_title">Choose theme</string>
<string name="settings_picker_theme_preview">Preview</string>
<string name="settings_picker_theme_category_themes">Themes</string>
<string name="settings_picker_theme_category_control">Control</string>
<string name="settings_picker_theme_control_manual">Manual</string>
<string name="settings_picker_theme_control_system_default">System default</string>
<string name="settings_picker_theme_control_battery_saver">Set by "Battery Saver"</string>
<string name="settings_picker_theme_themes_general_white">White</string>
<string name="settings_picker_theme_themes_general_dark">Dark</string>
<string name="settings_picker_theme_themes_general_sepia">Sepia</string>
Expand Down
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ buildscript {

dependencies {
classpath 'com.android.tools.build:gradle:3.6.1'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61'
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71'
classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0'
}
}
Expand Down Expand Up @@ -38,8 +38,8 @@ ext {
androidXCoreKTX = '1.2.0'

// Kotlin
kotlinVersion = '1.3.61'
kotlinCoroutinesVersion = '1.3.3'
kotlinVersion = '1.3.71'
kotlinCoroutinesVersion = '1.3.5'

// Design
materialComponentsVersion = '1.1.0'
Expand Down
16 changes: 2 additions & 14 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,15 +1,3 @@
# Project-wide Gradle preferences.
# IDE (e.g. Android Studio) users:
# Gradle preferences configured through the IDE *will override*
# any preferences specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory preferences.
# Android X
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
android.useAndroidX=true
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

0 comments on commit a0ff1b9

Please sign in to comment.