Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9834b958 authored by Fahim Salam Chowdhury's avatar Fahim Salam Chowdhury 👽
Browse files

Merge branch '458-polish_rebanding' into 'main' 

458-polish_rebanding

See merge request !69
parents f432e953 801c66ff

app/src/main/java/at/bitfire/davdroid/Constants.kt

+1 −1
Original line number Diff line number Diff line
@@ -30,6 +30,6 @@ object Constants { 


    const val AUTH_TOKEN_TYPE = "oauth2-access-token"



    const val EELO_SYNC_HOST = "ecloud.global"

    const val EELO_SYNC_HOST = "murena.io"

    const val E_SYNC_URL = "e.email"

}

app/src/main/java/at/bitfire/davdroid/ui/setup/SendInviteFragment.kt

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ class SendInviteFragment : Fragment() { 
        val userAgentValue = "Java 11 HttpClient Bot"

        val contentKey = "Content-Type"

        val contentValue = "application/x-www-form-urlencoded"

        val inviteUrl = "https://welcome.ecloud.global/process_email_invite.php"

        val inviteUrl = "https://murena.io/signup/process_email_invite.php"



        val formBody = FormBody.Builder()

            .add("email", email)

app/src/main/res/drawable-xxhdpi/ic_account_provider_eelo.png

deleted100644 → 0
−62.7 KiB
Loading image diff...

app/src/main/res/drawable/ic_account_provider_murena.xml

0 → 100644
+51 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:aapt="http://schemas.android.com/aapt"

    android:width="200dp"

    android:height="200dp"

    android:viewportWidth="597"

    android:viewportHeight="597">

  <path

      android:pathData="M596.74,298.46C596.74,463.06 463.31,596.49 298.71,596.49C134.11,596.49 0.68,463.06 0.68,298.46C0.68,133.87 134.11,0.43 298.71,0.43C463.31,0.43 596.74,133.87 596.74,298.46ZM529.03,284.24C529.03,377.7 453.27,453.47 359.81,453.47C266.35,453.47 190.58,377.7 190.58,284.24C190.58,190.78 266.35,115.01 359.81,115.01C453.27,115.01 529.03,190.78 529.03,284.24Z"

      android:fillType="evenOdd">

    <aapt:attr name="android:fillColor">

      <gradient 

          android:startX="239.51"

          android:startY="357.69"

          android:endX="516.53"

          android:endY="80.64"

          android:type="linear">

        <item android:offset="0" android:color="#FFE95C3F"/>

        <item android:offset="1" android:color="#FFFF5D69"/>

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M398.37,247.27C459.74,185.93 512.31,149.44 545.15,156.63C575.66,163.28 585.41,212.1 591.65,243.39L591.78,244.06C604.87,309.77 596.74,439.83 493.5,523.83C433.08,573 372.47,596.49 298.71,596.49C110.8,596.49 0.71,445.88 0.71,303.35C0.71,199.29 42.05,137.73 79.97,95.75C118.32,53.3 174.77,21.31 232.87,7.25C279.99,-4.13 330.97,2.17 330.97,2.17C204.52,-10.27 63.86,87.58 79.97,223.66C91.3,319.29 189.45,348.15 236.91,341.39C291.58,333.63 335.34,310.32 398.37,247.27ZM505.47,326.81C505.47,335.98 498.03,343.42 488.86,343.42C479.69,343.42 472.26,335.98 472.26,326.81C472.26,317.64 479.69,310.21 488.86,310.21C498.03,310.21 505.47,317.64 505.47,326.81Z"

      android:fillType="evenOdd">

    <aapt:attr name="android:fillColor">

      <gradient 

          android:centerX="325.31"

          android:centerY="107.46"

          android:gradientRadius="489.31"

          android:type="radial">

        <item android:offset="0" android:color="#FFFFDA00"/>

        <item android:offset="0.83" android:color="#FFFF9B00"/>

        <item android:offset="1" android:color="#FFFF5D69"/>

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M492.49,169.95C492.49,169.95 519.49,154.86 536.31,165.56C555.68,177.89 571.16,216.9 554.36,289.68C540.29,350.67 513.31,384.85 513.31,384.85C513.31,384.85 582.35,356.86 593.29,252.6C586.09,207.57 577.11,185.17 558.15,151.71C527.14,144.16 492.49,169.95 492.49,169.95Z">

    <aapt:attr name="android:fillColor">

      <gradient 

          android:startX="345.01"

          android:startY="463.16"

          android:endX="622.03"

          android:endY="186.14"

          android:type="linear">

        <item android:offset="0" android:color="#FFE95C3F"/>

        <item android:offset="1" android:color="#FFFF5D69"/>

      </gradient>

    </aapt:attr>

  </path>

</vector>

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

+3 −3
Original line number Diff line number Diff line
@@ -236,7 +236,7 @@ 
    <string name="login_server_uri_error">Необходим е валиден URL адрес</string>

    <string name="login_server_uri">URL на сървъра (https://server_url)</string>

    <string name="login_login">Вход</string>

    <string name="login_eelo_title">Вход с /е/ акаунт</string>

    <string name="login_eelo_title">Вход с Murena.io акаунт</string>

    <string name="app_settings_reset_hints">Нулиране на подсказки</string>

    <string name="app_settings_user_interface">Потребителски интерфейс</string>

    <string name="app_settings_show_debug_info">Покажи информация за дебъгване</string>
@@ -245,8 +245,8 @@ 
    <string name="account_list_no_internet">Няма интернет връзка. Синхронизацията няма да работи.</string>

    <string name="navigation_drawer_privacy_policy">Политика за поверителност</string>

    <string name="account_title_google_address_book">Google Адресна книга</string>

    <string name="account_title_eelo_address_book">/e/ Адресна книга</string>

    <string name="eelo_account_name">/e/</string>

    <string name="account_title_eelo_address_book">Murena.io Адресна книга</string>

    <string name="eelo_account_name">Murena.io</string>

    <string name="google_account_name">Google</string>

    <string name="account_name">WebDAV</string>

    <string name="google_alert_title">ВНИМАНИЕ</string>