Merge pull request #542 from stefan-niedermann/master

Nextcloud Theme (#541)

News-Android-App/src/main/ic_launcher.svg

@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 595.275 311.111"
+   xml:space="preserve"
+   height="512"
+   width="512"
+   version="1.1"
+   y="0px"
+   x="0px"
+   id="svg2"
+   viewBox="0 0 512 512"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ic_launcher.svg"><metadata
+     id="metadata10"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs8" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1366"
+     inkscape:window-height="688"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.46125"
+     inkscape:cx="806.22436"
+     inkscape:cy="125.55499"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><rect
+     rx="70"
+     ry="70"
+     height="448"
+     width="448"
+     y="32"
+     x="32"
+     id="rect4"
+     style="fill:#0082C9" /><path
+     style="fill:#ffffff"
+     inkscape:connector-curvature="0"
+     d="M 100.92858,89 C 94.320137,89 89,94.320137 89,100.92858 v 23.85713 c 0,6.60843 5.320137,11.92858 11.92858,11.92858 h 310.14284 c 6.60844,0 11.92858,-5.32015 11.92858,-11.92858 V 100.92858 C 423,94.320137 417.67986,89 411.07142,89 H 100.92858 z m 0,95.42858 C 94.320137,184.42858 89,189.74871 89,196.35714 v 23.85715 c 0,6.60842 5.320137,11.92857 11.92858,11.92857 h 214.71428 c 6.60843,0 11.92856,-5.32015 11.92856,-11.92857 v -23.85715 c 0,-6.60843 -5.32013,-11.92856 -11.92856,-11.92856 H 100.92858 z m 0,95.42856 C 94.320137,279.85714 89,285.17729 89,291.78571 v 23.85715 c 0,6.60843 5.320137,11.92856 11.92858,11.92856 h 286.28571 c 6.60842,0 11.92857,-5.32013 11.92857,-11.92856 v -23.85715 c 0,-6.60842 -5.32015,-11.92857 -11.92857,-11.92857 H 100.92858 z m 0,95.42857 C 94.320137,375.28571 89,380.60586 89,387.21429 v 23.85713 C 89,417.67986 94.320137,423 100.92858,423 H 244.07142 C 250.67986,423 256,417.67986 256,411.07142 v -23.85713 c 0,-6.60843 -5.32014,-11.92858 -11.92858,-11.92858 H 100.92858 z"
+     id="path4-6" /></svg>

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java

@@ -458,7 +458,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
 		MaterialShowcaseSequence sequence = new MaterialShowcaseSequence(this, "SWIPE_LEFT_RIGHT_AND_PTR");
 		sequence.setConfig(config);
 		sequence.addSequenceItem(getNewsReaderDetailFragment().pbLoading,
-                "Pull-to-Refresh to sync with ownCloud", "GOT IT");
+                "Pull-to-Refresh to sync with server", "GOT IT");
 		sequence.addSequenceItem(getNewsReaderDetailFragment().pbLoading,
                 "Swipe Left/Right to mark article as read", "GOT IT");
 		sequence.start();

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListFragment.java

@@ -257,7 +257,7 @@ public class NewsReaderListFragment extends Fragment implements OnCreateContextM
         new MaterialShowcaseView.Builder(getActivity())
                 .setTarget(headerLogo)
                 .setDismissText("GOT IT")
-                .setContentText("Tap this logo to sync with ownCloud")
+                .setContentText("Tap this logo to sync with server")
                 .setDelay(300) // optional but starting animations immediately in onCreate can make them choppy
                 .singleUse("LOGO_SYNC") // provide a unique ID used to ensure it is only shown once
                 .show();

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/authentication/AccountGeneral.java

@@ -16,9 +16,9 @@ public class AccountGeneral {
 	 * Auth token types
 	 */
 	public static final String AUTHTOKEN_TYPE_READ_ONLY = "Read only";
-	public static final String AUTHTOKEN_TYPE_READ_ONLY_LABEL = "Read only access to an ownCloud News account";
+	public static final String AUTHTOKEN_TYPE_READ_ONLY_LABEL = "Read only access to an Nextcloud News account";
 
 	public static final String AUTHTOKEN_TYPE_FULL_ACCESS = "Full access";
-	public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an ownCloud News account";
+	public static final String AUTHTOKEN_TYPE_FULL_ACCESS_LABEL = "Full access to an Nextcloud News account";
 
 }

