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

Commit 5bc69430 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '193-redesign_ecloud_login_page' into 'master' 

Update login page design

See merge request !37
parents 68d118fb 9092c513

app/src/main/java/foundation/e/accountmanager/ui/setup/EeloAuthenticatorFragment.kt

+16 −17
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ class EeloAuthenticatorFragment : Fragment() { 
        v.lifecycleOwner = this

        v.model = model



        v.root.urlpwd_other_account_title_panel.setOnClickListener() { expandCollapse() }

        v.root.server_toggle_button.setOnClickListener() { expandCollapse() }



        v.root.urlpwd_user_name.setOnFocusChangeListener() { v, hasFocus ->

            if (!hasFocus) {
@@ -60,7 +60,7 @@ class EeloAuthenticatorFragment : Fragment() { 
            }

        }



        v.login.setOnClickListener { login() }

        v.root.sign_in.setOnClickListener { login() }



        // code below is to draw toggle button in its correct state and show or hide server url input field

        //add by Vincent, 18/02/2019
@@ -69,15 +69,15 @@ class EeloAuthenticatorFragment : Fragment() { 
        }



        //This allow the button to be redraw in the correct state if user turn screen

        if (toggleButtonState == true) {

            v.root.expand_collapse_button.setChecked(toggleButtonState)

        if (toggleButtonState) {

            v.root.server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_less), null)

            v.root.urlpwd_server_uri_layout.setVisibility(View.VISIBLE)

            v.root.urlpwd_server_uri.setEnabled(true)

        } else {

            v.root.server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_more), null)

            v.root.urlpwd_server_uri_layout.setVisibility(View.GONE)

            v.root.urlpwd_server_uri.setEnabled(false)

        }



        return v.root

    }
@@ -154,17 +154,16 @@ class EeloAuthenticatorFragment : Fragment() { 
     * Show/Hide panel containing server's uri input field.

     */

    private fun expandCollapse() {

        //inverse state of Toggle button

        expand_collapse_button.setChecked(!expand_collapse_button.isChecked())



        if (expand_collapse_button.isChecked) {

       if (!toggleButtonState) {

           server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_less), null)

           urlpwd_server_uri_layout.setVisibility(View.VISIBLE)

           urlpwd_server_uri.setEnabled(true)

            toggleButtonState = true;

           toggleButtonState = true

       } else {

           server_toggle_button.setCompoundDrawablesWithIntrinsicBounds(null, null , resources.getDrawable(R.drawable.ic_expand_more), null)

           urlpwd_server_uri_layout.setVisibility(View.GONE)

           urlpwd_server_uri.setEnabled(false)

            toggleButtonState = false;

           toggleButtonState = false

       }

    }

}

app/src/main/res/color/edittext.xml

0 → 100644
+13 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  ~ Copyright © 2013 – 2016 Ricki Hirner (bitfire web engineering).

  ~ All rights reserved. This program and the accompanying materials

  ~ are made available under the terms of the GNU Public License v3.0

  ~ which accompanies this distribution, and is available at

  ~ http://www.gnu.org/licenses/gpl.html

  -->



<selector xmlns:android="http://schemas.android.com/apk/res/android">

    <item android:color="?attr/colorAccent" android:state_focused="true"/>

    <item android:color="@color/edit_text_disabled_color"/>

</selector>

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@color/accentColor"

        android:fillColor="@color/button_text"

        android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>

</vector>

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

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24">

    <path

        android:fillColor="@color/accentColor"

        android:fillColor="@color/button_text"

        android:pathData="M16.59,8.59L12,13.17 7.41,8.59 6,10l6,6 6,-6z"/>

</vector>

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

