diff --git a/app/build.gradle b/app/build.gradle index 4df1753ab..b1584cf7c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -116,6 +116,7 @@ static def getDate() { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') implementation project(':appthemehelper') + implementation project(':fonts') implementation 'androidx.multidex:multidex:2.0.1' implementation "androidx.gridlayout:gridlayout:1.0.0" diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 978dbe1ae..4e4bceafc 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.4.900

v3.4.850

v3.4.800

v3.4.700

v3.4.600

v3.4.500

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.4.900

v3.4.850

v3.4.800

v3.4.700

v3.4.600

v3.4.500

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt index 6e8f76243..944ccfbe5 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/ShareInstagramStory.kt @@ -50,7 +50,6 @@ class ShareInstagramStory : AbsBaseActivity() { const val EXTRA_SONG = "extra_song" } - private lateinit var colorString: String override fun onOptionsItemSelected(item: MenuItem): Boolean { if (item.itemId == android.R.id.home) { onBackPressed() @@ -109,7 +108,14 @@ class ShareInstagramStory : AbsBaseActivity() { private fun setColors(colorLight: Boolean, color: Int) { setLightStatusbar(colorLight) toolbar.setTitleTextColor(MaterialValueHelper.getPrimaryTextColor(this@ShareInstagramStory, colorLight)) - toolbar.navigationIcon?.setTintList(ColorStateList.valueOf(MaterialValueHelper.getPrimaryTextColor(this@ShareInstagramStory, colorLight))) + toolbar.navigationIcon?.setTintList( + ColorStateList.valueOf( + MaterialValueHelper.getPrimaryTextColor( + this@ShareInstagramStory, + colorLight + ) + ) + ) mainContent.background = GradientDrawable(GradientDrawable.Orientation.TOP_BOTTOM, intArrayOf(color, Color.BLACK)) } diff --git a/app/src/main/res/font/circular.xml b/app/src/main/res/font/circular.xml deleted file mode 100644 index 264d363c5..000000000 --- a/app/src/main/res/font/circular.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/font/circular_std_black.otf b/app/src/main/res/font/circular_std_black.otf deleted file mode 100644 index c62b210c5..000000000 Binary files a/app/src/main/res/font/circular_std_black.otf and /dev/null differ diff --git a/app/src/main/res/font/circular_std_book.otf b/app/src/main/res/font/circular_std_book.otf deleted file mode 100644 index 3a1f1ad82..000000000 Binary files a/app/src/main/res/font/circular_std_book.otf and /dev/null differ diff --git a/app/src/main/res/font/circular_std_medium.otf b/app/src/main/res/font/circular_std_medium.otf deleted file mode 100644 index 931f4159d..000000000 Binary files a/app/src/main/res/font/circular_std_medium.otf and /dev/null differ diff --git a/app/src/main/res/layout-land/fragment_banner_home.xml b/app/src/main/res/layout-land/fragment_banner_home.xml index 9725e8e07..f90e9a2ca 100644 --- a/app/src/main/res/layout-land/fragment_banner_home.xml +++ b/app/src/main/res/layout-land/fragment_banner_home.xml @@ -83,12 +83,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" android:background="?attr/colorSurface" - app:contentInsetStart="0dp" - app:contentInsetStartWithNavigation="0dp" app:popupTheme="?toolbarPopupTheme" app:title="@string/action_search" - app:titleMarginStart="0dp" - app:titleTextAppearance="@style/ToolbarTextAppearanceSearch" + app:titleTextAppearance="@style/TextViewHeadline6" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout-land/fragment_home.xml b/app/src/main/res/layout-land/fragment_home.xml index 702e8fc81..017b2a7ee 100644 --- a/app/src/main/res/layout-land/fragment_home.xml +++ b/app/src/main/res/layout-land/fragment_home.xml @@ -55,12 +55,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" android:background="?colorSurface" - app:contentInsetStart="0dp" - app:contentInsetStartWithNavigation="0dp" app:popupTheme="?toolbarPopupTheme" app:title="@string/action_search" - app:titleMarginStart="0dp" - app:titleTextAppearance="@style/ToolbarTextAppearanceSearch" + app:titleTextAppearance="@style/TextViewHeadline6" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/activity_drive_mode.xml b/app/src/main/res/layout/activity_drive_mode.xml index 9a5971f73..c1c79ff29 100644 --- a/app/src/main/res/layout/activity_drive_mode.xml +++ b/app/src/main/res/layout/activity_drive_mode.xml @@ -67,7 +67,7 @@ android:id="@+id/playPauseButton" android:layout_width="112dp" android:layout_height="112dp" - android:layout_marginBottom="32dp" + android:layout_marginBottom="42dp" android:background="?roundSelector" android:src="@drawable/ic_pause_white_24dp" app:layout_constraintBottom_toTopOf="@+id/repeatButton" @@ -167,21 +167,6 @@ tools:text="@tools:sample/lorem/random" /> - + + diff --git a/app/src/main/res/layout/activity_share_instagram.xml b/app/src/main/res/layout/activity_share_instagram.xml index 9beb14bd7..e0c241def 100644 --- a/app/src/main/res/layout/activity_share_instagram.xml +++ b/app/src/main/res/layout/activity_share_instagram.xml @@ -50,7 +50,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="8dp" - android:text="@string/app_name" + android:text="@string/retro_music_player" android:textColor="@color/md_white_1000" app:layout_constraintBottom_toBottomOf="@id/appIcon" app:layout_constraintStart_toEndOf="@id/appIcon" diff --git a/app/src/main/res/layout/fragment_banner_home.xml b/app/src/main/res/layout/fragment_banner_home.xml index 1f033feef..7f3b395f3 100644 --- a/app/src/main/res/layout/fragment_banner_home.xml +++ b/app/src/main/res/layout/fragment_banner_home.xml @@ -55,12 +55,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" android:background="?attr/colorSurface" - app:contentInsetStart="0dp" - app:contentInsetStartWithNavigation="0dp" app:popupTheme="?toolbarPopupTheme" app:title="@string/action_search" - app:titleMarginStart="0dp" - app:titleTextAppearance="@style/ToolbarTextAppearanceSearch" + app:titleTextAppearance="@style/TextViewHeadline6" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/fragment_fit.xml b/app/src/main/res/layout/fragment_fit.xml index 5f079a87f..746d50342 100644 --- a/app/src/main/res/layout/fragment_fit.xml +++ b/app/src/main/res/layout/fragment_fit.xml @@ -40,7 +40,7 @@ android:name="code.name.monkey.retromusic.fragments.player.fit.FitPlaybackControlsFragment" android:layout_width="match_parent" android:layout_height="match_parent" - tools:layout="@layout/fragment_player_playback_controls" /> + tools:layout="@layout/fragment_fit_playback_controls" /> diff --git a/app/src/main/res/layout/fragment_library.xml b/app/src/main/res/layout/fragment_library.xml index 88e3adb8d..323b5f130 100644 --- a/app/src/main/res/layout/fragment_library.xml +++ b/app/src/main/res/layout/fragment_library.xml @@ -60,12 +60,9 @@ android:layout_width="match_parent" android:layout_height="@dimen/toolbar_height" android:background="?colorSurface" - app:contentInsetStart="0dp" - app:contentInsetStartWithNavigation="0dp" app:popupTheme="?attr/toolbarPopupTheme" app:title="@string/action_search" - app:titleMarginStart="0dp" - app:titleTextAppearance="@style/ToolbarTextAppearanceSearch" + app:titleTextAppearance="@style/TextViewHeadline6" app:titleTextColor="?android:attr/textColorSecondary" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml index 5aa1667e8..bd75804e4 100644 --- a/app/src/main/res/layout/fragment_tiny_player.xml +++ b/app/src/main/res/layout/fragment_tiny_player.xml @@ -146,6 +146,7 @@ android:paddingEnd="16dp" android:rotation="0" android:textAppearance="@style/TextViewHeadline6" + app:layout_constrainedWidth="true" app:layout_constraintBottom_toTopOf="@id/toolbarContainer" app:layout_constraintStart_toEndOf="@+id/title" app:layout_constraintTop_toBottomOf="@id/status_bar" diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml index d40011572..e4b57a01a 100644 --- a/app/src/main/res/layout/list_item_view.xml +++ b/app/src/main/res/layout/list_item_view.xml @@ -44,7 +44,7 @@ app:layout_constraintStart_toStartOf="@+id/guideline_front_margin" app:layout_constraintTop_toTopOf="parent" tools:maxLines="@string/grid_size_1" - tools:text="@tools:sample/lorem" /> + tools:text="@tools:sample/lorem/random" /> + app:layout_constraintGuide_begin="56dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml index 00569b275..1f165b22e 100644 --- a/app/src/main/res/layout/list_item_view_switch.xml +++ b/app/src/main/res/layout/list_item_view_switch.xml @@ -67,7 +67,7 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:orientation="vertical" - app:layout_constraintGuide_begin="52dp" /> + app:layout_constraintGuide_begin="56dp" /> Share story Share to Stories Drive mode + Retro Music Player diff --git a/appthemehelper/build.gradle b/appthemehelper/build.gradle index c6f418d4f..dd49405f5 100644 --- a/appthemehelper/build.gradle +++ b/appthemehelper/build.gradle @@ -26,6 +26,7 @@ android { dependencies { implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation project(':fonts') implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'com.google.android.material:material:1.2.0-alpha04' implementation 'androidx.preference:preference:1.1.0' diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt index fcbd5baf8..ba600c1e4 100644 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/prefs/ATEColorPreference.kt @@ -15,9 +15,10 @@ package code.name.monkey.appthemehelper.common.prefs import android.content.Context -import android.preference.Preference import android.util.AttributeSet import android.view.View +import androidx.preference.Preference +import androidx.preference.PreferenceViewHolder import code.name.monkey.appthemehelper.R class ATEColorPreference @JvmOverloads constructor( @@ -32,15 +33,20 @@ class ATEColorPreference @JvmOverloads constructor( private var border: Int = 0 init { - layoutResource = R.layout.ate_preference_custom widgetLayoutResource = R.layout.ate_preference_color isPersistent = false } - override fun onBindView(view: View) { + /*override fun onBindView(view: View) { super.onBindView(view) mView = view invalidateColor() + }*/ + + override fun onBindViewHolder(holder: PreferenceViewHolder?) { + super.onBindViewHolder(holder) + mView = holder?.itemView + invalidateColor() } fun setColor(color: Int, border: Int) { diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt deleted file mode 100755 index 0aa51fe09..000000000 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATESecondaryTextView.kt +++ /dev/null @@ -1,31 +0,0 @@ -/* - * Copyright (c) 2019 Hemanth Savarala. - * - * Licensed under the GNU General Public License v3 - * - * This is free software: you can redistribute it and/or modify it under - * the terms of the GNU General Public License as published by - * the Free Software Foundation either version 3 of the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; - * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. - * See the GNU General Public License for more details. - */ - -package code.name.monkey.appthemehelper.common.views - -import android.content.Context -import android.util.AttributeSet -import code.name.monkey.appthemehelper.ThemeStore -import com.google.android.material.textview.MaterialTextView - -class ATESecondaryTextView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : MaterialTextView(context, attrs, defStyleAttr) { - - init { - setTextColor(ThemeStore.textColorSecondary(context)) - } -} diff --git a/appthemehelper/src/main/res/drawable/ate_switch.xml b/appthemehelper/src/main/res/drawable/ate_switch.xml deleted file mode 100644 index 186e54ef7..000000000 --- a/appthemehelper/src/main/res/drawable/ate_switch.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml b/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml deleted file mode 100644 index 2df3a07ad..000000000 --- a/appthemehelper/src/main/res/drawable/ic_toggle_switch.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml b/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml deleted file mode 100644 index 24315a7da..000000000 --- a/appthemehelper/src/main/res/drawable/ic_toggle_switch_off.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom.xml b/appthemehelper/src/main/res/layout/ate_preference_custom.xml index 08ddf2d04..684f1af79 100755 --- a/appthemehelper/src/main/res/layout/ate_preference_custom.xml +++ b/appthemehelper/src/main/res/layout/ate_preference_custom.xml @@ -18,7 +18,9 @@ android:layout_gravity="center" android:layout_marginStart="@dimen/ate_preference_inset" android:layout_marginLeft="@dimen/ate_preference_inset" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" + tools:src="@drawable/icon_checkmark_white" + tools:tint="@color/md_black_1000" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" + android:textColor="?android:attr/textColorPrimary" + tools:text="@tools:sample/lorem/random" /> - + tools:text="@tools:sample/lorem/random" /> - diff --git a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml index 108a6e289..d2f22e30b 100755 --- a/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml +++ b/appthemehelper/src/main/res/layout/ate_preference_custom_support.xml @@ -19,7 +19,8 @@ android:layout_gravity="center" android:layout_marginStart="@dimen/ate_preference_inset" android:layout_marginLeft="@dimen/ate_preference_inset" - tools:ignore="ContentDescription" /> + tools:ignore="ContentDescription" + tools:src="@drawable/icon_back_black" /> - + android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1" + android:textColor="?android:attr/textColorPrimary" + tools:text="@tools:sample/lorem/random" /> - diff --git a/fonts/.gitignore b/fonts/.gitignore new file mode 100644 index 000000000..796b96d1c --- /dev/null +++ b/fonts/.gitignore @@ -0,0 +1 @@ +/build diff --git a/fonts/build.gradle b/fonts/build.gradle new file mode 100644 index 000000000..7c135b781 --- /dev/null +++ b/fonts/build.gradle @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2020 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ + +apply plugin: 'com.android.library' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-android-extensions' +android { + compileSdkVersion 29 + buildToolsVersion "29.0.2" + + defaultConfig { + minSdkVersion 21 + targetSdkVersion 29 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.core:core-ktx:1.1.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} diff --git a/fonts/consumer-rules.pro b/fonts/consumer-rules.pro new file mode 100644 index 000000000..e69de29bb diff --git a/fonts/proguard-rules.pro b/fonts/proguard-rules.pro new file mode 100644 index 000000000..f1b424510 --- /dev/null +++ b/fonts/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt b/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt new file mode 100644 index 000000000..a4828cdcf --- /dev/null +++ b/fonts/src/androidTest/java/dev/hemanths/fonts/ExampleInstrumentedTest.kt @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2020 Hemanth Savarala. + * + * Licensed under the GNU General Public License v3 + * + * This is free software: you can redistribute it and/or modify it under + * the terms of the GNU General Public License as published by + * the Free Software Foundation either version 3 of the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * See the GNU General Public License for more details. + */ + +package dev.hemanths.fonts + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("dev.hemanths.fonts.test", appContext.packageName) + } +} diff --git a/fonts/src/main/AndroidManifest.xml b/fonts/src/main/AndroidManifest.xml new file mode 100644 index 000000000..24cb0fe3d --- /dev/null +++ b/fonts/src/main/AndroidManifest.xml @@ -0,0 +1,16 @@ + + + diff --git a/fonts/src/main/res/values/strings.xml b/fonts/src/main/res/values/strings.xml new file mode 100644 index 000000000..57547e09e --- /dev/null +++ b/fonts/src/main/res/values/strings.xml @@ -0,0 +1,17 @@ + + + + fonts + diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt b/fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt old mode 100755 new mode 100644 similarity index 51% rename from appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt rename to fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt index 483beee40..c81737090 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/common/views/ATEPrimaryTextView.kt +++ b/fonts/src/test/java/dev/hemanths/fonts/ExampleUnitTest.kt @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Hemanth Savarala. + * Copyright (c) 2020 Hemanth Savarala. * * Licensed under the GNU General Public License v3 * @@ -12,20 +12,21 @@ * See the GNU General Public License for more details. */ -package code.name.monkey.appthemehelper.common.views +package dev.hemanths.fonts -import android.content.Context -import android.util.AttributeSet -import code.name.monkey.appthemehelper.ThemeStore -import com.google.android.material.textview.MaterialTextView +import org.junit.Test -class ATEPrimaryTextView @JvmOverloads constructor( - context: Context, - attrs: AttributeSet? = null, - defStyleAttr: Int = 0 -) : MaterialTextView(context, attrs, defStyleAttr) { +import org.junit.Assert.* - init { - setTextColor(ThemeStore.textColorPrimary(context)) +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) } } diff --git a/settings.gradle b/settings.gradle index 914418483..ee7c27a75 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':appthemehelper' \ No newline at end of file +include ':app', ':appthemehelper', ':fonts' \ No newline at end of file