From a3abf9e55d8b7034278e382cb851df07d854dfc2 Mon Sep 17 00:00:00 2001
From: Nishith Khanna <nishithkhanna@e.email>
Date: Tue, 22 Oct 2024 15:48:20 +0530
Subject: [PATCH] Rework about screen

Changes title from Etar to Calendar
Makes app icon smaller
Hide some ui elements which we don't need
Change author text to include our name
Clicking on author points to our source code
---
 .../main/java/com/android/calendar/AboutActivity.kt    |  2 +-
 .../main/java/com/android/calendar/AboutFragment.kt    |  2 +-
 app/src/main/res/layout/about.xml                      | 10 ++++++----
 app/src/main/res/menu/calendar_view.xml                |  2 +-
 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml     |  4 ++--
 app/src/main/res/values-de/e_strings.xml               |  4 +++-
 app/src/main/res/values-es/e_strings.xml               |  4 +++-
 app/src/main/res/values-fr/e_strings.xml               |  4 +++-
 app/src/main/res/values-is/e_strings.xml               |  1 +
 app/src/main/res/values-it/e_strings.xml               |  4 +++-
 app/src/main/res/values/e_strings.xml                  |  2 ++
 app/src/main/res/values/strings.xml                    |  4 ++--
 12 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/app/src/main/java/com/android/calendar/AboutActivity.kt b/app/src/main/java/com/android/calendar/AboutActivity.kt
