Merge remote-tracking branch 'origin/fdroid_test_pending' (6989f9ac) · Commits · e / os / App Lounge

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

+26 −9

Original line number	Diff line number	Diff line
		@@ -155,21 +155,21 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,
		if (basicData.name.isNotEmpty()) {
		app_title.text = basicData.name
		} else {
		app_title.text = getString(R.string.not_available_full)
		app_title.visibility = View.GONE
		}

		// Set the app author
		if (basicData.author.isNotEmpty()) {
		app_author.text = basicData.author
		} else {
		app_author.text = getString(R.string.not_available_full)
		app_author.visibility = View.GONE
		}

		// Set the app category
		if (fullData.category.getTitle().isNotEmpty()) {
		app_category.text = fullData.category.getTitle()
		} else {
		app_category.text = getString(R.string.not_available_full)
		app_category.visibility = View.GONE
		}

		// Set the app description
		@@ -237,7 +237,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,
		if (fullData.getLastVersion()!!.fileSize.isNotEmpty()) {
		app_size.text = fullData.getLastVersion()!!.fileSize
		} else {
		app_size.text = getString(R.string.not_available)
		app_size.visibility = View.GONE
		}

		// Set the app privacy rating
		@@ -270,20 +270,21 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,

		// Set app update timestamp
		if (fullData.getLastVersion()!!.createdOn.isNotEmpty()) {
		app_updated_on.text = fullData.getLastVersion()!!.createdOn
		app_updated_on.text = getFormattedTimestamp(fullData.getLastVersion()!!.createdOn)
		} else {
		app_updated_on.text = getString(R.string.not_available)
		}

		// Set app minimum required Android version
		if (fullData.getLastVersion()!!.minAndroid.isNotEmpty()) {
		app_min_android.text = fullData.getLastVersion()!!.minAndroid
		app_min_android.text =
		getFormattedMinSdkVersion(fullData.getLastVersion()!!.minAndroid)
		} else {
		app_min_android.text = getString(R.string.not_available)
		}
		} else {
		// Set app size
		app_size.text = getString(R.string.not_available)
		app_size.visibility = View.GONE

		// Set app privacy rating
		app_privacy_score.text = getString(R.string.not_available)
		@@ -327,7 +328,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,
		}
		alertDialog.setMessage(message)
		} else {
		alertDialog.setMessage(getString(R.string.not_available_full))
		alertDialog.setMessage(getString(R.string.no_permissions))
		}
		} else {
		alertDialog.setMessage(getString(R.string.not_available_full))
		@@ -356,7 +357,7 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,
		}
		alertDialog.setMessage(message)
		} else {
		alertDialog.setMessage(getString(R.string.not_available_full))
		alertDialog.setMessage(getString(R.string.no_trackers))
		}
		} else {
		alertDialog.setMessage(getString(R.string.not_available_full))
		@@ -377,6 +378,22 @@ class ApplicationActivity : AppCompatActivity(), ApplicationStateListener,
		}
		}

		private fun getFormattedTimestamp(timestamp: String): String {
		return if (timestamp.contains(" ")) {
		timestamp.substring(0, timestamp.indexOf(" "))
		} else {
		timestamp
		}
		}

		private fun getFormattedMinSdkVersion(minSdkVersion: String): String {
		return if (minSdkVersion.contains(" (")) {
		minSdkVersion.substring(0, minSdkVersion.indexOf(" ("))
		} else {
		minSdkVersion
		}
		}

		private fun onInstallButtonClick(fullData: FullData) {
		// Make sure the APK is available for download
		if (fullData.getLastVersion() == null) {

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

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,8 @@
		<string name="app_licence">Licence</string>
		<string name="app_screenshots_title">Screenshots</string>
		<string name="download_notification_description">Downloading</string>
		<string name="no_permissions">No permissions requested</string>
		<string name="no_trackers">No trackers used</string>

		<!-- Application Description Activity -->
		<string name="application_description_activity_title">Description</string>