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

Commit cbd809ef authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '237-auto_adapt_text_color' into 'v1-oreo' 

Add support for auto adapt text color in light mode for widget

See merge request !123
parents 21106209 f12beb03

app/src/main/java/foundation/e/drive/widgets/EDriveWidget.java

+27 −5
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.Intent; 
import android.net.ConnectivityManager;

import android.net.Network;

import android.net.Uri;

import android.os.Bundle;

import android.provider.Settings;

import android.view.View;

import android.widget.RemoteViews;
@@ -61,6 +62,9 @@ public class EDriveWidget extends AppWidgetProvider { 
    private final SimpleDateFormat sdf = new SimpleDateFormat("HH:mm", Locale.getDefault());

    private RemoteViews views;

    private Account account = null;

    private static final String DARK_TEXT_KEY = "foundation.e.blisslauncher.WIDGET_OPTION_DARK_TEXT";

    private static boolean isDarkText = false;





    public static String dataForWeb(Long bytes) {

        final String space = CommonUtils.humanReadableByteCountBin(bytes);
@@ -148,7 +152,12 @@ public class EDriveWidget extends AppWidgetProvider { 
            return;

        }



        if (isDarkText) {

            views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_login_light);

        } else {

            views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_login);

        }



        Intent accountIntent = buildIntent("", "")

                .setComponent(new ComponentName(ACCOUNT_MANAGER_PACKAGE_NAME,

                        GET_ACCOUNT_MANAGER_COMPONENT_NAME))
@@ -165,7 +174,11 @@ public class EDriveWidget extends AppWidgetProvider { 


    private void noInternetView(Context context) {

        if (!isNetworkAvailable) {

            if (isDarkText) {

                views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_login_light);

            } else {

                views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_login);

            }

            views.setViewVisibility(R.id.button_container, View.GONE);

            views.setTextViewText(R.id.summary, context.getString(R.string.no_internet_widget));

        }
@@ -180,9 +193,11 @@ public class EDriveWidget extends AppWidgetProvider { 
            noAccountView(context);

            return;

        }



        if (isDarkText) {

            views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget_light);

        } else {

            views = new RemoteViews(context.getPackageName(), R.layout.e_drive_widget);



        }

        views.setTextViewText(R.id.email, email);

        views.setTextViewText(R.id.name, accountManager.getUserData(account, ACCOUNT_DATA_NAME));
@@ -278,4 +293,11 @@ public class EDriveWidget extends AppWidgetProvider { 
            }

        });

    }



        @Override

        public void onAppWidgetOptionsChanged(Context context, AppWidgetManager appWidgetManager, int appWidgetId, Bundle newOptions) {

            super.onAppWidgetOptionsChanged(context, appWidgetManager, appWidgetId, newOptions);

            isDarkText = newOptions.getBoolean(DARK_TEXT_KEY);

            updateAppWidget(context);

        }

}
 
 No newline at end of file

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

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

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

    <solid android:color="@android:color/transparent"/>

    <stroke android:width="2dp" android:color="#33000000" />

    <corners android:radius="10dp"/>

    <padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />

</shape>
 
 No newline at end of file

