Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2087d2d
Add Whats new activity and embed it into project
przybylski Nov 26, 2015
f6520fd
Small code cleanup in WhatsNewActivity
przybylski Nov 26, 2015
0e05c50
Put FeatureList to separate file for cleaner code
przybylski Nov 26, 2015
ebf39a8
Remove testing stuff
przybylski Nov 26, 2015
3d9f35e
Another small cleanup
przybylski Nov 26, 2015
0ecda26
Implement left/right swipe in whats new view
przybylski Dec 2, 2015
0bba522
Insert type in diamond operator, but this is just a hack to support o…
przybylski Dec 2, 2015
3a9b683
Show done button when only single news is available
przybylski Dec 21, 2015
d837958
Use global method to get version code
przybylski Dec 21, 2015
3e1c82d
added iOS images for the whats new screens
AndyScherzinger Jan 6, 2016
5891619
changes indicator to more material like style
AndyScherzinger Jan 6, 2016
0b9a1d0
small design changes, adding arrow as vector (thus bumping gradle plu…
AndyScherzinger Jan 6, 2016
c700937
Till java7 won't be used on ant project use old diamond notation
przybylski Jan 6, 2016
1c19e55
rework icons to not break ANT builds
AndyScherzinger Jan 6, 2016
0e10c08
use the standard dp margin & padding references
AndyScherzinger Jan 6, 2016
deaf569
Add parameter to allow showing whats new in beta
Feb 1, 2016
bd91cb0
Use ViewPager instead of custom dragging mechanism
Feb 13, 2016
907a61b
Change the way of displaying progress indicator
Feb 13, 2016
9182622
Show whats new only once on first run
Feb 13, 2016
2663ff8
tabs to spaces
Feb 13, 2016
5ee2fba
tabs to spaces
Feb 13, 2016
a811fe2
Code review fixes
przybylski Jul 2, 2016
3cc09dd
fixed arrow color, images and logos
AndyScherzinger Sep 15, 2016
faaa973
fixed arrow icon color
AndyScherzinger Sep 15, 2016
528b8d5
resized font sizes
AndyScherzinger Sep 18, 2016
48839dd
Add new graphics for colorful whats new background
eppfel Sep 26, 2016
d23a01b
incorporating the new feature graphics and coloring
AndyScherzinger Sep 26, 2016
91fc60e
hide "skip" button on last feature element
AndyScherzinger Sep 27, 2016
dd010cb
organize imports after rebase
AndyScherzinger Nov 2, 2016
ae40988
fixed headers and code duplication
AndyScherzinger Nov 7, 2016
8436dc9
removal of code warnings
AndyScherzinger Nov 7, 2016
786f00f
fixed codacy warnings
AndyScherzinger Nov 7, 2016
7bf7299
re-add missing methods
AndyScherzinger Nov 7, 2016
6eacd30
fix "showing double whatsnew screen on first start" once again ;)
tobiasKaminsky Nov 10, 2016
4f7b341
Rework artwork and remove sharing graphic
eppfel Nov 23, 2016
a49b544
fixed feature list / string for revamped what's new images
AndyScherzinger Nov 23, 2016
a2190bf
1.4.0 RC3
AndyScherzinger Nov 23, 2016
7d54ab0
revised text and order
AndyScherzinger Nov 23, 2016
4a2ebb4
optimized whats new feature item layout
AndyScherzinger Nov 23, 2016
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
10 changes: 6 additions & 4 deletions AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.owncloud.android"
android:versionCode="10040002"
android:versionName="1.4.0 RC2">
android:versionCode="10040003"
android:versionName="1.4.0 RC3">

<uses-sdk
android:minSdkVersion="14"
Expand Down Expand Up @@ -183,7 +183,7 @@
android:name=".authentication.AuthenticatorActivity"
android:exported="true"
android:launchMode="singleTask"
android:theme="@style/Theme.ownCloud.noActionBar.Login" >
android:theme="@style/Theme.ownCloud.noActionBar.Login">
<intent-filter>
<action android:name="android.intent.action.VIEW" />

Expand Down Expand Up @@ -219,7 +219,9 @@

<activity android:name=".ui.errorhandling.ErrorShowActivity" />
<activity android:name=".ui.activity.UploadListActivity" />

<activity android:name=".ui.activity.WhatsNewActivity"
android:theme="@style/Theme.ownCloud.noActionBar.Login" />

<receiver android:name=".files.services.ConnectivityActionReceiver"
android:enabled="true" android:label="ConnectivityActionReceiver">
<intent-filter>
Expand Down
27 changes: 27 additions & 0 deletions res/drawable-anydpi-v21/arrow_right.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<!--
Nextcloud Android client application

Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<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" />
</vector>
Binary file added res/drawable-hdpi/arrow_right.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/what_new_instant_upload.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_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-mdpi/arrow_right.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/arrow_right.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-xxhdpi/arrow_right.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/arrow_right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 31 additions & 0 deletions res/drawable/indicator_dot_not_selected.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2015-2016 Bartosz Przybylski
Copyright (C) 2015 ownCloud Inc.
Copyright (C) 2016 Nextcloud.

Copy link
Member

Choose a reason for hiding this comment

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

also "nextcloud"?

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero 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/owncloud_blue_dark_transparent"/>
Copy link
Member