index 7aa4e624..dbfac72d 100644
--- a/app/src/main/java/com/android/calendar/AboutActivity.kt
+++ b/app/src/main/java/com/android/calendar/AboutActivity.kt
@@ -18,7 +18,7 @@ class AboutActivity : AppCompatActivity() {
         setContentView(binding.root)
         setSupportActionBar(binding.include.toolbar)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
-        title = getString(R.string.preferences_menu_about)
+        title = getString(R.string.e_preferences_menu_about)
 
         if (savedInstanceState == null) {
             supportFragmentManager
diff --git a/app/src/main/java/com/android/calendar/AboutFragment.kt b/app/src/main/java/com/android/calendar/AboutFragment.kt
index 792de2ad..ddc95d63 100644
--- a/app/src/main/java/com/android/calendar/AboutFragment.kt
+++ b/app/src/main/java/com/android/calendar/AboutFragment.kt
@@ -42,7 +42,7 @@ class AboutFragment : Fragment() {
         view.findViewById<TextView>(R.id.version).text = BuildConfig.VERSION_NAME
 
         val year = Calendar.getInstance().get(Calendar.YEAR).toString()
-        view.findViewById<TextView>(R.id.copyright).text = getString(R.string.app_copyright, year)
+        view.findViewById<TextView>(R.id.copyright).text = getString(R.string.e_app_copyright, year)
 
         view.findViewById<LinearLayout>(R.id.authorsLayout).setOnClickListener {
             startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(getString(R.string.app_authors_url))))
diff --git a/app/src/main/res/layout/about.xml b/app/src/main/res/layout/about.xml
index 82d03461..3ced97cc 100644
--- a/app/src/main/res/layout/about.xml
+++ b/app/src/main/res/layout/about.xml
@@ -17,8 +17,8 @@
 
             <ImageView
                 android:src="@mipmap/ic_launcher"
-                android:layout_width="120dp"
-                android:layout_height="120dp"
+                android:layout_width="72dp"
+                android:layout_height="72dp"
                 android:layout_gravity="center"
                 android:layout_margin="16dp" />
 
@@ -33,7 +33,8 @@
                 android:gravity="center_vertical"
                 android:clickable="true"
                 android:focusable="true"
-                android:background="?attr/selectableItemBackground">
+                android:background="?attr/selectableItemBackground"
+                android:visibility="gone">
                 <ImageView
                     android:src="@drawable/ic_create"
                     android:layout_width="24dp"
@@ -137,7 +138,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="16dp"
-                android:layout_gravity="center_vertical">
+                android:layout_gravity="center_vertical"
+                android:visibility="gone">
                 <Button
                     android:id="@+id/source"
                     android:layout_width="wrap_content"
diff --git a/app/src/main/res/menu/calendar_view.xml b/app/src/main/res/menu/calendar_view.xml
index 89352fb9..82cc8e68 100644
--- a/app/src/main/res/menu/calendar_view.xml
+++ b/app/src/main/res/menu/calendar_view.xml
@@ -31,7 +31,7 @@
         <item
             android:id="@+id/action_about"
             android:icon="@drawable/ic_info"
-            android:title="@string/preferences_menu_about" />
+            android:title="@string/e_preferences_menu_about" />
 
     </group>
 </menu>
diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index 81cae2c4..52819092 100644
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -15,6 +15,6 @@
   ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
   -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <background android:drawable="@drawable/e_month_may"/>
+    <foreground android:drawable="@drawable/e_day_7"/>
 </adaptive-icon>
diff --git a/app/src/main/res/values-de/e_strings.xml b/app/src/main/res/values-de/e_strings.xml
index a6b3daec..1b290b6f 100644
--- a/app/src/main/res/values-de/e_strings.xml
+++ b/app/src/main/res/values-de/e_strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="e_preferences_menu_about">Über Kalender</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-es/e_strings.xml b/app/src/main/res/values-es/e_strings.xml
index a6b3daec..f45bce3e 100644
--- a/app/src/main/res/values-es/e_strings.xml
+++ b/app/src/main/res/values-es/e_strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="e_preferences_menu_about">Acerca de Calendario</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-fr/e_strings.xml b/app/src/main/res/values-fr/e_strings.xml
index a6b3daec..67784c5d 100644
--- a/app/src/main/res/values-fr/e_strings.xml
+++ b/app/src/main/res/values-fr/e_strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="e_preferences_menu_about">À propos du calendrier</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-is/e_strings.xml b/app/src/main/res/values-is/e_strings.xml
index bf287246..adf243d9 100644
--- a/app/src/main/res/values-is/e_strings.xml
+++ b/app/src/main/res/values-is/e_strings.xml
@@ -6,4 +6,5 @@
     <string name="import_multi_event_confirmation_toast">Það tókst að útbúa þessa atburði.</string>
     <string name="import_multi_event_single_event_failure_toast">Innflutningur á %s í dagatalið þitt mistókst</string>
     <string name="pick_calendar_error_importing_events">Tókst ekki að bæta atburðum í dagatalið.</string>
+    <string name="e_preferences_menu_about">Um dagatalið</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-it/e_strings.xml b/app/src/main/res/values-it/e_strings.xml
index a6b3daec..149d484d 100644
--- a/app/src/main/res/values-it/e_strings.xml
+++ b/app/src/main/res/values-it/e_strings.xml
@@ -1,2 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources></resources>
\ No newline at end of file
+<resources>
+    <string name="e_preferences_menu_about">Informazioni su Calendario</string>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/e_strings.xml b/app/src/main/res/values/e_strings.xml
index 1f87d801..fe3c5318 100644
--- a/app/src/main/res/values/e_strings.xml
+++ b/app/src/main/res/values/e_strings.xml
@@ -30,4 +30,6 @@
     <string name="import_multi_event_single_event_failure_toast">Importing %s in your calendar failed</string>
     <!-- Toast message when importing multi event failed -->
     <string name="pick_calendar_error_importing_events">Couldn\'t add events to the calendar.</string>
+    <string name="e_preferences_menu_about">About Calendar</string>
+    <string name="e_app_copyright">\u00a9 2024 e Foundation \u00a9 2015-<xliff:g>%1$s</xliff:g> The Etar Project. Portions \u00a9 2005-<xliff:g>%1$s</xliff:g> The Android Open Source Project.</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 7b61a0ed..5f9f4fce 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -553,8 +553,8 @@
     <string name="preferences_default_snooze_delay_default" translatable="false">5</string>
 
     <!-- About dialog strings -->
-    <string name="app_authors" translatable="false">The Etar Project</string>
-    <string name="app_authors_url" translatable="false">https://github.com/Etar-Group/Etar-Calendar/graphs/contributors</string>
+    <string name="app_authors" translatable="false">The Etar Project and e Foundation</string>
+    <string name="app_authors_url" translatable="false">https://gitlab.e.foundation/e/os/etar_calendar</string>
     <string name="app_changelog" translatable="false">https://github.com/Etar-Group/Etar-Calendar/releases</string>
     <string name="app_copyright">\u00a9 2015-<xliff:g>%1$s</xliff:g> The Etar Project. Portions \u00a9 2005-<xliff:g>%1$s</xliff:g> The Android Open Source Project.</string>
     <string name="app_issues_url" translatable="false">https://github.com/Etar-Group/Etar-Calendar/issues</string>
-- 
GitLab