Skip to content

Commit 3753832

Browse files
remove 200 features from whats new
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
1 parent 5522b0b commit 3753832

File tree

9 files changed

+16
-36
lines changed

9 files changed

+16
-36
lines changed

lint.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,12 @@
1717
</issue>
1818

1919
<issue id="ExtraTranslation">
20+
<ignore path="**/strings.xml"/>
21+
<ignore path="**/values-b+en+001/strings.xml"/>
22+
</issue>
23+
24+
<issue id="UnusedResources">
25+
<ignore path="**/values-b+en+001/strings.xml"/>
2026
<ignore path="**/values-pt-rPT/strings.xml"/>
2127
<ignore path="**/values-ro/strings.xml"/>
2228
<ignore path="**/values-zh-rCN/strings.xml"/>

src/main/java/com/owncloud/android/features/FeatureList.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ public class FeatureList {
3939
private static final boolean SHOW_ON_UPGRADE = false;
4040

4141
private static final int VERSION_1_0_0 = 10000099;
42-
private static final int VERSION_2_0_0 = 20000099;
4342
private static final int BETA_VERSION_0 = 0;
4443

4544
static final private FeatureItem featuresList[] = {
@@ -53,17 +52,6 @@ public class FeatureList {
5352
new FeatureItem(R.drawable.whats_new_auto_upload,
5453
R.string.welcome_feature_3_title, R.string.welcome_feature_3_text,
5554
VERSION_1_0_0, BETA_VERSION_0, SHOW_ON_FIRST_RUN),
56-
// 2.0.0
57-
new FeatureItem(R.drawable.whats_new_auto_upload, R.string.whats_new_auto_upload_title,
58-
R.string.whats_new_auto_upload_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
59-
new FeatureItem(R.drawable.whats_new_search, R.string.whats_new_search_title,
60-
R.string.whats_new_search_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
61-
new FeatureItem(R.drawable.whats_new_theming, R.string.whats_new_theming_title,
62-
R.string.whats_new_theming_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
63-
new FeatureItem(R.drawable.whats_new_notification, R.string.whats_new_notification_title,
64-
R.string.whats_new_notification_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false),
65-
new FeatureItem(R.drawable.whats_new_fingerprint, R.string.whats_new_fingerprint_title,
66-
R.string.whats_new_fingerprint_content, VERSION_2_0_0, BETA_VERSION_0, SHOW_ON_UPGRADE, false)
6755
};
6856

6957
static public FeatureItem[] get() {

src/main/java/com/owncloud/android/ui/activity/WhatsNewActivity.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ protected void onCreate(Bundle savedInstanceState) {
8080

8181
int fontColor = ThemeUtils.fontColor();
8282

83-
mProgress = (ProgressIndicator) findViewById(R.id.progressIndicator);
84-
mPager = (ViewPager) findViewById(R.id.contentPanel);
83+
mProgress = findViewById(R.id.progressIndicator);
84+
mPager = findViewById(R.id.contentPanel);
8585
final boolean isBeta = getResources().getBoolean(R.bool.is_beta);
8686
String[] urls = getResources().getStringArray(R.array.whatsnew_urls);
8787

@@ -110,7 +110,7 @@ protected void onCreate(Bundle savedInstanceState) {
110110
mPager.addOnPageChangeListener(this);
111111

112112

113-
mForwardFinishButton = (ImageButton) findViewById(R.id.forward);
113+
mForwardFinishButton = findViewById(R.id.forward);
114114
ThemeUtils.colorImageButton(mForwardFinishButton, fontColor);
115115

116116
mForwardFinishButton.setOnClickListener(new View.OnClickListener() {
@@ -133,7 +133,7 @@ public void onClick(View view) {
133133
mForwardFinishButton.setBackgroundDrawable(null);
134134
}
135135

136-
mSkipButton = (Button) findViewById(R.id.skip);
136+
mSkipButton = findViewById(R.id.skip);
137137
mSkipButton.setTextColor(fontColor);
138138
mSkipButton.setOnClickListener(new View.OnClickListener() {
139139
@Override
@@ -143,7 +143,7 @@ public void onClick(View view) {
143143
}
144144
});
145145

146-
TextView tv = (TextView) findViewById(R.id.welcomeText);
146+
TextView tv = findViewById(R.id.welcomeText);
147147

148148
if (showWebView) {
149149
tv.setText(R.string.app_name);
@@ -278,7 +278,7 @@ public View onCreateView(LayoutInflater inflater,
278278
@Nullable Bundle savedInstanceState) {
279279
View v = inflater.inflate(R.layout.whats_new_webview_element, container, false);
280280

281-
WebView webView = (WebView) v.findViewById(R.id.whatsNewWebView);
281+
WebView webView = v.findViewById(R.id.whatsNewWebView);
282282
webView.getSettings().setJavaScriptEnabled(true);
283283
webView.getSettings().setDomStorageEnabled(true);
284284
webView.getSettings().setAllowFileAccess(false);
@@ -334,18 +334,18 @@ public View onCreateView(LayoutInflater inflater,
334334
View v = inflater.inflate(R.layout.whats_new_element, container, false);
335335
int fontColor = ThemeUtils.fontColor();
336336

337-
ImageView iv = (ImageView) v.findViewById(R.id.whatsNewImage);
337+
ImageView iv = v.findViewById(R.id.whatsNewImage);
338338
if (mItem.shouldShowImage()) {
339339
iv.setImageResource(mItem.getImage());
340340
}
341341

342-
TextView tv2 = (TextView) v.findViewById(R.id.whatsNewTitle);
342+
TextView tv2 = v.findViewById(R.id.whatsNewTitle);
343343
if (mItem.shouldShowTitleText()) {
344344
tv2.setText(mItem.getTitleText());
345345
tv2.setTextColor(fontColor);
346346
}
347347

348-
tv2 = (TextView) v.findViewById(R.id.whatsNewText);
348+
tv2 = v.findViewById(R.id.whatsNewText);
349349
if (mItem.shouldShowContentText()) {
350350
tv2.setText(mItem.getContentText());
351351
tv2.setTextColor(fontColor);
-29.9 KB
Binary file not shown.
-8.93 KB
Binary file not shown.
-39.2 KB
Binary file not shown.
-36.6 KB
Binary file not shown.

src/main/res/layout/whats_new_element.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@
5959
android:gravity="center"
6060
android:text="@string/welcome_feature_1_text"
6161
android:textAppearance="@style/NextcloudTextAppearanceMedium"
62-
android:textColor="@color/login_text_hint_color"/>
62+
android:textColor="@color/login_text_hint_color" />
6363
</LinearLayout>

src/main/res/values/strings.xml

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -601,18 +601,6 @@
601601
<string name="welcome_feature_3_title">Auto upload</string>
602602
<string name="welcome_feature_3_text">Keep your photos safe</string>
603603

604-
<string name="whats_new_auto_upload_title">Enhanced auto upload</string>
605-
<string name="whats_new_auto_upload_content">\u2022 for all Android versions\n\u2022 less battery consumption\n\u2022 more reliable, but not instant\n\u2022 separation of images &amp; videos</string>
606-
607-
<string name="whats_new_search_title">Full server search</string>
608-
<string name="whats_new_search_content">\u2022 Not only in current folder\n\u2022 Returns results from complete server\n\u2022 Directly open files/folders\n\u2022 Supported in NC12 and above</string>
609-
610-
<string name="whats_new_theming_title">Theming support</string>
611-
<string name="whats_new_theming_content">If enabled on server, app will show\n\u2022 background image\n\u2022 server name\n\u2022 use color to distinguish accounts</string>
612-
613-
<string name="whats_new_notification_title">Notification support</string>
614-
<string name="whats_new_notification_content">Get notifications like\n\u2022 new remote share\n\u2022 comment mentions\n\u2022 admin announcements</string>
615-
616604
<string name="whats_new_skip">Skip</string>
617605

618606
<string name="fingerprint_scan_finger">Please scan your finger</string>
@@ -665,8 +653,6 @@
665653
<string name="test_server_button">Test server connection</string>
666654
<string name="info_separator" translatable="false">,</string>
667655
<string name="resharing_is_not_allowed">Resharing is not allowed</string>
668-
<string name="whats_new_fingerprint_title">Unlock with fingerprint</string>
669-
<string name="whats_new_fingerprint_content">Use your fingerprint to unlock the app</string>
670656
<string name="fallback_weblogin_back">Back</string>
671657
<string name="fallback_weblogin_text">Revert to old login method</string>
672658

0 commit comments

Comments
 (0)