Skip to content

Commit f4fdc55

Browse files
committed
Upload file button text size configured.
1 parent a82b934 commit f4fdc55

File tree

5 files changed

+72
-0
lines changed

5 files changed

+72
-0
lines changed
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
package com.nmc.android.utils
2+
3+
import android.content.res.Configuration
4+
import com.owncloud.android.MainApp
5+
import com.owncloud.android.R
6+
7+
object DisplayUtils {
8+
9+
@JvmStatic
10+
fun isShowDividerForList(): Boolean = isTablet() || isLandscapeOrientation()
11+
12+
@JvmStatic
13+
fun isTablet(): Boolean = MainApp.getAppContext().resources.getBoolean(R.bool.isTablet)
14+
15+
@JvmStatic
16+
fun isLandscapeOrientation(): Boolean =
17+
MainApp.getAppContext().resources.configuration.orientation == Configuration.ORIENTATION_LANDSCAPE
18+
}

app/src/main/java/com/owncloud/android/ui/activity/UploadFilesActivity.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import android.content.pm.PackageManager;
2828
import android.os.Bundle;
2929
import android.os.Environment;
30+
import android.util.TypedValue;
3031
import android.view.Menu;
3132
import android.view.MenuItem;
3233
import android.view.View;
@@ -58,6 +59,7 @@
5859
import java.io.File;
5960
import java.util.ArrayList;
6061
import java.util.List;
62+
import java.util.Locale;
6163

6264
import javax.inject.Inject;
6365

@@ -196,6 +198,19 @@ public void onCreate(Bundle savedInstanceState) {
196198
binding.uploadFilesBtnUpload.setOnClickListener(this);
197199
binding.uploadFilesBtnUpload.setEnabled(mLocalFolderPickerMode);
198200

201+
//reduce the button text size so that the text doesn't go to next line
202+
//this should only happen for GERMAN language
203+
//and device should not be tablet and should be in portrait mode
204+
if (!com.nmc.android.utils.DisplayUtils.isTablet() && !com.nmc.android.utils.DisplayUtils.isLandscapeOrientation()) {
205+
if (Locale.getDefault().getLanguage().equals(Locale.GERMAN.getLanguage())
206+
|| Locale.getDefault().getLanguage().equals(Locale.GERMANY.getLanguage())) {
207+
binding.uploadFilesBtnUpload.setTextSize(TypedValue.COMPLEX_UNIT_PX,
208+
getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
209+
binding.uploadFilesBtnCancel.setTextSize(TypedValue.COMPLEX_UNIT_PX,
210+
getResources().getDimensionPixelSize(R.dimen.txt_size_13sp));
211+
}
212+
}
213+
199214
int localBehaviour = preferences.getUploaderBehaviour();
200215

201216
// file upload spinner
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="isTablet">true</bool>
4+
</resources>

app/src/main/res/values/bool.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<bool name="isTablet">false</bool>
4+
</resources>

app/src/main/res/values/dimens.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<dimen name="grid_recyclerview_padding">4dp</dimen>
4+
<dimen name="list_item_icons_size">16dp</dimen>
5+
<dimen name="grid_item_icons_size">24dp</dimen>
6+
<dimen name="media_grid_item_rv_spacing">6dp</dimen>
7+
<dimen name="txt_size_18sp">18sp</dimen>
8+
<dimen name="txt_size_15sp">15sp</dimen>
9+
<dimen name="crop_corner_size">15dp</dimen>
10+
<dimen name="edit_scan_bottom_bar_height">56dp</dimen>
11+
<dimen name="standard_folders_grid_item_size">86dp</dimen>
12+
<dimen name="standard_files_grid_item_size">80dp</dimen>
13+
<dimen name="txt_size_11sp">11sp</dimen>
14+
<dimen name="share_row_icon_size">30dp</dimen>
15+
<dimen name="create_link_button_height">55dp</dimen>
16+
<dimen name="note_et_height">258dp</dimen>
17+
<dimen name="txt_size_17sp">17sp</dimen>
18+
<dimen name="share_exp_date_divider_margin">20dp</dimen>
19+
<dimen name="privacy_btn_width">160dp</dimen>
20+
<dimen name="privacy_icon_size">50dp</dimen>
21+
<dimen name="login_btn_width">150dp</dimen>
22+
<dimen name="login_btn_height">55dp</dimen>
23+
<dimen name="login_btn_bottom_margin">48dp</dimen>
24+
<dimen name="login_btn_bottom_margin_land">48dp</dimen>
25+
<dimen name="login_btn_bottom_margin_small_screen">24dp</dimen>
26+
<dimen name="shared_with_me_icon_size">26dp</dimen>
27+
<dimen name="txt_size_20sp">20sp</dimen>
28+
<dimen name="notification_row_item_height">145dp</dimen>
29+
<dimen name="button_stroke_width">1dp</dimen>
30+
<dimen name="txt_size_13sp">13sp</dimen>
31+
</resources>

0 commit comments

Comments
 (0)