0 → 100644
+156 −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="120dp"

    android:height="16dp"

    android:viewportWidth="120"

    android:viewportHeight="16">

  <group>

    <clip-path

        android:pathData="M112,16C107.589,16 104,12.411 104,8C104,3.589 107.589,0 112,0C116.411,0 120,3.589 120,8C120,8.835 119.323,9.512 118.488,9.512H112C111.165,9.512 110.488,8.835 110.488,8C110.488,7.165 111.165,6.488 112,6.488H116.741C116.099,4.481 114.217,3.025 112,3.025C109.257,3.025 107.025,5.257 107.025,8C107.025,10.744 109.257,12.975 112,12.975C112.835,12.975 113.512,13.652 113.512,14.488C113.512,15.323 112.835,16 112,16Z"/>

    <path

        android:pathData="M112.007,7.985L101.102,5.063L109.085,-2.92L112.007,7.985Z"

        android:fillColor="#F9CF43"/>

    <path

        android:pathData="M122.912,10.907L112.007,7.985L119.991,0.002L122.912,10.907Z"

        android:fillColor="#EF6955"/>

    <path

        android:pathData="M114.929,18.89L104.024,15.969L112.007,7.985L114.929,18.89Z"

        android:fillColor="#193071"/>

    <path

        android:pathData="M101.102,5.063L112.007,7.985L104.024,15.969L101.102,5.063Z"

        android:fillColor="#B2D685"/>

    <path

        android:pathData="M109.085,-2.92L119.991,0.002L112.007,7.985L109.085,-2.92Z"

        android:fillColor="#F49138"/>

    <path

        android:pathData="M112.007,7.985L122.912,10.907L114.929,18.89L112.007,7.985Z"

        android:fillColor="#020F17"/>

  </group>

  <path

      android:pathData="M80,13.613C79.851,13.642 79.611,13.675 79.288,13.715C78.965,13.754 78.587,13.791 78.151,13.827C77.715,13.863 77.225,13.9 76.683,13.929C76.142,13.958 75.579,13.972 74.99,13.972C73.817,13.972 72.858,13.871 72.113,13.667C71.368,13.464 70.784,13.195 70.355,12.857C69.926,12.519 69.632,12.127 69.476,11.684C69.32,11.241 69.24,10.786 69.24,10.318C69.24,9.7 69.334,9.159 69.52,8.694C69.708,8.229 70.017,7.837 70.446,7.521C70.874,7.205 71.434,6.969 72.128,6.809C72.818,6.652 73.661,6.573 74.652,6.573C75.223,6.573 75.764,6.591 76.276,6.631C76.785,6.667 77.17,6.703 77.424,6.732C77.424,6.206 77.337,5.77 77.166,5.425C76.996,5.079 76.756,4.807 76.454,4.611C76.153,4.415 75.793,4.28 75.372,4.204C74.95,4.128 74.485,4.091 73.973,4.091C73.116,4.091 72.429,4.189 71.91,4.386C71.39,4.582 71.049,4.745 70.885,4.883C70.795,4.807 70.671,4.665 70.511,4.455C70.355,4.244 70.275,3.99 70.275,3.688C70.275,3.477 70.333,3.27 70.442,3.067C70.555,2.864 70.755,2.682 71.042,2.526C71.325,2.369 71.71,2.242 72.189,2.151C72.673,2.061 73.279,2.017 74.017,2.017C74.903,2.017 75.71,2.104 76.44,2.275C77.17,2.449 77.795,2.722 78.322,3.1C78.845,3.477 79.259,3.971 79.549,4.589C79.84,5.207 79.989,5.951 79.989,6.823V13.613H80ZM77.453,8.607C77.304,8.578 77.021,8.531 76.607,8.472C76.193,8.411 75.572,8.382 74.747,8.382C73.726,8.382 72.978,8.534 72.517,8.843C72.048,9.152 71.819,9.635 71.819,10.296C71.819,10.568 71.866,10.816 71.964,11.041C72.062,11.266 72.233,11.459 72.473,11.615C72.713,11.771 73.04,11.894 73.454,11.974C73.868,12.058 74.384,12.098 74.998,12.098C75.688,12.098 76.24,12.073 76.643,12.018C77.05,11.967 77.319,11.924 77.457,11.894V8.607H77.453Z"

      android:fillColor="@color/primaryTextColor"/>

  <path

      android:pathData="M56.137,6.838C56.137,6.086 56.275,5.414 56.554,4.821C56.834,4.229 57.215,3.724 57.706,3.31C58.193,2.896 58.774,2.58 59.442,2.362C60.111,2.144 60.845,2.035 61.64,2.035C62.436,2.035 63.173,2.144 63.849,2.362C64.525,2.58 65.109,2.896 65.596,3.31C66.083,3.724 66.465,4.229 66.733,4.821C67.006,5.414 67.14,6.089 67.14,6.838V13.671H64.572V7.492C64.572,6.471 64.321,5.69 63.827,5.159C63.333,4.625 62.603,4.356 61.64,4.356C60.663,4.356 59.929,4.625 59.442,5.159C58.956,5.693 58.709,6.471 58.709,7.492V13.671H56.137V6.838Z"

      android:fillColor="@color/primaryTextColor"/>

  <path

      android:pathData="M0,6.391C0,5.668 0.127,5.036 0.385,4.498C0.643,3.957 0.992,3.506 1.435,3.143C1.878,2.783 2.401,2.507 3.001,2.322C3.6,2.133 4.258,2.039 4.962,2.039C5.896,2.039 6.728,2.209 7.465,2.558C8.203,2.903 8.788,3.415 9.224,4.091C9.659,3.415 10.237,2.903 10.96,2.558C11.683,2.213 12.5,2.039 13.419,2.039C14.109,2.039 14.756,2.129 15.359,2.311C15.959,2.493 16.478,2.761 16.914,3.121C17.35,3.484 17.695,3.931 17.953,4.472C18.207,5.014 18.338,5.646 18.338,6.365V13.674H15.766V7.248C15.766,6.209 15.534,5.468 15.069,5.025C14.604,4.581 13.972,4.36 13.176,4.36C12.409,4.36 11.766,4.607 11.247,5.105C10.727,5.602 10.469,6.405 10.469,7.517V13.674H7.898V7.517C7.898,6.405 7.64,5.602 7.12,5.105C6.604,4.611 5.958,4.36 5.195,4.36C4.414,4.36 3.782,4.585 3.302,5.036C2.819,5.486 2.579,6.231 2.579,7.27V13.674H0.007V6.391H0Z"

      android:fillColor="@color/primaryTextColor"/>

  <path

      android:pathData="M20.95,3.546C20.95,3.125 21.07,2.82 21.313,2.634C21.553,2.446 21.891,2.351 22.327,2.351C22.596,2.351 22.843,2.387 23.072,2.453C23.297,2.522 23.449,2.569 23.522,2.598V8.53C23.522,9.551 23.762,10.332 24.245,10.866C24.724,11.4 25.462,11.665 26.454,11.665C27.445,11.665 28.183,11.4 28.662,10.866C29.146,10.332 29.385,9.555 29.385,8.53V3.546C29.385,3.125 29.505,2.82 29.745,2.634C29.985,2.446 30.319,2.351 30.737,2.351C31.02,2.351 31.278,2.387 31.503,2.453C31.728,2.522 31.877,2.569 31.954,2.598V9.093C31.954,9.86 31.823,10.55 31.558,11.157C31.296,11.764 30.918,12.279 30.431,12.701C29.945,13.122 29.36,13.442 28.684,13.66C28.008,13.878 27.264,13.987 26.45,13.987C25.64,13.987 24.895,13.878 24.219,13.66C23.544,13.442 22.963,13.122 22.483,12.701C22,12.279 21.626,11.764 21.353,11.157C21.084,10.547 20.946,9.86 20.946,9.093V3.546H20.95Z"

      android:fillColor="@color/primaryTextColor"/>

  <path

      android:pathData="M35.87,3.176C35.02,3.935 34.595,5.007 34.595,6.391H34.598V13.674H37.17V7.132C37.17,5.272 38.049,4.338 39.807,4.338C40.033,4.338 40.235,4.354 40.424,4.381C41.617,4.635 42.382,5.145 43.041,5.703C43.135,5.38 43.355,4.765 43.558,4.406C43.786,4.002 43.947,3.764 44.136,3.555C42.978,2.707 41.509,2.035 39.509,2.035L39.508,2.036C39.472,2.035 39.437,2.035 39.401,2.035C37.897,2.035 36.72,2.417 35.87,3.176Z"

      android:fillColor="@color/primaryTextColor"/>

  <path

      android:pathData="M54.499,5.813C54.499,6.49 53.951,7.038 53.275,7.038C52.599,7.038 52.051,6.996 51.574,6.623C52.424,6.249 52.599,4.589 53.275,4.589C53.951,4.589 54.499,5.137 54.499,5.813Z">

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

      <gradient 

          android:startY="7.61789"

          android:startX="54.6987"

          android:endY="6.6072"

          android:endX="51.2224"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M45.999,9.08C45.999,9.08 45.822,8.515 45.881,7.835L43.555,6.199C43.392,6.773 43.28,7.399 43.28,8.007C43.28,10.194 44.38,12.076 46.069,13.128L47.692,11.435C46.684,10.842 46.152,9.827 45.999,9.08Z">

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

      <gradient 

          android:startY="13.1278"

          android:startX="48.61"

          android:endY="9.39967"

          android:endX="44.138"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M52.704,10.951C52.704,10.951 52.362,11.22 51.757,11.519C51.029,11.876 50.087,12.072 48.933,11.89C48.456,11.814 48.045,11.654 47.688,11.443L46.37,11.89L46.065,13.135C46.953,13.688 48.001,14.023 49.155,14.023C52.056,14.023 53.556,12.305 53.556,12.305L53.429,11.443L52.704,10.951Z">

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

      <gradient 

          android:startY="12.0533"

          android:startX="50.8213"

          android:endY="6.06555"

          android:endX="42.5004"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M54.993,9.801C55.182,9.073 54.709,8.822 54.367,9.302C53.17,10.848 51.933,11.435 51.933,11.435L52.703,12.983C54.105,12.131 54.76,10.696 54.993,9.801Z">

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

      <gradient 

          android:startY="9.44866"

          android:startX="56.7183"

          android:endY="12.5446"

          android:endX="52.5412"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M49.279,4.312C51.098,4.312 52.118,5.579 51.947,6.172L54.491,5.586C54.425,5.167 54.258,4.723 53.901,4.228C52.973,2.94 51.251,2.059 49.016,2.059C47.479,2.059 45.835,2.821 44.76,3.995C44.744,4.013 43.996,4.762 43.557,6.198C44.41,7.224 45.881,7.834 45.881,7.834C45.911,6.916 46.271,6.089 46.672,5.576C47.052,5.052 47.869,4.312 49.279,4.312Z">

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

      <gradient 

          android:startY="10.4238"

          android:startX="58.8516"

          android:endY="3.10044"

          android:endX="47.2676"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M49.621,6.74C50.818,6.849 51.779,6.765 51.947,6.172L54.491,5.583C54.567,6.092 54.484,6.554 54.273,6.966C53.909,7.683 52.733,8.589 51.161,8.855C50.369,8.988 49.292,8.913 48.274,8.723C48.114,8.694 47.455,8.524 46.615,8.169C46.572,7.676 46.825,6.596 47.279,6.025C48.052,6.412 48.644,6.569 48.72,6.588C49.003,6.657 49.302,6.712 49.621,6.74Z">

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

      <gradient 

          android:startY="4.38942"

          android:startX="54.5188"

          android:endY="7.62219"

          android:endX="47.3118"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M49.621,6.74C50.818,6.849 51.779,6.765 51.947,6.172L54.491,5.583C54.567,6.092 54.484,6.554 54.273,6.966C53.909,7.683 52.733,8.589 51.161,8.855C50.369,8.988 49.292,8.913 48.274,8.723C48.114,8.694 47.455,8.524 46.615,8.169C46.572,7.676 46.825,6.596 47.279,6.025C48.052,6.412 48.644,6.569 48.72,6.588C49.003,6.657 49.302,6.712 49.621,6.74Z">

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

      <gradient 

          android:startY="4.4442"

          android:startX="53.8557"

          android:endY="7.11751"

          android:endX="53.3397"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

  <path

      android:pathData="M46.935,5.263C47.381,4.799 48.135,4.312 49.279,4.312C51.099,4.312 52.118,5.579 51.947,6.172C51.878,6.416 51.675,6.574 51.376,6.667C51.913,6.513 52.604,6.07 52.91,5.379C53.425,4.212 52.632,2.812 50.631,2.225C50.13,2.117 49.59,2.059 49.017,2.059C47.649,2.059 46.198,2.662 45.137,3.621L46.935,5.263Z">

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

      <gradient 

          android:startY="6.08193"

          android:startX="57.8165"

          android:endY="6.12529"

          android:endX="49.449"

          android:type="linear">

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

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

      </gradient>

    </aapt:attr>

  </path>

</vector>