Merge pull request #10 from Myzel394/new-improvements

New improvements

HELP.md

@@ -0,0 +1,58 @@
+# Help
+
+## ⌚ Add more time zones?
+
+This is not planned.
+
+Each time zone has its' own set of rules:
+- Offset from GMT
+- Daylight saving time offset
+- Date when daylight saving time is used
+
+This data always changes.
+There are 3 solutions:
+
+### 1. Paid API service
+
+**✅Pros:**
+- Almost all time zones and cities
+- Always up-to-date
+
+**❌Cons:**
+- Extra money costs
+- Needs Internet, can go down, needs a caching mechanism
+- The API might change and we'd need to keep it up-to-date
+- Needs to be translated
+
+### 2. Create my own API service
+Pros and cons are same, except being a bit cheaper (you still need to pay).
+
+### 3. Android's time zone provider (this is what NumberHub uses)
+
+read more: https://source.android.com/docs/core/permissions/timezone-rules
+
+**✅Pros:**
+- Almost all time zones
+- Completely for free
+- No extra translations (automatically provided by the system)
+- No sudden API changes
+- Works offline, never goes down
+
+**❌Cons:**
+- Less cities
+- Less frequent updates
+</details>
+
+## 👩‍⚕️ Body Mass Index
+
+Please note that the values displayed in the app are intended for entertainment purposes only. They can not replace professional medical advice.
+
+Please don't use the Body Mass calculator if you are:
+- Under 21 years old
+- Pregnant
+- Diagnosed with an eating disorder
+
+Please contact your care provider for more information.
+
+## 💵 Wrong Currency Rates?
+Currency rates are updated daily. There's no real-time market monitoring on NumberHub.

PRIVACY.md

