3624-UI_revamp (f0ab91dc) · Commits · e / os / AccountManager

app/build.gradle

+8 −1

Original line number	Diff line number	Diff line
		@@ -16,6 +16,10 @@ android {
		compileSdkVersion 29
		buildToolsVersion '29.0.2'

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

		defaultConfig {
		applicationId "foundation.e.accountmanager"

		@@ -105,6 +109,8 @@ android {
		}

		dependencies {
		compileOnly files("../e-ui-sdk.jar")

		implementation project(':cert4android')
		implementation project(':ical4android')
		implementation project(':vcard4android')
		@@ -114,6 +120,7 @@ dependencies {

		implementation 'androidx.appcompat:appcompat:1.1.0'
		implementation 'androidx.cardview:cardview:1.0.0'
		implementation 'androidx.recyclerview:recyclerview:1.1.0'
		implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
		implementation 'androidx.fragment:fragment-ktx:1.1.0'
		implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0'
		@@ -135,7 +142,7 @@ dependencies {
		}

		implementation 'com.jaredrummler:colorpicker:1.1.0'
		implementation('com.mikepenz:aboutlibraries:7.0.4')
		implementation('com.mikepenz:aboutlibraries:8.9.1')
		implementation "com.squareup.okhttp3:okhttp:${versions.okhttp}"
		implementation "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}"
		implementation 'commons-io:commons-io:2.6'

app/src/main/java/foundation/e/accountmanager/ui/ExceptionInfoFragment.kt

+1 −1

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@ class ExceptionInfoFragment: DialogFragment() {
		else -> R.string.exception
		}

		val dialog = MaterialAlertDialogBuilder(requireActivity())
		val dialog = MaterialAlertDialogBuilder(requireActivity(), R.style.CustomAlertDialogStyle)
		.setIcon(R.drawable.ic_error_dark)
		.setTitle(title)
		.setMessage(exception::class.java.name + "\n" + exception.localizedMessage)

app/src/main/java/foundation/e/accountmanager/ui/HomeSetAdapter.kt

+4 −3

Original line number	Diff line number	Diff line
		@@ -7,18 +7,19 @@ import android.view.View
		import android.view.ViewGroup
		import android.widget.ArrayAdapter
		import android.widget.TextView
		import foundation.e.accountmanager.R
		import foundation.e.accountmanager.model.HomeSet

		class HomeSetAdapter(
		context: Context
		): ArrayAdapter<HomeSet>(context, android.R.layout.simple_list_item_2, android.R.id.text1) {
		): ArrayAdapter<HomeSet>(context, R.layout.custom_simple_list_item_2, android.R.id.text1) {

		override fun getView(position: Int, convertView: View?, parent: ViewGroup): View {
		val data = getItem(position)!!

		val v: View
		if (!data.displayName.isNullOrBlank()) {
		v = convertView ?: LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_2, null, false)
		v = convertView ?: LayoutInflater.from(context).inflate(R.layout.custom_simple_list_item_2, null, false)
		v.findViewById<TextView>(android.R.id.text1).text = data.displayName
		v.findViewById<TextView>(android.R.id.text2).apply {
		text = data.url.toString()
		@@ -26,7 +27,7 @@ class HomeSetAdapter(
		ellipsize = TextUtils.TruncateAt.START
		}
		} else {
		v = convertView ?: LayoutInflater.from(context).inflate(android.R.layout.simple_list_item_1, null, false)
		v = convertView ?: LayoutInflater.from(context).inflate(R.layout.custom_simple_list_item_1, null, false)
		v.findViewById<TextView>(android.R.id.text1).apply {
		text = data.url.toString()
		setSingleLine()

app/src/main/java/foundation/e/accountmanager/ui/StartupDialogFragment.kt

+4 −4

Original line number	Diff line number	Diff line
		@@ -94,7 +94,7 @@ class StartupDialogFragment: DialogFragment() {
		val activity = requireActivity()
		return when (Mode.valueOf(arguments!!.getString(ARGS_MODE)!!)) {
		Mode.AUTOSTART_PERMISSIONS ->
		MaterialAlertDialogBuilder(activity)
		MaterialAlertDialogBuilder(activity, R.style.CustomAlertDialogStyle)
		.setIcon(R.drawable.ic_error_dark)
		.setTitle(R.string.startup_autostart_permission)
		.setMessage(getString(R.string.startup_autostart_permission_message, Build.MANUFACTURER))
		@@ -109,7 +109,7 @@ class StartupDialogFragment: DialogFragment() {
		.create()

		Mode.BATTERY_OPTIMIZATIONS ->
		MaterialAlertDialogBuilder(activity)
		MaterialAlertDialogBuilder(activity, R.style.CustomAlertDialogStyle)
		.setIcon(R.drawable.ic_info_dark)
		.setTitle(R.string.startup_battery_optimization)
		.setMessage(R.string.startup_battery_optimization_message)
		@@ -127,7 +127,7 @@ class StartupDialogFragment: DialogFragment() {
		val builder = StringBuilder(getString(R.string.startup_opentasks_not_installed_message))
		if (Build.VERSION.SDK_INT < 23)
		builder.append("\n\n").append(getString(R.string.startup_opentasks_reinstall_davx5))
		return MaterialAlertDialogBuilder(activity)
		return MaterialAlertDialogBuilder(activity, R.style.CustomAlertDialogStyle)
		.setIcon(R.drawable.ic_playlist_add_check_dark)
		.setTitle(R.string.startup_opentasks_not_installed)
		.setMessage(builder.toString())
		@@ -143,7 +143,7 @@ class StartupDialogFragment: DialogFragment() {
		}

		Mode.OSE_DONATE ->
		return MaterialAlertDialogBuilder(activity)
		return MaterialAlertDialogBuilder(activity, R.style.CustomAlertDialogStyle)
		.setIcon(R.mipmap.ic_launcher)
		.setTitle(R.string.startup_donate)
		.setMessage(R.string.startup_donate_message)

app/src/main/java/foundation/e/accountmanager/ui/account/AccountActivity.kt

+2 −1

Original line number	Diff line number	Diff line
		@@ -91,6 +91,7 @@ class AccountActivity: AppCompatActivity() {
		}

		override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
		super.onRequestPermissionsResult(requestCode, permissions, grantResults)
		if (grantResults.contains(PackageManager.PERMISSION_GRANTED))
		model.gotPermissions()
		}
		@@ -110,7 +111,7 @@ class AccountActivity: AppCompatActivity() {
		}

		fun deleteAccount(menuItem: MenuItem) {
		MaterialAlertDialogBuilder(this)
		MaterialAlertDialogBuilder(this, R.style.CustomAlertDialogStyle)
		.setIcon(R.drawable.ic_error_dark)
		.setTitle(R.string.account_delete_confirmation_title)
		.setMessage(R.string.account_delete_confirmation_text)