diff options
Diffstat (limited to 'res')
22 files changed, 104 insertions, 222 deletions
diff --git a/res/drawable-hdpi/img_oobe_files.png b/res/drawable-hdpi/img_oobe_files.png Binary files differnew file mode 100644 index 00000000..0fb1b511 --- /dev/null +++ b/res/drawable-hdpi/img_oobe_files.png diff --git a/res/drawable-hdpi/img_oobe_privacy.png b/res/drawable-hdpi/img_oobe_privacy.png Binary files differnew file mode 100644 index 00000000..715077cb --- /dev/null +++ b/res/drawable-hdpi/img_oobe_privacy.png diff --git a/res/drawable-hdpi/img_oobe_root.png b/res/drawable-hdpi/img_oobe_root.png Binary files differnew file mode 100644 index 00000000..7a721f79 --- /dev/null +++ b/res/drawable-hdpi/img_oobe_root.png diff --git a/res/drawable-mdpi/img_oobe_files.png b/res/drawable-mdpi/img_oobe_files.png Binary files differnew file mode 100644 index 00000000..3be40a6f --- /dev/null +++ b/res/drawable-mdpi/img_oobe_files.png diff --git a/res/drawable-mdpi/img_oobe_privacy.png b/res/drawable-mdpi/img_oobe_privacy.png Binary files differnew file mode 100644 index 00000000..c8a6275d --- /dev/null +++ b/res/drawable-mdpi/img_oobe_privacy.png diff --git a/res/drawable-mdpi/img_oobe_root.png b/res/drawable-mdpi/img_oobe_root.png Binary files differnew file mode 100644 index 00000000..48940d74 --- /dev/null +++ b/res/drawable-mdpi/img_oobe_root.png diff --git a/res/drawable-xhdpi/img_oobe_files.png b/res/drawable-xhdpi/img_oobe_files.png Binary files differnew file mode 100644 index 00000000..0f89ef2d --- /dev/null +++ b/res/drawable-xhdpi/img_oobe_files.png diff --git a/res/drawable-xhdpi/img_oobe_privacy.png b/res/drawable-xhdpi/img_oobe_privacy.png Binary files differnew file mode 100644 index 00000000..5dea4a0b --- /dev/null +++ b/res/drawable-xhdpi/img_oobe_privacy.png diff --git a/res/drawable-xhdpi/img_oobe_root.png b/res/drawable-xhdpi/img_oobe_root.png Binary files differnew file mode 100644 index 00000000..7242de6f --- /dev/null +++ b/res/drawable-xhdpi/img_oobe_root.png diff --git a/res/drawable-xxhdpi/img_oobe_files.png b/res/drawable-xxhdpi/img_oobe_files.png Binary files differnew file mode 100644 index 00000000..4f38a750 --- /dev/null +++ b/res/drawable-xxhdpi/img_oobe_files.png diff --git a/res/drawable-xxhdpi/img_oobe_privacy.png b/res/drawable-xxhdpi/img_oobe_privacy.png Binary files differnew file mode 100644 index 00000000..abe8612e --- /dev/null +++ b/res/drawable-xxhdpi/img_oobe_privacy.png diff --git a/res/drawable-xxhdpi/img_oobe_root.png b/res/drawable-xxhdpi/img_oobe_root.png Binary files differnew file mode 100644 index 00000000..dd7a60dd --- /dev/null +++ b/res/drawable-xxhdpi/img_oobe_root.png diff --git a/res/drawable-xxxhdpi/img_oobe_files.png b/res/drawable-xxxhdpi/img_oobe_files.png Binary files differnew file mode 100644 index 00000000..4f38a750 --- /dev/null +++ b/res/drawable-xxxhdpi/img_oobe_files.png diff --git a/res/drawable-xxxhdpi/img_oobe_privacy.png b/res/drawable-xxxhdpi/img_oobe_privacy.png Binary files differnew file mode 100644 index 00000000..abe8612e --- /dev/null +++ b/res/drawable-xxxhdpi/img_oobe_privacy.png diff --git a/res/drawable-xxxhdpi/img_oobe_root.png b/res/drawable-xxxhdpi/img_oobe_root.png Binary files differnew file mode 100644 index 00000000..dd7a60dd --- /dev/null +++ b/res/drawable-xxxhdpi/img_oobe_root.png diff --git a/res/layout/fragment_intro_content.xml b/res/layout/fragment_intro_content.xml new file mode 100644 index 00000000..cae3d02f --- /dev/null +++ b/res/layout/fragment_intro_content.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="@dimen/intro_margin"> + + <ImageView + android:id="@+id/benefits_img" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:adjustViewBounds="true" + android:scaleType="fitXY" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:baselineAligned="true" + android:gravity="center" + android:orientation="vertical" + android:padding="@dimen/intro_margin"> + + <TextView + android:id="@+id/benefits_title" + style="@style/TextAppearance.AppCompat.Headline" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/white" /> + + <TextView + android:id="@+id/benefits_message" + style="@style/TextAppearance.AppCompat.Body1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/intro_margin" + android:layout_marginTop="@dimen/intro_margin" + android:gravity="center" + android:paddingBottom="16dp" + android:textColor="@color/white" /> + </LinearLayout> +</FrameLayout> diff --git a/res/layout/welcome.xml b/res/layout/welcome.xml index 029025e4..05f7ea6a 100644 --- a/res/layout/welcome.xml +++ b/res/layout/welcome.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The CyanogenMod Project +<!-- Copyright (C) 2016 The CyanogenMod Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -14,215 +14,45 @@ limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<android.support.design.widget.CoordinatorLayout + xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="@color/slide_color" + android:fitsSystemWindows="true"> <android.support.v4.view.ViewPager + android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/intro_pager" - android:background="@drawable/bg_material_statusbar"> + android:paddingBottom="?attr/actionBarSize" /> - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingLeft="16dp" - android:paddingRight="16dp" - android:id="@+id/itemOne"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/welcome_title" - android:textSize="28sp" - android:id="@+id/titleMessageOne" - android:textColor="@android:color/white"/> - - <View - android:id="@+id/generic_square" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:layout_above="@+id/bottomMessageOne" - android:layout_below="@+id/titleMessageOne" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" - android:background="@drawable/rectangle"/> - - <TextView - android:id="@+id/bottomMessageOne" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/first_message" - android:layout_alignParentBottom="true" - android:paddingBottom="16dp" - android:layout_marginBottom="@dimen/default_row_height" - android:textSize="16sp" - android:textColor="@android:color/white"/> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingLeft="16dp" - android:id="@+id/itemTwo"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/second_title" - android:textSize="28sp" - android:textColor="@android:color/white"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/second_message" - android:layout_alignParentBottom="true" - android:paddingBottom="16dp" - android:layout_marginBottom="@dimen/default_row_height" - android:textSize="16sp" - android:textColor="@android:color/white"/> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:paddingTop="16dp" - android:paddingLeft="16dp" - android:id="@+id/itemThree"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/second_title" - android:textSize="28sp" - android:textColor="@android:color/white"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/second_message" - android:layout_alignParentBottom="true" - android:paddingBottom="16dp" - android:layout_marginBottom="@dimen/default_row_height" - android:textSize="16sp" - android:textColor="@android:color/white"/> - - </RelativeLayout> - - <RelativeLayout - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/itemFour" - android:background="@color/cloud_fill"> - - <ImageView android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="@drawable/flying_folder" - android:layout_above="@+id/clouds_intro" - android:id="@+id/flying_folder" - android:layout_marginBottom="78dp" - android:layout_centerHorizontal="true" - android:layout_gravity="center|center_vertical|center_horizontal" /> - - <!-- the cloud drawable has some weird spacing around it --> - <ImageView android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@drawable/cloud_line" - android:layout_marginLeft="-50dp" - android:layout_marginBottom="-13dp" - android:layout_centerVertical="true" - android:id="@+id/clouds_intro" - android:layout_gravity="center|center_vertical|center_horizontal"/> - - <View - android:id="@+id/generic_square" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:layout_below="@+id/clouds_intro" - android:background="@drawable/rectangle"/> - - <LinearLayout - android:id="@+id/cloud_text" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:layout_below="@+id/clouds_intro" - android:layout_marginStart="24dp"> - - <TextView - android:text="@string/add_cloud_storage" - android:id="@+id/cardHeaderText" - android:textColor="@android:color/white" - android:textSize="20sp" - android:textStyle="bold" - android:layout_width="wrap_content" - android:fontFamily="sans-serif-medium" - android:layout_height="wrap_content"/> - - <TextView - android:text="@string/oobe_add_cloud_storage_desc" - android:id="@+id/cardChildText" - android:textColor="@android:color/white" - android:textSize="16sp" - android:layout_marginTop="20dp" - android:layout_width="wrap_content" - android:layout_height="match_parent" /> - - </LinearLayout> - - <Button - android:text="@string/connect_now" - android:id="@+id/dismiss_card" - android:layout_width="120dp" - android:layout_height="36dp" - android:layout_alignParentBottom="true" - android:layout_centerHorizontal="true" - android:layout_marginBottom="124dp" - android:textColor="@android:color/white" - android:background="@color/dark_button_blue"/> - - </RelativeLayout> - - </android.support.v4.view.ViewPager> - - <RelativeLayout - android:id="@+id/footer" - android:layout_height="@dimen/default_row_height" - android:layout_width="fill_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentStart="true"> - - <ImageView - android:id="@+id/prevButton" - style="?android:attr/buttonBarButtonStyle" + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom|center" + android:orientation="vertical" + android:padding="@dimen/intro_margin" + android:paddingLeft="@dimen/intro_margin"> + + <android.support.v7.widget.AppCompatButton + android:id="@+id/intro_btn_finish" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_oobe_back" - android:layout_alignParentLeft="true" - android:textColor="@android:color/white"/> - - <com.cyanogenmod.filemanager.views.CirclePageIndicator - android:id="@+id/pagination" - android:layout_height="@dimen/half_row_height" - android:layout_width="fill_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentStart="true" /> - - <ImageView - android:id="@+id/nextButton" - style="?android:attr/buttonBarButtonStyle" - android:layout_width="wrap_content" + android:layout_gravity="center" + android:backgroundTint="@color/white" + android:elevation="8dp" + android:text="@string/slide_button" + android:textColor="@color/black" /> + + <com.cyanogenmod.filemanager.views.InkPageIndicator + android:id="@+id/indicator" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:src="@drawable/ic_oobe_forward" - android:layout_alignParentRight="true" - android:textColor="@android:color/white"/> - - </RelativeLayout> - -</RelativeLayout> + android:layout_gravity="center" + android:gravity="center" + android:paddingBottom="8dp" + android:paddingTop="8dp" /> + </LinearLayout> +</android.support.design.widget.CoordinatorLayout> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 9b406036..0970c4db 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -87,4 +87,12 @@ <!-- View background --> <attr name="android:background"/> </declare-styleable> + + <declare-styleable name="InkPageIndicator"> + <attr name="dotDiameter" format="dimension" /> + <attr name="dotGap" format="dimension" /> + <attr name="animationDuration" format="integer" /> + <attr name="pageIndicatorColor" format="color" /> + <attr name="currentPageIndicatorColor" format="color" /> + </declare-styleable> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 07a65024..a16e6c63 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -76,6 +76,7 @@ <color name="black_46">#75000000</color> <color name="black_26">#42000000</color> <color name="black_11">#1C000000</color> + <color name="black">#000000</color> <!-- Default navigation drawer colors --> <color name="navigation_drawer_title_default">#df000000</color> @@ -205,4 +206,6 @@ <color name="open_file_progress_dialog_message_color">#8b000000</color> <color name="picker_activity_window_bg_color">#99000000</color> + + <color name="slide_color">@color/default_primary</color> </resources> diff --git a/res/values/dimen.xml b/res/values/dimen.xml index eecd314a..7efc0388 100644 --- a/res/values/dimen.xml +++ b/res/values/dimen.xml @@ -240,5 +240,6 @@ <dimen name="open_dialog_text_margin_top">25dp</dimen> <!-- Open dialog text padding bottom --> <dimen name="open_dialog_text_padding_bottom">21dp</dimen> - + <!-- Intro margin --> + <dimen name="intro_margin">16dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index f134b656..20cf6a5d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -879,23 +879,13 @@ <!-- Welcome Dialog - Title --> <string name="welcome_title">Welcome to File Manager</string> - - <string name="skip_text">Skip</string> - <string name="next_text">Next</string> - - <!-- Welcome Dialog - Message --> - <string name="first_message">This app allows you to explore the file system and do operations - that could break your device. To prevent damage, the app will start in a safe,low-privileged - mode. - </string> - - <string name="second_title">Placeholder Intro Title </string> - - <string name="second_message"> - \nYou can access the advanced, full-privileged mode via Settings. It\'s your - responsibility to ensure that an operation doesn\'t break your system. - \nThe CyanogenMod Team - </string> + <string name="slide0_title">Your files</string> + <string name="slide0_message">Easily copy, move, share and move your files</string> + <string name="slide1_title">Secure your private stuff</string> + <string name="slide1_message">You can move your files into a secure folder which is protected with a password</string> + <string name="slide2_title">Advanced features</string> + <string name="slide2_message">You can access system files with root Mode.\nRemember: "with great power comes great responsibility"</string> + <string name="slide_button">Get started</string> <string name="activity_not_found_exception">Couldn\'t find an app to open this file</string> diff --git a/res/values/styles.xml b/res/values/styles.xml index 6649864e..0a85c7c7 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -140,6 +140,13 @@ <item name="android:backgroundDimAmount">0.6</item> </style> + <style name="FileManager.Theme.Welcome" parent="Theme.AppCompat.Light"> + <item name="android:colorPrimary">@color/default_primary</item> + <item name="android:colorPrimaryDark">@color/default_primary_dark</item> + <item name="windowActionBar">false</item> + <item name="windowNoTitle">true</item> + </style> + <!-- Action bar --> <style name="FileManager.Widget.ActionBar.White" parent="@android:style/Widget.Material.Light.ActionBar"> <item name="android:textColorPrimary">@android:color/white</item> @@ -155,6 +162,7 @@ <item name="android:colorControlNormal">@android:color/white</item> </style> + <!-- Title --> <style name="title_text_appearance"> <item name="android:textSize">@dimen/title_text_size</item> |
