Increase icon and font size throughout the app, add titles for all sections on application screen (e3213232) · Commits · e / os / App Lounge

app/src/main/java/io/eelo/appinstaller/application/ApplicationActivity.kt

+38 −8

Original line number	Diff line number	Diff line
		@@ -5,6 +5,7 @@ import android.content.Intent
		import android.content.pm.PackageManager
		import android.graphics.Bitmap
		import android.os.Bundle
		import android.support.v7.app.AlertDialog
		import android.support.v7.app.AppCompatActivity
		import android.support.v7.widget.Toolbar
		import android.text.Html
		@@ -28,7 +29,6 @@ import io.eelo.appinstaller.utils.Error
		import io.eelo.appinstaller.utils.Execute
		import kotlinx.android.synthetic.main.activity_application.*
		import kotlinx.android.synthetic.main.install_button_layout.*
		import java.text.DecimalFormat
		import kotlin.math.roundToInt

		class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		@@ -37,6 +37,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		private var imageWidth = 0
		private var imageHeight = 0
		private var imageMargin = 0
		private var defaultElevation = 0f

		override fun onCreate(savedInstanceState: Bundle?) {
		super.onCreate(savedInstanceState)
		@@ -91,6 +92,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		imageWidth = Math.ceil(120 * logicalDensity.toDouble()).roundToInt()
		imageHeight = Math.ceil(210 * logicalDensity.toDouble()).roundToInt()
		imageMargin = Math.ceil(4 * logicalDensity.toDouble()).roundToInt()
		defaultElevation = Math.ceil(resources.getDimension(R.dimen.default_elevation) * logicalDensity.toDouble()).toFloat()
		}

		private fun onApplicationInfoLoaded() {
		@@ -119,7 +121,6 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		val appVersion = findViewById<TextView>(R.id.app_version)
		val appUpdatedOn = findViewById<TextView>(R.id.app_updated_on)
		val appMinAndroid = findViewById<TextView>(R.id.app_min_android)
		val appSource = findViewById<TextView>(R.id.app_source)
		val appLicence = findViewById<TextView>(R.id.app_licence)

		appTitle.visibility = View.GONE
		@@ -127,6 +128,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		appCategory.visibility = View.GONE
		appSize.visibility = View.GONE
		appDescriptionContainer.visibility = View.GONE
		app_screenshots_container.visibility = View.GONE
		app_images_scroll_view.visibility = View.GONE
		appImagesContainer.visibility = View.GONE
		appImagesDivider.visibility = View.GONE
		@@ -206,12 +208,6 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		appMinAndroid.text = getString(R.string.not_available)
		}

		if (fullData.source.isNotEmpty()) {
		appSource.text = fullData.source
		} else {
		appSource.text = getString(R.string.not_available)
		}

		if (fullData.licence.isNotEmpty()) {
		appLicence.text = fullData.licence
		} else {
		@@ -220,6 +216,39 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {

		application.addListener(this)
		stateChanged(application.state)

		toolbar.elevation = 0f
		if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
		scroll_view.setOnScrollChangeListener { view, ia, ib, ic, id ->
		if (view.scrollY == 0) {
		toolbar.elevation = 0f
		} else {
		toolbar.elevation = defaultElevation
		}
		}
		}

		app_permissions_container.setOnClickListener {
		val alertDialog = AlertDialog.Builder(this).create()
		alertDialog.setTitle(R.string.app_permissions_title)
		// TODO Set content
		alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(android.R.string.ok))
		{ _, _ ->
		alertDialog.dismiss()
		}
		alertDialog.show()
		}

		app_trackers_container.setOnClickListener {
		val alertDialog = AlertDialog.Builder(this).create()
		alertDialog.setTitle(R.string.app_trackers_title)
		// TODO Set content
		alertDialog.setButton(AlertDialog.BUTTON_POSITIVE, getString(android.R.string.ok))
		{ _, _ ->
		alertDialog.dismiss()
		}
		alertDialog.show()
		}
		}

		@SuppressLint("SetTextI18n")
		@@ -294,6 +323,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener {
		intent.putExtra(SELECTED_APPLICATION_SCREENSHOT_KEY, images.indexOf(it))
		startActivity(intent)
		}
		app_screenshots_container.visibility = View.VISIBLE
		app_images_scroll_view.visibility = View.VISIBLE
		imagesContainer.visibility = View.VISIBLE
		app_images_divider.visibility = View.VISIBLE

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -4,4 +4,5 @@
		<stroke
		android:width="2dp"
		android:color="@color/colorInstall" />
		<solid android:color="@color/colorInstall" />
		</shape>
		No newline at end of file

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

0 → 100644

+7 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<shape xmlns:android="http://schemas.android.com/apk/res/android">
		<corners android:radius="@dimen/default_radius" />
		<stroke
		android:width="2dp"
		android:color="@color/colorInstall" />
		</shape>
		No newline at end of file

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

deleted100644 → 0

+0 −9

Original line number	Diff line number	Diff line
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="640dp"
		android:height="512dp"
		android:viewportWidth="640"
		android:viewportHeight="512">
		<path
		android:fillColor="#FF000000"
		android:pathData="M272,80c53.473,0 99.279,32.794 118.426,79.363C401.611,149.793 416.125,144 432,144c35.346,0 64,28.654 64,64 0,11.829 -3.222,22.9 -8.817,32.407A96.998,96.998 0,0 1,496 240c53.019,0 96,42.981 96,96s-42.981,96 -96,96H160c-61.856,0 -112,-50.144 -112,-112 0,-56.428 41.732,-103.101 96.014,-110.859 -0.003,-0.381 -0.014,-0.76 -0.014,-1.141 0,-70.692 57.308,-128 128,-128m0,-48c-84.587,0 -155.5,59.732 -172.272,139.774C39.889,196.13 0,254.416 0,320c0,88.374 71.642,160 160,160h336c79.544,0 144,-64.487 144,-144 0,-61.805 -39.188,-115.805 -96.272,-135.891C539.718,142.116 491.432,96 432,96c-7.558,0 -15.051,0.767 -22.369,2.262C377.723,58.272 328.091,32 272,32z"/>
		</vector>