Skip to content

Commit a0ff1b9

Browse files
committed
Rekado 3.4
- 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.
1 parent 017eedf commit a0ff1b9

File tree

11 files changed

+15
-29
lines changed

11 files changed

+15
-29
lines changed

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ android {
1111
applicationId "com.pavelrekun.rekado"
1212
minSdkVersion minimumSDKVersion
1313
targetSdkVersion currentSDKVersion
14-
versionCode 63
15-
versionName "3.3.4"
14+
versionCode 64
15+
versionName "3.4"
1616
}
1717

1818
buildTypes {

app/libs/penza.aar

-1.27 KB
Binary file not shown.

app/src/main/assets/fusee-primary.bin

0 Bytes
Binary file not shown.

app/src/main/assets/hekate.bin

148 Bytes
Binary file not shown.

app/src/main/java/com/pavelrekun/rekado/screens/settings_activity/main_settings_fragment/MainSettingsView.kt

+1
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ class MainSettingsView(private val activity: BaseActivity, private val fragment:
5757
override fun initAppearanceCategory() {
5858
val themePickerFragment = ThemePickerFragment().apply {
5959
setClickListener { openRestartDialog() }
60+
setControlClickListener { openRestartDialog() }
6061
}
6162

6263
appearanceTheme.setOnPreferenceClickListener {

app/src/main/res/drawable/state_navigation_item.xml

-5
This file was deleted.

app/src/main/res/layout/activity_main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
android:layout_alignParentBottom="true"
3030
android:background="?attr/colorBackgroundSecondary"
3131
android:elevation="5dp"
32-
app:itemIconTint="@drawable/state_navigation_item"
33-
app:itemTextColor="@drawable/state_navigation_item"
32+
app:itemIconTint="@drawable/state_navigation_default_icon"
33+
app:itemTextColor="@drawable/state_navigation_default_text"
3434
app:menu="@menu/menu_bottom_navigation" />
3535

3636
</RelativeLayout>

app/src/main/res/values/strings.xml

+4-2
Original file line numberDiff line numberDiff line change
@@ -64,8 +64,10 @@
6464
<string name="settings_picker_color_title">Choose color</string>
6565
<string name="settings_picker_color_button_close">Close</string>
6666
<string name="settings_picker_theme_title">Choose theme</string>
67-
<string name="settings_picker_theme_preview">Preview</string>
68-
<string name="settings_picker_theme_category_themes">Themes</string>
67+
<string name="settings_picker_theme_category_control">Control</string>
68+
<string name="settings_picker_theme_control_manual">Manual</string>
69+
<string name="settings_picker_theme_control_system_default">System default</string>
70+
<string name="settings_picker_theme_control_battery_saver">Set by "Battery Saver"</string>
6971
<string name="settings_picker_theme_themes_general_white">White</string>
7072
<string name="settings_picker_theme_themes_general_dark">Dark</string>
7173
<string name="settings_picker_theme_themes_general_sepia">Sepia</string>

build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ buildscript {
66

77
dependencies {
88
classpath 'com.android.tools.build:gradle:3.6.1'
9-
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61'
9+
classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.71'
1010
classpath 'com.github.ben-manes:gradle-versions-plugin:0.28.0'
1111
}
1212
}
@@ -38,8 +38,8 @@ ext {
3838
androidXCoreKTX = '1.2.0'
3939

4040
// Kotlin
41-
kotlinVersion = '1.3.61'
42-
kotlinCoroutinesVersion = '1.3.3'
41+
kotlinVersion = '1.3.71'
42+
kotlinCoroutinesVersion = '1.3.5'
4343

4444
// Design
4545
materialComponentsVersion = '1.1.0'

gradle.properties

+2-14
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
# Project-wide Gradle preferences.
2-
# IDE (e.g. Android Studio) users:
3-
# Gradle preferences configured through the IDE *will override*
4-
# any preferences specified in this file.
5-
# For more details on how to configure your build environment visit
6-
# http://www.gradle.org/docs/current/userguide/build_environment.html
7-
# Specifies the JVM arguments used for the daemon process.
8-
# The setting is particularly useful for tweaking memory preferences.
1+
# Android X
92
android.enableJetifier=true
10-
android.useAndroidX=true
11-
org.gradle.jvmargs=-Xmx1536m
12-
# When configured, Gradle will run in incubating parallel mode.
13-
# This option should only be used with decoupled projects. More details, visit
14-
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
15-
# org.gradle.parallel=true
3+
android.useAndroidX=true

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip

0 commit comments

Comments
 (0)