From eafb18690753eba5b340507069b150e376ff930d Mon Sep 17 00:00:00 2001
From: Marvin Stelter <41212885+MarvinStelter@users.noreply.github.com>
Date: Tue, 8 Aug 2023 20:32:20 +0200
Subject: [PATCH] =?UTF-8?q?Kontakt=20Button=20hinzugef=C3=BCgt=20About=20L?=
=?UTF-8?q?ayout=20bearbeitet?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.idea/codeStyles/Project.xml | 123 +++++++++++++
.idea/codeStyles/codeStyleConfig.xml | 5 +
.idea/kotlinc.xml | 6 +
.idea/migrations.xml | 10 ++
.../de/msdevs/einschlafhilfe/AboutActivity.kt | 11 +-
app/src/main/res/layout/activity_about.xml | 170 ++++++++++--------
app/src/main/res/values/strings.xml | 1 +
7 files changed, 249 insertions(+), 77 deletions(-)
create mode 100644 .idea/codeStyles/Project.xml
create mode 100644 .idea/codeStyles/codeStyleConfig.xml
create mode 100644 .idea/kotlinc.xml
create mode 100644 .idea/migrations.xml
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..7643783
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,123 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ xmlns:android
+
+ ^$
+
+
+
+
+
+
+
+
+ xmlns:.*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*:id
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ .*:name
+
+ http://schemas.android.com/apk/res/android
+
+
+
+
+
+
+
+
+ name
+
+ ^$
+
+
+
+
+
+
+
+
+ style
+
+ ^$
+
+
+
+
+
+
+
+
+ .*
+
+ ^$
+
+
+ BY_NAME
+
+
+
+
+
+
+ .*
+
+ http://schemas.android.com/apk/res/android
+
+
+ ANDROID_ATTRIBUTE_ORDER
+
+
+
+
+
+
+ .*
+
+ .*
+
+
+ BY_NAME
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..79ee123
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..7e340a7
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..f8051a6
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/de/msdevs/einschlafhilfe/AboutActivity.kt b/app/src/main/java/de/msdevs/einschlafhilfe/AboutActivity.kt
index 0eac48c..bdd7d61 100644
--- a/app/src/main/java/de/msdevs/einschlafhilfe/AboutActivity.kt
+++ b/app/src/main/java/de/msdevs/einschlafhilfe/AboutActivity.kt
@@ -5,7 +5,6 @@ import android.net.Uri
import android.os.Bundle
import android.widget.Button
import androidx.appcompat.app.AppCompatActivity
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
import de.msdevs.einschlafhilfe.databinding.ActivityAboutBinding
import net.cachapa.expandablelayout.ExpandableLayout
@@ -16,6 +15,7 @@ class AboutActivity : AppCompatActivity() {
private lateinit var btnPrivacy : Button
private lateinit var btnSource : Button
private lateinit var btnLicenses : Button
+ private lateinit var btnContact : Button
private lateinit var expandableLayout : ExpandableLayout
//TODO: RecyclerView für die Libraries nutzen -> Neue Libraries können besser hinzugefügt werden
@@ -37,6 +37,7 @@ class AboutActivity : AppCompatActivity() {
btnSource = binding.btnQuellcode
btnLicenses = binding.btnLicense
expandableLayout = binding.expandableLayout
+ btnContact = binding.btnContact
//TODO: RecyclerView für die Libraries nutzen -> Neue Libraries können besser hinzugefügt werden
btnCoOkHttp = binding.included.btnCoroutinesOkhttp
@@ -74,6 +75,14 @@ class AboutActivity : AppCompatActivity() {
btnAppIntro.setOnClickListener{
opennUrl("https://github.com/AppIntro/AppIntro")
}
+ btnGlide.setOnClickListener {
+ val intent = Intent(Intent.ACTION_SENDTO)
+ intent.setData(Uri.parse("mailto:"))
+ intent.putExtra(Intent.EXTRA_EMAIL, arrayOf("stelter.developer@gmail.com"))
+ intent.putExtra(Intent.EXTRA_SUBJECT, "Kontaktanfrage: DDF Folgenauswahl")
+ intent.putExtra(Intent.EXTRA_TEXT, "Deine Nachricht hier...")
+ startActivity(intent)
+ }
}
override fun onSupportNavigateUp(): Boolean {
onBackPressed()
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 69c4ebe..7dccc76 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -5,89 +5,107 @@
android:background="@color/black"
android:layout_height="match_parent">
-
-
-
-
-
-
-
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 762bb59..de4e45a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -63,4 +63,5 @@
OkHttp
Coroutines OkHttp
von Andrey Mischenko
+ Kontakt