News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadImagesService.java

@@ -153,7 +153,7 @@ public class DownloadImagesService extends IntentService {
         Intent intentNewsReader = new Intent(this, NewsReaderListActivity.class);
         PendingIntent pIntent = PendingIntent.getActivity(this, 0, intentNewsReader, 0);
         NotificationCompat.Builder notifyBuilder = new NotificationCompat.Builder(this)
-                .setContentTitle("ownCloud News Reader")
+                .setContentTitle("Nextcloud News")
                 .setContentText("Only " + limit + " images can be cached at once")
                 .setSmallIcon(R.drawable.ic_notification)
                 .setContentIntent(pIntent);

News-Android-App/src/main/res/values/colors.xml

@@ -25,8 +25,8 @@
 
 
 
-    <color name="owncloudBlueLight">#35537A</color>
+    <color name="owncloudBlueLight">#0082C9</color>
-    <color name="owncloudBlueDark">#1D2D44</color>
+    <color name="owncloudBlueDark">#006AA3</color>
 
     <color name="colorPrimaryDarkTheme">@color/owncloudBlueDark</color>
     <color name="colorPrimaryDarkDarkTheme">@color/owncloudBlueLight</color>

News-Android-App/src/main/res/values/strings.xml

@@ -2,7 +2,7 @@
 <resources>
 
     <string name="auto_sync_string">Auto sync</string>
-    <string name="app_name">ownCloud News</string>
+    <string name="app_name">Nextcloud News</string>
     <string name="title_activity_sync_interval_selector">Sync Interval Selector</string>
     <string name="title_activity_news_detail">NewsDetailActivity</string>
     <string name="empty_view_content">No items here</string>
@@ -10,7 +10,7 @@
     <string name="no_wifi_available">No WiFi connected</string>
     <string name="do_you_want_to_download_without_wifi">Do you want to download the images without a WiFi connection</string>
     <string name="current_version">You\'re using Version %s</string>
-    <string name="widget_header">ownCloud News</string>
+    <string name="widget_header">Nextcloud News</string>
     <plurals name="message_bar_new_articles_available">
         <item quantity="one">%d new item available</item>
         <item quantity="other">%d new items available</item>
@@ -80,8 +80,8 @@
     <!-- Strings related to login -->
     <string name="pref_title_username">Username</string>
     <string name="pref_title_password">Password</string>
-    <string name="pref_title_owncloudRootPath">ownCloud root address</string>
+    <string name="pref_title_owncloudRootPath">Nextcloud root address</string>
-    <string name="pref_default_owncloudRootPath">https://1.2.3.4/owncloud</string>
+    <string name="pref_default_owncloudRootPath">https://1.2.3.4/nextcloud</string>
 
     <string name="action_sign_in_short">Sign in</string>
     <string name="login_progress_signing_in">Signing in…</string>
@@ -213,7 +213,7 @@
     <string name="login_dialog_title_error">Error</string>
     <string name="login_dialog_text_something_went_wrong">Something went wrong :(</string>
     <string name="login_dialog_text_zero_version_code">The Web News App returned Version "0". Please take a look at the following bug report: https://github.com/nextcloud/news/issues/5#issuecomment-242883795</string>
-    <string name="login_dialog_text_not_compatible">This App version is not compatible with your ownCloud News App. Please update the news app and the appframework.</string>
+    <string name="login_dialog_text_not_compatible">This App version is not compatible with your Nextcloud News App. Please update the news app and the appframework.</string>
     <string name="login_dialog_title_security_warning">Security Warning</string>
     <string name="login_dialog_text_security_warning">You\'re not using https. An attacker could intercept your traffic and gain access to some sensitive data (e.g. your password). So it\'s strongly recommend to use https!</string>