Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Whats new #1375

Merged
merged 30 commits into from
Mar 12, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
f4a5649
Add Whats new activity and embed it into project
przybylski Nov 26, 2015
1717b80
Small code cleanup in WhatsNewActivity
przybylski Nov 26, 2015
3bef3e6
Put FeatureList to separate file for cleaner code
przybylski Nov 26, 2015
5dd3df5
Remove testing stuff
przybylski Nov 26, 2015
d6dae09
Another small cleanup
przybylski Nov 26, 2015
6dad0a2
Implement left/right swipe in whats new view
przybylski Dec 2, 2015
b256236
Insert type in diamond operator, but this is just a hack to support o…
przybylski Dec 2, 2015
2e7c3ad
Show done button when only single news is available
przybylski Dec 21, 2015
034bf84
Use global method to get version code
przybylski Dec 21, 2015
8e50b26
added iOS images for the whats new screens
AndyScherzinger Jan 6, 2016
28bf623
changes indicator to more material like style
AndyScherzinger Jan 6, 2016
f4f821e
small design changes, adding arrow as vector (thus bumping gradle plu…
AndyScherzinger Jan 6, 2016
d007742
Till java7 won't be used on ant project use old diamond notation
przybylski Jan 6, 2016
373403a
rework icons to not break ANT builds
AndyScherzinger Jan 6, 2016
7c5390a
use the standard dp margin & padding references
AndyScherzinger Jan 6, 2016
15fde38
Add parameter to allow showing whats new in beta
Feb 1, 2016
1a860a1
Use ViewPager instead of custom dragging mechanism
Feb 13, 2016
d3087e3
Change the way of displaying progress indicator
Feb 13, 2016
6a4ebd6
Show whats new only once on first run
Feb 13, 2016
2949fee
tabs to spaces
Feb 13, 2016
65b9b43
tabs to spaces
Feb 13, 2016
f490d8a
Update wizard colors and resources
davigonz Feb 14, 2018
1e1e777
Change features order and texts color
davigonz Feb 14, 2018
11d857c
Step 1, manage all your files resource
davigonz Feb 15, 2018
55a4b85
Step 2, share files and folders resource
davigonz Feb 15, 2018
4a0abda
Step 3, multi account resources
davigonz Feb 16, 2018
00a4843
Step 4, camera uploads resources + update some titles
davigonz Feb 16, 2018
89ff915
Step 5, video streaming resources
davigonz Feb 20, 2018
1b482c3
Update some dates and minor changes
davigonz Feb 20, 2018
f0d4bd6
Include flag to enable or disable the wizard
davigonz Feb 21, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,7 @@
<activity
android:name=".ui.activity.UploadListActivity"
android:theme="@style/Theme.ownCloud.Toolbar.Drawer" />
<activity android:name=".ui.activity.WhatsNewActivity" />

<receiver
android:name=".broadcastreceivers.ConnectivityActionReceiver"
Expand Down
8 changes: 8 additions & 0 deletions res/drawable-anydpi-v21/arrow_right.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<!-- drawable/arrow_right.xml -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path android:fillColor="#FFFFFF" android:pathData="M4,11V13H16L10.5,18.5L11.92,19.92L19.84,12L11.92,4.08L10.5,5.5L16,11H4Z" />
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it posible to wrap this line?

</vector>
Binary file added res/drawable-hdpi/ic_arrow_forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/ic_done_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/whats_new_accounts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/whats_new_camera_uploads.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/whats_new_files.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-hdpi/whats_new_share.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_arrow_forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-mdpi/ic_done_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_arrow_forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_done_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/whats_new_accounts.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/whats_new_files.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/whats_new_share.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_arrow_forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxhdpi/ic_done_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xxxhdpi/ic_arrow_forward.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
29 changes: 29 additions & 0 deletions res/drawable/indicator_dot_not_selected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application

Copyright (C) 2018 Bartosz Przybylski
Copyright (C) 2018 ownCloud GmbH.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="5dp" android:top="5dp" android:right="5dp" android:left="5dp">

<shape
android:shape="oval">
<solid android:color="@color/white_transparent"/>
<size android:width="8dp" android:height="8dp" />
</shape>
</item>
</layer-list>
28 changes: 28 additions & 0 deletions res/drawable/indicator_dot_selected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application

Copyright (C) 2018 Bartosz Przybylski
Copyright (C) 2018 ownCloud GmbH.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item android:bottom="5dp" android:top="5dp" android:right="5dp" android:left="5dp">
<shape
android:shape="oval">
<solid android:color="@color/white"/>
<size android:width="8dp" android:height="8dp" />
</shape>
</item>
</layer-list>
5 changes: 5 additions & 0 deletions res/drawable/round_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/owncloud_blue_accent"/>
</shape>
25 changes: 25 additions & 0 deletions res/drawable/whats_new_progress_transition.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
ownCloud Android client application

Copyright (C) 2018 Bartosz Przybylski
Copyright (C) 2018 ownCloud GmbH.

This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2,
as published by the Free Software Foundation.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.

You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->

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

<item android:drawable="@drawable/indicator_dot_not_selected" />
<item android:drawable="@drawable/indicator_dot_selected" />
</transition>
61 changes: 61 additions & 0 deletions res/layout/whats_new_activity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="100"
android:background="@color/owncloud_blue_accent">

<android.support.v4.view.ViewPager
android:id="@+id/contentPanel"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="90">
</android.support.v4.view.ViewPager>

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="10"
android:weightSum="3"
android:layout_marginBottom="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_margin"
android:layout_marginRight="@dimen/standard_margin">

<android.support.v7.widget.AppCompatButton
android:id="@+id/skip"
style="@style/Button.Borderless"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Skip"
android:textColor="@color/white"
android:layout_gravity="center_vertical|center_horizontal"/>

<com.owncloud.android.ui.whatsnew.ProgressIndicator
android:id="@+id/progressIndicator"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:layout_gravity="center_vertical|center_horizontal">
</com.owncloud.android.ui.whatsnew.ProgressIndicator>

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical"
android:layout_gravity="center">
<ImageButton
android:id="@+id/forward"
android:src="@drawable/ic_arrow_forward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="@dimen/standard_padding"
style="@style/Button.Borderless"/>
</LinearLayout>
</LinearLayout>

</LinearLayout>
33 changes: 33 additions & 0 deletions res/layout/whats_new_element.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:weightSum="100">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/whatsNewImage"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:layout_weight="80"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textStyle="bold"
android:textColor="@color/white"
android:id="@+id/whatsNewTitle"
android:layout_gravity="center_horizontal"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:id="@+id/whatsNewText"
android:layout_margin="@dimen/standard_margin"
android:layout_gravity="center_horizontal"
android:textColor="@color/white"/>
</LinearLayout>
1 change: 1 addition & 0 deletions res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@
<color name="list_item_lastmod_and_filesize_text">@color/secondaryTextColor</color>
<color name="black">#000000</color>
<color name="white">#FFFFFF</color>
<color name="white_transparent">#4DFFFFFF</color>
<color name="fab_white">#fafafa</color>
<color name="white_pressed">#f1f1f1</color>
<color name="half_black">#808080</color>
Expand Down
2 changes: 2 additions & 0 deletions res/values/setup.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>

<!-- App name and other strings-->
<string name="app_name" formatted="false">ownCloud</string>
<string name="account_type" formatted="false">owncloud</string> <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
Expand Down Expand Up @@ -61,6 +62,7 @@
<bool name="feedback_enabled">true</bool>
<bool name="logger_enabled">false</bool>
<bool name="privacy_policy_enabled">true</bool>
<bool name="wizard_enabled">true</bool>
<string name="url_privacy_policy" formatted="false">https://owncloud.com/privacy-legal/</string>
<string name="url_help" formatted="false">http://owncloud.com/mobile/help</string>
<string name="url_imprint" formatted="false"></string>
Expand Down
15 changes: 15 additions & 0 deletions res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -540,4 +540,19 @@
<item quantity="other">%d selected</item>
</plurals>

<!-- Welcome to oC intro features -->
<string name="welcome_feature_1_title">Manage all your synced files</string>
<string name="welcome_feature_1_text">You can copy, move, delete</string>

<string name="welcome_feature_2_title">Share files and folders</string>
<string name="welcome_feature_2_text">You can share privately or publicly</string>

<string name="welcome_feature_3_title">Multi account</string>
<string name="welcome_feature_3_text">Connect to all your ownCloud servers</string>

<string name="welcome_feature_4_title">Camera uploads</string>
<string name="welcome_feature_4_text">Your pictures/videos automatically uploaded</string>

<string name="welcome_feature_5_title">Video streaming</string>
<string name="welcome_feature_5_text">Play your videos without downloading them</string>
</resources>
11 changes: 11 additions & 0 deletions src/com/owncloud/android/MainApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@
import com.owncloud.android.lib.common.authentication.oauth.OAuth2ProvidersRegistry;
import com.owncloud.android.lib.common.authentication.oauth.OwnCloudOAuth2Provider;
import com.owncloud.android.lib.common.utils.Log_OC;
import com.owncloud.android.ui.activity.WhatsNewActivity;


/**
Expand Down Expand Up @@ -119,6 +120,7 @@ public void onCreate(){
@Override
public void onActivityCreated(Activity activity, Bundle savedInstanceState) {
Log_OC.d(activity.getClass().getSimpleName(), "onCreate(Bundle) starting" );
WhatsNewActivity.runIfNeeded(activity);
PassCodeManager.getPassCodeManager().onActivityCreated(activity);
PatternManager.getPatternManager().onActivityCreated(activity);
}
Expand Down Expand Up @@ -171,6 +173,15 @@ public static Context getAppContext() {
public static String getAccountType() {
return getAppContext().getResources().getString(R.string.account_type);
}

public static int getVersionCode() {
try {
String thisPackageName = getAppContext().getPackageName();
return getAppContext().getPackageManager().getPackageInfo(thisPackageName, 0).versionCode;
} catch (PackageManager.NameNotFoundException e) {
return 0;
}
}

public static String getAuthority() {
return getAppContext().getResources().getString(R.string.authority);
Expand Down
Loading