@@ -0,0 +1,45 @@
+**Privacy Policy**
+
+This privacy policy applies to the NumberHub app (hereby referred to as "Application") for mobile devices that was created by Myzel394 (hereby referred to as "Service Provider") as an Open Source service. This service is intended for use "AS IS".
+
+**Third Party Access**
+
+The service uses external services to fetch data for the user. The Service Provider does not have control over the data that is fetched from these services. 
+
+The Service Provider may disclose User Provided and Automatically Collected Information:
+
+*   as required by law, such as to comply with a subpoena, or similar legal process;
+*   when they believe in good faith that disclosure is necessary to protect their rights, protect your safety or the safety of others, investigate fraud, or respond to a government request;
+*   with their trusted services providers who work on their behalf, do not have an independent use of the information we disclose to them, and have agreed to adhere to the rules set forth in this privacy statement.
+
+**Opt-Out Rights**
+
+You can stop all collection of information by the Application easily by uninstalling it. You may use the standard uninstall processes as may be available as part of your mobile device or via the mobile application marketplace or network.
+
+**Children**
+
+The Service Provider does not use the Application to knowingly solicit data from or market to children under the age of 13.
+
+The Service Provider does not knowingly collect personally identifiable information from children. The Service Provider encourages all children to never submit any personally identifiable information through the Application and/or Services. The Service Provider encourage parents and legal guardians to monitor their children's Internet usage and to help enforce this Policy by instructing their children never to provide personally identifiable information through the Application and/or Services without their permission. If you have reason to believe that a child has provided personally identifiable information to the Service Provider through the Application and/or Services, please contact the Service Provider (google-play.29k1a@aleeas.com) so that they will be able to take the necessary actions. You must also be at least 16 years of age to consent to the processing of your personally identifiable information in your country (in some countries we may allow your parent or guardian to do so on your behalf).
+
+**Security**
+
+The Service Provider is concerned about safeguarding the confidentiality of your information. The Service Provider provides physical, electronic, and procedural safeguards to protect information the Service Provider processes and maintains.
+
+**Changes**
+
+This Privacy Policy may be updated from time to time for any reason. The Service Provider will notify you of any changes to the Privacy Policy by updating this page with the new Privacy Policy. You are advised to consult this Privacy Policy regularly for any changes, as continued use is deemed approval of all changes.
+
+This privacy policy is effective as of 2024-05-15
+
+**Your Consent**
+
+By using the Application, you are consenting to the processing of your information as set forth in this Privacy Policy now and as amended by us.
+
+**Contact Us**
+
+If you have any questions regarding privacy while using the Application, or have questions about the practices, please contact the Service Provider via email at google-play.29k1a@aleeas.com.
+
+* * *
+
+This privacy policy page was generated by [App Privacy Policy Generator](https://app-privacy-policy-generator.nisrulz.com/)

README.md

@@ -1,3 +1,10 @@
+# NumberHub
+➗ Your Hub for ✖️ Math / 💲 Currency rates / 📆 Date calculations / ⌚ Time zones
+
+> [!NOTE]  
+> This app was originally created by [sadellie](https://github.com/sadellie).
+    Unfortunately, it has been archived on March 1st, 2024 (https://github.com/sadellie/unitto) without any notice or explanation. Since there has been no activity from sadellie on GitHub since then, I guess they are not actively working on projects anymore. I will maintain this app, but I do not plan to add new features. I don't have enough time to do that, but you are welcome to contribute. I will review and merge your pull requests.
+
 <p align="middle">
     <img src="./fastlane/metadata/android/en-US/images/featureGraphic.png" width="97%" />
     <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/slide1.png" width="19%" />
@@ -7,14 +14,32 @@
     <img src="./fastlane/metadata/android/en-US/images/phoneScreenshots/slide5.png" width="19%" />
 </p>
 
-## Notice
+# Download NumberHub
 
-This app was originally created by [sadellie](https://github.com/sadellie).
-Unfortunately, it has been archived on March 1st, 2024 (https://github.com/sadellie/unitto)
-without any notice or explanation.
-Since there has been no activity from sadellie on GitHub since then, I guess
-they are not actively working on projects anymore.
+[<img src="readme_content/google-play-badge.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=app.myzel394.numberhub)
+[<img src="readme_content/github-badge.png" alt="Get it on GitHub" height="80">](https://github.com/Myzel394/NumberHub/releases)
+[<img src="readme_content/obtainium-badge.png" alt="Get it on Obtainium" height="80">](https://apps.obtainium.imranr.dev/redirect?r=obtainium://add/https://github.com/Myzel394/NumberHub//)
 
-I will maintain this app, but I do not plan to add new features.
-I don't have enough time to do that, but you are welcome to contribute.
-I will review and merge your pull requests.
+# Support NumberHub
+
+You can support NumberHub in various ways:
+
+## Contribute to the project
+
+Add a new feature or fix bugs.
+
+## Add translations
+
+To add a translation, update the strings in `core/base/src/main/res/LANG/strings.xml` and open a PR
+
+## Donate
+
+It might sound crazy, but if you would just donate 1$, it would totally mean to world to me, since
+it's a really small amount and if everyone did that, I can totally focus on NumberHub
+and my other open source projects. :)
+
+You can donate via [GitHub Sponsors](https://github.com/sponsors/Myzel394)
+or via [crypto currencies](https://github.com/Myzel394/contact-me?tab=readme-ov-file#donations).
+
+## Help
+See [HELP.md](HELP.md)

SECURITY.md

@@ -0,0 +1,30 @@
+### `com.sadellie.numberhub.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION`
+
+Read (boring): https://developer.android.com/about/versions/14/behavior-changes-14#runtime-receivers-exported
+
+### `android.permission.INTERNET`
+
+Used in **Unit Converter** to update currency rates. Requests are made only when you select a currency unit.
+
+### `android.permission.ACCESS_NETWORK_STATE`
+
+Used in Unit Converter as a callback. Retries to update currency rates if there was an error (no network, for example) and the Internet connection is back.
+
+### `android.permission.WAKE_LOCK`
+
+Not used explicitly. Added automatically by Widget feature.
+
+### `android.permission.RECEIVE_BOOT_COMPLETED`
+
+Not used explicitly. Added automatically by Widget feature.
+
+### `android.permission.FOREGROUND_SERVICE`
+
+Not used explicitly. Added automatically by Widget feature.
+
+### Non-free network service
+
+Non-free means that you can't host the given service on your machine.
+
+The app uses [Free Currency Rates API by fawazahmed0](https://github.com/fawazahmed0/exchange-api). Requests are send to `cdn.jsdelivr.net`. 
+

app/src/debug/AndroidManifest.xml

@@ -20,7 +20,7 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <application
-        android:label="Fuck You"
+        android:label="NumberHubber (Debug)"
         tools:ignore="MissingApplicationIcon"
         tools:replace="android:label" />
 

core/base/src/main/res/values-de/strings.xml

@@ -83,7 +83,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Zeit auswählen</string>
-    <string name="settings_about_unitto">Über Unitto</string>
+    <string name="settings_about_unitto">Über NumberHub</string>
     <string name="settings_about_unitto_support">Mehr über die App erfahren</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-en-rGB/strings.xml

@@ -83,7 +83,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Select time</string>
-    <string name="settings_about_unitto">About Unitto</string>
+    <string name="settings_about_unitto">About NumberHub</string>
     <string name="settings_about_unitto_support">Learn about the app</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-es/strings.xml

@@ -203,7 +203,7 @@ Used in this dialog window. Should be short -->
 https://s3.eu-west-1.amazonaws.com/po-pub/i/1oIHPj16krI0jyLmg4JaP2mk.png -->
     <!-- Screen readers (accessibility) -->
     <string name="selected_item">Item seleccionado</string>
-    <string name="settings_about_unitto">Acerca de Unitto</string>
+    <string name="settings_about_unitto">Acerca de NumberHub</string>
     <string name="settings_about_unitto_support">Más información sobre la app</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-fr/strings.xml

@@ -78,7 +78,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Choisir le temps</string>
-    <string name="settings_about_unitto">À propos d\'Unitto</string>
+    <string name="settings_about_unitto">À propos d\'NumberHub</string>
     <string name="settings_about_unitto_support">En savoir plus sur l\'application</string>
     <string name="settings_additional">Additional</string>
     <string name="settings_amoled_dark">AMOLED Noir</string>

core/base/src/main/res/values-hu/strings.xml

@@ -46,7 +46,7 @@
     <string name="open_menu_description">Menü megnyitása</string>
     <string name="open_settings_label">Beállítások megnyitása</string>
     <string name="search_button_description">Keresőgomb</string>
-    <string name="settings_about_unitto">Az Unitto-ról</string>
+    <string name="settings_about_unitto">Az NumberHub-ról</string>
     <string name="settings_about_unitto_support">Tudj meg többet az appról</string>
     <string name="settings_additional">Továbbiak</string>
     <string name="settings_amoled_dark">AMOLED Sötét</string>

core/base/src/main/res/values-in/strings.xml

@@ -78,7 +78,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Pilih waktu</string>
-    <string name="settings_about_unitto">Tentang Unitto</string>
+    <string name="settings_about_unitto">Tentang NumberHub</string>
     <string name="settings_about_unitto_support">Pelajari tentang aplikasi</string>
     <string name="settings_amoled_dark">Gelap AMOLED</string>
     <string name="settings_amoled_dark_support">Gunakan latar hitam untuk tema gelap</string>

core/base/src/main/res/values-it/strings.xml

@@ -137,7 +137,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Seleziona orario</string>
-    <string name="settings_about_unitto">Riguardo a Unitto</string>
+    <string name="settings_about_unitto">Riguardo a NumberHub</string>
     <string name="settings_about_unitto_support">Impara riguardo all\'app</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-nl/strings.xml

@@ -203,7 +203,7 @@ Used in this dialog window. Should be short -->
 https://s3.eu-west-1.amazonaws.com/po-pub/i/1oIHPj16krI0jyLmg4JaP2mk.png -->
     <!-- Screen readers (accessibility) -->
     <string name="selected_item">Geselecteerd item</string>
-    <string name="settings_about_unitto">Over Unitto</string>
+    <string name="settings_about_unitto">Over NumberHub</string>
     <string name="settings_about_unitto_support">Leer meer over de app</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-pt-rBR/strings.xml

@@ -83,7 +83,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Selecione o horário</string>
-    <string name="settings_about_unitto">Sobre o Unitto</string>
+    <string name="settings_about_unitto">Sobre o NumberHub</string>
     <string name="settings_about_unitto_support">Saiba mais sobre o app</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-ru/strings.xml

@@ -203,7 +203,7 @@ Used in this dialog window. Should be short -->
 https://s3.eu-west-1.amazonaws.com/po-pub/i/1oIHPj16krI0jyLmg4JaP2mk.png -->
     <!-- Screen readers (accessibility) -->
     <string name="selected_item">Выбранные элемент</string>
-    <string name="settings_about_unitto">О Unitto</string>
+    <string name="settings_about_unitto">О NumberHub</string>
     <string name="settings_about_unitto_support">Узнайте больше о приложении</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->

core/base/src/main/res/values-tr/strings.xml

@@ -80,7 +80,7 @@ Used in this dialog window. Should be short -->
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/uWOHJmIq9riqsq7PO82ZQp3a.png -->
     <string name="select_time_label">Zaman seçin</string>
-    <string name="settings_about_unitto">Unitto hakkında</string>
+    <string name="settings_about_unitto">NumberHub hakkında</string>
     <string name="settings_about_unitto_support">Uygulama hakkında bilgi edinin</string>
 
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/p3aY3IWUI5m9Vjs6vZP3EXAo.png -->
@@ -146,7 +146,7 @@ Maybe this can be labeled better? Let me know. It should be something that can d
     <string name="settings_space">Boşluk</string>
     <string name="settings_starting_screen">Başlangıç ekranı</string>
     <string name="settings_starting_screen_support">Uygulamayı başlattığınızda hangi ekranın gösterileceğini seçin</string>
-
+    
     <!-- https://s3.eu-west-1.amazonaws.com/po-pub/i/r1VikAn70eXQP4da2hrntTGQ.jpg -->
     <!-- Option name to use system default setting -->
     <string name="settings_system">Sistem</string>

core/base/src/main/res/values-zh-rCN/strings.xml

@@ -135,7 +135,7 @@ Used in this dialog window. Should be short -->
 https://s3.eu-west-1.amazonaws.com/po-pub/i/1oIHPj16krI0jyLmg4JaP2mk.png -->
     <!-- Screen readers (accessibility) -->
     <string name="selected_item">已选定项目</string>
-    <string name="settings_about_unitto">关于 Unitto</string>
+    <string name="settings_about_unitto">关于 NumberHub</string>
     <string name="settings_about_unitto_support">了解此应用</string>
     <string name="settings_additional">额外的</string>
     <string name="settings_amoled_dark">AMOLED 黑</string>

fastlane/metadata/android/en-US/full_description.txt

@@ -29,28 +29,5 @@ Look for <b>Calculator</b> on your home screen after installing the app.
 • Add to favorites
 • Add labels to time zones
 
-<b>Permissions</b>
-
-app.myzel394.numberhub.DYNAMIC_RECEIVER_NOT_EXPORTED_PERMISSION
-Read (boring): https://developer.android.com/about/versions/14/behavior-changes-14#runtime-receivers-exported
-
-android.permission.INTERNET
-Used in Unit Converter to update currency rates. Requests are made only when you select a currency unit.
-
-android.permission.ACCESS_NETWORK_STATE
-Used in Unit Converter as a callback. Retries to update currency rates if there was an error (no network, for example) and the Internet connection is back.
-
-android.permission.WAKE_LOCK
-Not used explicitly. Added automatically by Widget feature.
-
-android.permission.RECEIVE_BOOT_COMPLETED
-Not used explicitly. Added automatically by Widget feature.
-
-android.permission.FOREGROUND_SERVICE
-Not used explicitly. Added automatically by Widget feature.
-
-Non-free network service
-<i>Non-free</i> doesn't mean that you need to pay, put your credit card away. In this context it means that you can't host it on your machine.
-
 The app uses https://github.com/fawazahmed0/currency-api by https://github.com/fawazahmed0
 Requests are send to cdn.jsdelivr.net.

fastlane/metadata/android/en-US/short_description.txt

@@ -1 +1 @@
-Calculator, converter and more
+Your Hub for ✖️ Math / 💲 Currency rates / 📆 Date calculations / ⌚ Time zones...

feature/bodymass/src/main/java/app/myzel394/numberhub/feature/bodymass/BodyMassScreen.kt

@@ -204,7 +204,7 @@ private fun BodyMassScreen(
 
             ElevatedButton(
                 onClick = {
-                    openLink(mContext, "https://sadellie.github.io/unitto/help#body-mass-index")
+                    openLink(mContext, "https://github.com/Myzel394/NumberHub/blob/master/HELP.md#body-mass-index")
                 },
             ) {
                 Text(text = stringResource(R.string.time_zone_no_results_button)) // TODO Rename

feature/settings/src/main/java/app/myzel394/numberhub/feature/settings/about/AboutScreen.kt

@@ -86,18 +86,18 @@ private fun AboutScreen(
             }
 
             // TERMS AND CONDITIONS
-            item {
-                ListItem(
-                    icon = Icons.Default.PrivacyTip,
-                    headlineText = stringResource(R.string.settings_terms_and_conditions),
-                    modifier = Modifier.clickable {
-                        openLink(
-                            mContext,
-                            "https://sadellie.github.io/unitto/terms",
-                        )
-                    },
-                )
-            }
+            // item {
+            //     ListItem(
+            //         icon = Icons.Default.PrivacyTip,
+            //         headlineText = stringResource(R.string.settings_terms_and_conditions),
+            //         modifier = Modifier.clickable {
+            //             openLink(
+            //                 mContext,
+            //                 "https://sadellie.github.io/unitto/terms",
+            //             )
+            //         },
+            //     )
+            // }
 
             // PRIVACY POLICY
             item {
@@ -107,7 +107,7 @@ private fun AboutScreen(
                     modifier = Modifier.clickable {
                         openLink(
                             mContext,
-                            "https://sadellie.github.io/unitto/privacy",
+                            "https://github.com/Myzel394/NumberHub/blob/master/PRIVACY.md",
                         )
                     },
                 )

logo.svg

@@ -0,0 +1,15 @@
+<svg width="108" height="108" viewBox="0 0 108 108" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="108" height="108" rx="54" fill="white"/>
+<path d="M72.1693 56.3386C76.3679 56.3386 80.3945 58.0065 83.3633 60.9753C86.3321 63.9442 88 67.9708 88 72.1693C88 76.3679 86.3321 80.3945 83.3633 83.3633C80.3945 86.3321 76.3679 88 72.1693 88C67.9707 88 63.9441 86.3321 60.9753 83.3633C58.0065 80.3945 56.3386 76.3679 56.3386 72.1693C56.3386 67.9708 58.0065 63.9442 60.9753 60.9753C63.9441 58.0065 67.9707 56.3386 72.1693 56.3386Z" fill="#378648"/>
+<path d="M63.1746 72.1693C63.1746 70.9766 64.1406 70.0106 65.3333 70.0106H79.0053C80.198 70.0106 81.164 70.9766 81.164 72.1693C81.164 73.362 80.198 74.328 79.0053 74.328H65.3333C64.1406 74.328 63.1746 73.362 63.1746 72.1693Z" fill="#FCFCF7"/>
+<path d="M70.0106 65.6931C70.0106 64.5004 70.9766 63.5344 72.1693 63.5344C73.362 63.5344 74.3281 64.5004 74.3281 65.6931C74.3281 66.8858 73.362 67.8519 72.1693 67.8519C70.9766 67.8519 70.0106 66.8858 70.0106 65.6931Z" fill="#FCFCF7"/>
+<path d="M70.0106 78.6455C70.0106 77.4528 70.9766 76.4868 72.1693 76.4868C73.362 76.4868 74.3281 77.4528 74.3281 78.6455C74.3281 79.8382 73.362 80.8042 72.1693 80.8042C70.9766 80.8042 70.0106 79.8382 70.0106 78.6455Z" fill="#FCFCF7"/>
+<path d="M35.8307 56.3386C40.0292 56.3386 44.0558 58.0065 47.0247 60.9753C49.9935 63.9442 51.6614 67.9708 51.6614 72.1693C51.6614 76.3679 49.9935 80.3945 47.0247 83.3633C44.0558 86.3321 40.0292 88 35.8307 88C31.6321 88 27.6055 86.3321 24.6367 83.3633C21.6679 80.3945 20 76.3679 20 72.1693C20 67.9708 21.6679 63.9442 24.6367 60.9753C27.6055 58.0065 31.6321 56.3386 35.8307 56.3386Z" fill="#378648"/>
+<path d="M28.6619 65.0005C29.4175 64.2449 30.6443 64.2449 31.3999 65.0005L43.138 76.7386C43.8935 77.4942 43.8935 78.721 43.138 79.4766C42.3824 80.2321 41.1555 80.2321 40.4 79.4766L28.6619 67.7385C27.9063 66.9829 27.9063 65.7561 28.6619 65.0005Z" fill="#FCFCF7"/>
+<path d="M43.138 65.0005C43.8935 65.7561 43.8935 66.9829 43.138 67.7385L31.3999 79.4766C30.6443 80.2321 29.4175 80.2321 28.6619 79.4766C27.9063 78.721 27.9063 77.4942 28.6619 76.7386L40.4 65.0005C41.1555 64.2449 42.3824 64.2449 43.138 65.0005Z" fill="#FCFCF7"/>
+<path d="M72.1693 20C76.3679 20 80.3945 21.6679 83.3633 24.6367C86.3321 27.6055 88 31.6321 88 35.8307C88 40.0292 86.3321 44.0558 83.3633 47.0247C80.3945 49.9935 76.3679 51.6614 72.1693 51.6614C67.9707 51.6614 63.9441 49.9935 60.9753 47.0247C58.0065 44.0558 56.3386 40.0292 56.3386 35.8307C56.3386 31.6321 58.0065 27.6055 60.9753 24.6367C63.9441 21.6679 67.9707 20 72.1693 20Z" fill="#378648"/>
+<path d="M63.1746 35.8307C63.1746 34.638 64.1406 33.672 65.3333 33.672H79.0053C80.198 33.672 81.164 34.638 81.164 35.8307C81.164 37.0234 80.198 37.9894 79.0053 37.9894H65.3333C64.1406 37.9894 63.1746 37.0234 63.1746 35.8307Z" fill="#FCFCF7"/>
+<path d="M35.8307 20C40.0292 20 44.0558 21.6679 47.0247 24.6367C49.9935 27.6055 51.6614 31.6321 51.6614 35.8307C51.6614 40.0292 49.9935 44.0558 47.0247 47.0247C44.0558 49.9935 40.0292 51.6614 35.8307 51.6614C31.6321 51.6614 27.6055 49.9935 24.6367 47.0247C21.6679 44.0558 20 40.0292 20 35.8307C20 31.6321 21.6679 27.6055 24.6367 24.6367C27.6055 21.6679 31.6321 20 35.8307 20Z" fill="#378648"/>
+<path d="M26.836 35.8307C26.836 34.638 27.802 33.672 28.9947 33.672H42.6667C43.8594 33.672 44.8254 34.638 44.8254 35.8307C44.8254 37.0234 43.8594 37.9894 42.6667 37.9894H28.9947C27.802 37.9894 26.836 37.0234 26.836 35.8307Z" fill="#FCFCF7"/>
+<path d="M35.8307 26.836C37.0234 26.836 37.9894 27.802 37.9894 28.9947V42.6667C37.9894 43.8594 37.0234 44.8254 35.8307 44.8254C34.638 44.8254 33.672 43.8594 33.672 42.6667V28.9947C33.672 27.802 34.638 26.836 35.8307 26.836Z" fill="#FCFCF7"/>
+</svg>