app/src/main/res/layout/e_drive_widget_light.xml

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

    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="@drawable/widget_background"

    android:padding="12dp">



    <TextView

        android:id="@+id/name"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:paddingBottom="40dp"

        android:textColor="@color/widget_text_color_light"

        android:textFontWeight="400"

        android:textSize="16sp" />



    <ImageView

        android:id="@+id/settings"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/name"

        android:layout_alignParentEnd="true"

        android:src="@drawable/ic_settings"

        android:tint="@color/widget_text_color_light"

        app:tint="@color/widget_text_color_light" />



    <TextView

        android:id="@+id/email"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignBottom="@id/name"

        android:layout_alignParentStart="true"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="700"

        android:textSize="16sp" />



    <TextView

        android:id="@+id/show_alias"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignBottom="@id/email"

        android:layout_alignParentEnd="true"

        android:drawableEnd="@drawable/ic_keyboard_arrow_down"

        android:drawableTint="@color/widget_text_color2_light"

        android:text="@string/view_alias"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="400"

        android:textSize="16sp" />



    <LinearLayout

        android:id="@+id/alias1_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/email"

        android:layout_alignParentStart="true"

        android:layout_marginTop="50dp"

        android:orientation="horizontal"

        android:visibility="gone">



        <TextView

            android:id="@+id/alias1"

            android:layout_width="0dp"

            android:layout_height="wrap_content"

            android:layout_weight="1"

            android:textColor="@color/widget_text_color_light"

            android:textFontWeight="400"

            android:textSize="16sp" />



        <TextView

            android:id="@+id/alias1_clipboard"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:drawableEnd="@drawable/ic_clipboard"

            android:drawableTint="@color/widget_text_color2_light"

            android:drawablePadding="10dp"

            android:text="@string/copy"

            android:textColor="@color/widget_text_color2_light"

            android:textFontWeight="400"

            android:textSize="16sp" />

    </LinearLayout>



    <TextView

        android:id="@+id/hide_alias"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/alias1_container"

        android:layout_centerHorizontal="true"

        android:layout_marginTop="50dp"

        android:drawableEnd="@drawable/ic_arrow_up"

        android:drawableTint="@color/widget_text_color2_light"

        android:drawablePadding="10dp"

        android:text="@string/hide_alias"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="400"

        android:textSize="16sp"

        android:visibility="gone" />



    <TextView

        android:id="@+id/status"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/hide_alias"

        android:layout_alignParentStart="true"

        android:layout_marginTop="50dp"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="500"

        android:textSize="11sp" />



    <ProgressBar

        android:id="@+id/progress"

        style="@android:style/Widget.Material.ProgressBar.Horizontal"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/status"

        android:layout_alignParentStart="true"

        android:layout_marginTop="20dp"

        android:progressTint="@color/widget_progressBar" />



    <TextView

        android:id="@+id/sync"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/progress"

        android:layout_alignParentEnd="true"

        android:layout_marginTop="15dp"

        android:text="@string/last_synced"

        android:textColor="@color/widget_text_color_light"

        android:textFontWeight="400"

        android:textSize="12sp" />



    <TextView

        android:id="@+id/plan"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/status"

        android:layout_alignParentStart="true"

        android:layout_marginTop="70dp"

        android:text="@string/my_plan"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="400"

        android:textSize="14sp" />



    <TextView

        android:id="@+id/planName"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/plan"

        android:layout_toEndOf="@id/plan"

        android:textColor="@color/widget_text_color_light"

        android:textFontWeight="400"

        android:textSize="14sp" />



    <Button

        android:id="@+id/upgrade"

        style="@android:style/Widget.Material.Button.Borderless"

        android:layout_width="wrap_content"

        android:layout_height="30dp"

        android:layout_alignTop="@id/plan"

        android:layout_alignParentEnd="true"

        android:layout_marginTop="-5dp"

        android:background="@drawable/button_background_light"

        android:text="@string/upgrade"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="500" />

</RelativeLayout>
 
 No newline at end of file

app/src/main/res/layout/e_drive_widget_login_light.xml

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

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:background="@drawable/widget_background"

    android:padding="16dp">



    <TextView

        android:id="@+id/account"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:paddingBottom="40dp"

        android:text="@string/e_account"

        android:textColor="@color/widget_text_color_light"

        android:textFontWeight="400"

        android:textSize="16sp" />



    <TextView

        android:id="@+id/summary"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignTop="@id/account"

        android:layout_marginTop="30dp"

        android:layout_marginBottom="50dp"

        android:drawableTop="@drawable/ic_cloud"

        android:drawablePadding="10dp"

        android:gravity="center"

        android:text="@string/login_summary"

        android:textColor="@color/widget_text_color2_light"

        android:textFontWeight="400" />



    <LinearLayout

        android:id="@+id/button_container"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="horizontal"

        android:layout_alignBottom="@id/summary"

        android:layout_alignParentBottom="true">



    <Button

        android:id="@+id/login"

        style="@android:style/Widget.Material.Button.Borderless"

        android:layout_weight="1"

        android:layout_width="0dp"

        android:layout_height="30dp"

        android:background="@drawable/button_background_light"

        android:layout_marginEnd="15dp"

        android:text="@string/login"

        android:textColor="@color/widget_text_color2_light" />



    <Button

        android:id="@+id/newAccount"

        android:layout_weight="1"

        style="@android:style/Widget.Material.Button.Borderless"

        android:layout_width="0dp"

        android:layout_height="30dp"

        android:background="@drawable/button_background_light"

        android:text="@string/create_account"

        android:textColor="@color/widget_text_color2_light" />

    </LinearLayout>



</RelativeLayout>
 
 No newline at end of file

app/src/main/res/values/colors.xml

+3 −0
Original line number Diff line number Diff line
@@ -20,4 +20,7 @@ 
    <color name="widget_text_color2">#DEFFFFFF</color>

    <color name="widget_text_color3">#61FFFFFF</color>

    <color name="widget_progressBar">#5DB2FF</color>



    <color name="widget_text_color_light">#61000000</color>

    <color name="widget_text_color2_light">#99000000</color>

</resources>
 
 No newline at end of file