Theme app according to our palette (a11bb03c) · Commits · e / os / Message

build.gradle

+1 −2

Original line number	Diff line number	Diff line
		@@ -33,8 +33,6 @@ buildscript {
		ext.rx_preferences_version = '2.0.0-RC3'
		ext.timber_version = '4.5.1'

		ext.abiCodes = ['armeabi-v7a': 1, 'arm64-v8a': 2]

		repositories {
		maven { url 'https://maven.google.com' }
		jcenter()
		@@ -55,6 +53,7 @@ allprojects {
		google()
		jcenter()
		maven { url "https://jitpack.io" }
		maven { url 'https://gitlab.e.foundation/api/v4/groups/9/-/packages/maven'}
		maven { url 'https://maven.fabric.io/public' }
		maven { url 'https://maven.google.com' }
		maven {

deleted100644 → 0

−114 KiB

File deleted.

+1 −16

Original line number	Diff line number	Diff line
		@@ -40,11 +40,6 @@ android {
		}


		aaptOptions {
		additionalParameters '-I', 'e-ui-sdk.jar'
		}


		/* signingConfigs {
		release
		}*/
		@@ -80,15 +75,6 @@ android {
		withAnalytics { dimension "analytics" }
		noAnalytics { dimension "analytics" }
		}

		splits {
		abi {
		enable true
		reset()
		include 'armeabi-v7a', 'arm64-v8a'
		universalApk true
		}
		}
		/*if (System.getenv("CI") == "true") {
		signingConfigs.release.storeFile = file("../keystore")
		signingConfigs.release.storePassword = System.getenv("keystore_password")
		@@ -112,8 +98,6 @@ configurations {


		dependencies {
		// e-ui sdk
		compileOnly files("../e-ui-sdk.jar")
		// lifecycle
		implementation "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
		implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"
		@@ -125,6 +109,7 @@ dependencies {
		implementation "androidx.emoji:emoji-appcompat:$androidx_emoji_version"
		implementation "androidx.viewpager2:viewpager2:$androidx_viewpager_version"
		implementation "com.google.android.material:material:$material_version"
		implementation 'foundation.e:elib:0.0.1-alpha11'

		// conductor
		implementation "com.bluelinelabs:conductor:$conductor_version"

+2 −2

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ class PreferenceView @JvmOverloads constructor(
		orientation = HORIZONTAL
		gravity = Gravity.CENTER_VERTICAL

		icon.setColorFilter(context.getColor(R.color.color_default_icon))
		icon.setColorFilter(context.getColor(R.color.icon_color))

		context.obtainStyledAttributes(attrs, R.styleable.PreferenceView).run {
		title = getString(R.styleable.PreferenceView_title)
		@@ -95,7 +95,7 @@ class PreferenceView @JvmOverloads constructor(
		getResourceId(R.styleable.PreferenceView_icon, -1).takeIf { it != -1 }?.let { id ->
		icon.setVisible(true)
		icon.setImageResource(id)
		icon.setTint(context.getColor(R.color.tools_theme))
		icon.setTint(context.getColor(R.color.icon_color))
		}

		recycle()

+2 −15

Original line number	Diff line number	Diff line
		@@ -143,8 +143,8 @@ class MainActivity : QkThemedActivity(), MainView {
		}

		toggle.syncState()
		toolbar.setNavigationIcon(lineageos.platform.R.drawable.ic_hamburger)
		toolbar.navigationIcon?.setTint(resources.getColor(R.color.color_default_icon))
		toolbar.setNavigationIcon(R.drawable.e_ic_hamburger)
		toolbar.navigationIcon?.setTint(resources.getColor(R.color.e_primary_text_color))
		toolbar.setNavigationOnClickListener {
		dismissKeyboard()
		homeIntent.onNext(Unit)
		@@ -160,19 +160,6 @@ class MainActivity : QkThemedActivity(), MainView {
		theme
		.autoDisposable(scope())
		.subscribe { theme ->
		// Set the color for the drawer icons
		val states = arrayOf(
		intArrayOf(android.R.attr.state_activated),
		intArrayOf(-android.R.attr.state_activated))

		resolveThemeColor(android.R.attr.textColorSecondary)
		.let { textSecondary -> ColorStateList(states, intArrayOf(getColor(R.color.tools_theme), textSecondary)) }
		.let { tintList ->
		inboxIcon.imageTintList = tintList
		inboxLabel.setTextColor(tintList)
		archivedIcon.imageTintList = tintList
		archivedLabel.setTextColor(tintList)
		}

		// Miscellaneous views
		listOf(plusBadge1, plusBadge2).forEach { badge ->