Choose a reason for hiding this comment

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

is this adapted to the new nextcloud colour?

Copy link
Member Author

Choose a reason for hiding this comment

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

No, I'm just using colors already defined in resources

Copy link
Member

Choose a reason for hiding this comment

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

I can check for the colors, but should have adapted most values, so working with the references should work perfectly fine, but I'll do a check just to make sure I set all values :)

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

Copyright (C) 2015-2016 Bartosz Przybylski
Copyright (C) 2015 ownCloud Inc.
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero 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>
25 changes: 25 additions & 0 deletions res/drawable/round_button.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2016 Andy Scherzinger
Copyright (C) 2015 ownCloud Inc.
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/owncloud_blue_accent"/>
Copy link
Member

Choose a reason for hiding this comment

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

same?

</shape>
24 changes: 24 additions & 0 deletions res/drawable/whats_new_progress_transition.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2015 Bartosz Przybylski
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero 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>
90 changes: 90 additions & 0 deletions res/layout/whats_new_activity.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,90 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2015-2016 Bartosz Przybylski
Copyright (C) 2015 ownCloud Inc.
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:weightSum="100">

<TextView
android:id="@+id/welcomeText"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_margin="5dp"
android:layout_weight="10"
android:gravity="center"
android:text="@string/placeholder_sentence"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="@color/login_text_hint_color"/>

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

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

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

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

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="vertical">

<ImageButton
android:id="@+id/forward"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:padding="@dimen/standard_padding"
android:src="@drawable/arrow_right"/>
</LinearLayout>
</LinearLayout>

</LinearLayout>
62 changes: 62 additions & 0 deletions res/layout/whats_new_element.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Nextcloud Android client application

Copyright (C) 2015-2016 Bartosz Przybylski
Copyright (C) 2015 ownCloud Inc.
Copyright (C) 2016 Nextcloud.

This program is free software; you can redistribute it and/or
modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
License as published by the Free Software Foundation; either
version 3 of the License, or any later version.

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 AFFERO GENERAL PUBLIC LICENSE for more details.

You should have received a copy of the GNU Affero General Public
License along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<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="0dp"
android:id="@+id/whatsNewImage"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp"
android:layout_weight="50"
android:src="@drawable/whats_new_files"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/NextcloudTextAppearanceHeadline"
android:textColor="@color/white"
android:textStyle="bold"
android:text="@string/welcome_feature_1_title"
android:id="@+id/whatsNewTitle"
android:layout_margin="@dimen/standard_margin"
android:layout_gravity="center_horizontal"
android:gravity="center"/>

<TextView
android:id="@+id/whatsNewText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginBottom="@dimen/standard_margin"
android:layout_marginLeft="@dimen/standard_double_margin"
android:layout_marginRight="@dimen/standard_double_margin"
android:layout_marginTop="@dimen/standard_margin"
android:gravity="center"
android:text="@string/welcome_feature_1_text"
android:textAppearance="@style/NextcloudTextAppearanceMedium"
android:textColor="@color/login_text_hint_color"/>
</LinearLayout>
1 change: 1 addition & 0 deletions res/values/dims.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
<dimen name="standard_half_padding">8dp</dimen>
<dimen name="standard_quarter_padding">4dp</dimen>
<dimen name="standard_margin">16dp</dimen>
<dimen name="standard_double_margin">32dp</dimen>
<dimen name="standard_half_margin">8dp</dimen>
<dimen name="standard_quarter_margin">4dp</dimen>
<dimen name="standard_eighth_margin">2dp</dimen>
Expand Down
3 changes: 3 additions & 0 deletions res/values/setup.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- Beta indicator -->
<bool name="is_beta">false</bool>

<!-- App name and other strings-->
<string name="app_name">Nextcloud</string>
<string name="account_type">nextcloud</string> <!-- better if was a domain name; but changing it now would require migrate accounts when the app is updated -->
Expand Down
16 changes: 15 additions & 1 deletion res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@
<string name="network_error_socket_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
<string name="network_error_connect_timeout_exception">An error occurred while waiting for the server; the operation couldn\'t be completed</string>
<string name="network_host_not_available">The operation couldn\'t be completed; server is unavailable</string>
<string name="empty" />
<string name="empty" translatable="false" />

<string name="forbidden_permissions">You do not have permission %s</string>
<string name="forbidden_permissions_rename">to rename this file</string>
Expand Down Expand Up @@ -545,4 +545,18 @@
<string name="storage_description_sd_no">SD card %1$d</string>
<string name="storage_description_unknown">Unknown</string>

<!-- What's new feature and texts to show -->
<string name="whats_new_title">What\'s new in Nextcloud</string>

<!-- Welcome to Nc intro features -->
<string name="welcome_feature_1_title">A safe home for all your data</string>
<string name="welcome_feature_1_text">Access, share &amp; protect your files at home and in your enterprise</string>

<string name="welcome_feature_2_title">Multi account</string>
<string name="welcome_feature_2_text">Connect to all your clouds</string>

<string name="welcome_feature_3_title">Instant upload</string>
<string name="welcome_feature_3_text">Keep your photos safe</string>

<string name="whats_new_skip">Skip</string>
</resources>
Loading