Resolve updated button bug on rebooting (bbcfac35) · Commits · e / os / App Lounge

app/src/main/java/foundation/e/apps/application/ApplicationViewHolder.kt

+20 −16

Original line number	Original line	Diff line number	Diff line
	@@ -161,8 +161,7 @@ var accentColorOS=accentColorOS;
	State.NOT_DOWNLOADED -> {		State.NOT_DOWNLOADED -> {
	if (0 != this.accentColorOS) {		if (0 != this.accentColorOS) {
	installButton.setTextColor(this.accentColorOS)		installButton.setTextColor(this.accentColorOS)
	}		} else {
	else{

	installButton.setTextColor(Color.parseColor("#0088ED"))		installButton.setTextColor(Color.parseColor("#0088ED"))
	}		}
	@@ -176,8 +175,7 @@ var accentColorOS=accentColorOS;
	Common.appHasLaunchActivity(activity, application!!.packageName)		Common.appHasLaunchActivity(activity, application!!.packageName)
	if (0 != this.accentColorOS) {		if (0 != this.accentColorOS) {
	installButton!!.setBackgroundColor(this.accentColorOS)		installButton!!.setBackgroundColor(this.accentColorOS)
	}		} else {
	else{
	installButton!!.setBackgroundResource(R.drawable.app_install_border)		installButton!!.setBackgroundResource(R.drawable.app_install_border)
	}		}
	installButton.setTextColor(Color.parseColor("#FAFAFA"))		installButton.setTextColor(Color.parseColor("#FAFAFA"))
	@@ -187,14 +185,20 @@ var accentColorOS=accentColorOS;
	installButton?.isEnabled = false		installButton?.isEnabled = false
	}		}
	State.NOT_UPDATED -> {		State.NOT_UPDATED -> {
			if (application?.packageName == Constants.MICROG_PACKAGE) {
			installButton.setBackgroundResource(R.drawable.app_install_border_simple)
			installButton.text = "Install"
			installButton.setTextColor(this.accentColorOS)
			} else {
	installButton.setTextColor(Color.parseColor("#FAFAFA"))		installButton.setTextColor(Color.parseColor("#FAFAFA"))
	//installButton!!.setBackgroundResource(R.drawable.app_install_border)		//installButton!!.setBackgroundResource(R.drawable.app_install_border)
	if (0 != this.accentColorOS) {		if (0 != this.accentColorOS) {
	installButton!!.setBackgroundColor(this.accentColorOS)		installButton!!.setBackgroundColor(this.accentColorOS)
	}		} else {
	else{
	installButton!!.setBackgroundResource(R.drawable.app_install_border)		installButton!!.setBackgroundResource(R.drawable.app_install_border)
	}		}
			}

	installButton?.isEnabled = true		installButton?.isEnabled = true
	}		}
	else -> {		else -> {

app/src/main/java/foundation/e/apps/categories/category/CategoryActivity.kt

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -66,6 +66,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio
	override fun onCreate(savedInstanceState: Bundle?) {		override fun onCreate(savedInstanceState: Bundle?) {
	super.onCreate(savedInstanceState)		super.onCreate(savedInstanceState)
	setContentView(R.layout.activity_category)		setContentView(R.layout.activity_category)
			getAccentColor()

	val toolbar = findViewById<Toolbar>(R.id.toolbar)		val toolbar = findViewById<Toolbar>(R.id.toolbar)
	setSupportActionBar(toolbar)		setSupportActionBar(toolbar)
	@@ -115,7 +116,7 @@ class CategoryActivity : AppCompatActivity(), ApplicationManagerServiceConnectio
	// Initialise recycler view		// Initialise recycler view
	recyclerView.setHasFixedSize(true)		recyclerView.setHasFixedSize(true)
	recyclerView.layoutManager = LinearLayoutManager(this)		recyclerView.layoutManager = LinearLayoutManager(this)
	recyclerView.adapter = ApplicationListAdapter(this, applicationList, 0)		recyclerView.adapter = ApplicationListAdapter(this, applicationList, accentColorOS)

	// Bind to the list of applications in this activity's category		// Bind to the list of applications in this activity's category
	categoryViewModel.getApplications().observe(this, Observer {		categoryViewModel.getApplications().observe(this, Observer {