From 62f9379a2fcef5c500fbd5d0990a18b072572170 Mon Sep 17 00:00:00 2001 From: tom79 Date: Tue, 15 Aug 2017 11:45:33 +0200 Subject: [PATCH] Layout changes + programmatically set zoom values for text & icons --- .../mastodon/activities/MainActivity.java | 61 +++++++++++++++++ .../gouv/etalab/mastodon/helper/Helper.java | 2 + .../drawable-hdpi/ic_action_decrease_menu.png | Bin 0 -> 129 bytes .../drawable-hdpi/ic_action_increase_menu.png | Bin 0 -> 134 bytes .../drawable-ldpi/ic_action_decrease_menu.png | Bin 0 -> 98 bytes .../drawable-ldpi/ic_action_increase_menu.png | Bin 0 -> 119 bytes .../drawable-mdpi/ic_action_decrease_menu.png | Bin 0 -> 111 bytes .../drawable-mdpi/ic_action_increase_menu.png | Bin 0 -> 116 bytes .../ic_action_decrease_menu.png | Bin 0 -> 163 bytes .../ic_action_increase_menu.png | Bin 0 -> 168 bytes .../ic_action_decrease_menu.png | Bin 0 -> 215 bytes .../ic_action_increase_menu.png | Bin 0 -> 242 bytes .../ic_action_decrease_menu.png | Bin 0 -> 268 bytes .../ic_action_increase_menu.png | Bin 0 -> 500 bytes app/src/main/res/layout/popup_text_size.xml | 63 ++++++++++++++++++ app/src/main/res/menu/main.xml | 4 ++ app/src/main/res/values-fr/strings.xml | 3 + app/src/main/res/values/strings.xml | 4 +- 18 files changed, 136 insertions(+), 1 deletion(-) create mode 100644 app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-hdpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/drawable-ldpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-ldpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-mdpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-xhdpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png create mode 100644 app/src/main/res/layout/popup_text_size.xml diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java index 613e63b24..81b26fbe4 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java @@ -46,6 +46,7 @@ import android.view.inputmethod.InputMethodManager; import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; +import android.widget.SeekBar; import android.widget.TextView; import android.widget.Toast; @@ -552,6 +553,66 @@ public class MainActivity extends AppCompatActivity }) .setIcon(android.R.drawable.ic_dialog_alert) .show(); + }else if( id == R.id.action_size){ + final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int textSize = sharedpreferences.getInt(Helper.SET_TEXT_SIZE,100); + int iconSize = sharedpreferences.getInt(Helper.SET_ICON_SIZE,100); + + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setTitle(R.string.text_size); + + View popup_quick_settings = getLayoutInflater().inflate( R.layout.popup_text_size, null ); + builder.setView(popup_quick_settings); + + SeekBar set_text_size = (SeekBar) popup_quick_settings.findViewById(R.id.set_text_size); + SeekBar set_icon_size = (SeekBar) popup_quick_settings.findViewById(R.id.set_icon_size); + final TextView set_text_size_value = (TextView) popup_quick_settings.findViewById(R.id.set_text_size_value); + final TextView set_icon_size_value = (TextView) popup_quick_settings.findViewById(R.id.set_icon_size_value); + set_text_size_value.setText(String.format("%s%%",String.valueOf(textSize))); + set_icon_size_value.setText(String.format("%s%%",String.valueOf(iconSize))); + + set_text_size.setMax(12); + set_icon_size.setMax(12); + + set_text_size.setProgress(((textSize-70)/5)); + set_icon_size.setProgress(((textSize-70)/5)); + + set_text_size.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + + int value = 70 + progress*5; + set_text_size_value.setText(String.format("%s%%",String.valueOf(value))); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putInt(Helper.SET_TEXT_SIZE, value); + editor.apply(); + } + }); + set_icon_size.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() { + @Override + public void onStopTrackingTouch(SeekBar seekBar) {} + @Override + public void onStartTrackingTouch(SeekBar seekBar) {} + @Override + public void onProgressChanged(SeekBar seekBar, int progress, boolean fromUser) { + int value = 70 + progress*5; + set_icon_size_value.setText(String.format("%s%%",String.valueOf(value))); + SharedPreferences.Editor editor = sharedpreferences.edit(); + editor.putInt(Helper.SET_ICON_SIZE, value); + editor.apply(); + } + }); + builder.setPositiveButton(R.string.validate, new DialogInterface.OnClickListener() { + public void onClick(DialogInterface dialog, int which) { + dialog.dismiss(); + } + }) + .setIcon(android.R.drawable.ic_dialog_alert) + .show(); } return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java index d1eb627c9..c6c240468 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java @@ -194,6 +194,8 @@ public class Helper { public static final String SET_NSFW_TIMEOUT = "set_nsfw_timeout"; public static final String SET_TABS = "set_tabs"; public static final String SET_MEDIA_URLS = "set_media_urls"; + public static final String SET_TEXT_SIZE = "set_text_size"; + public static final String SET_ICON_SIZE = "set_icon_size"; public static final int ATTACHMENT_ALWAYS = 1; public static final int ATTACHMENT_WIFI = 2; public static final int ATTACHMENT_ASK = 3; diff --git a/app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-hdpi/ic_action_decrease_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..751443c367dd2b317d31e5da0d343566af0f6090 GIT binary patch literal 129 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC4^J1zkcwMxFCXM&FyLV}e7}Fo zZWqnW2@lyW9L}6QpBtzI862oMaGG%qi-jSwAOpjJy?m{l=C03YESw0E@O1TaS?83{ F1OTG9ADaLG literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-hdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-hdpi/ic_action_increase_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..7800ba33d627ceed4ab719da9cd8ce23ec437f50 GIT binary patch literal 134 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTCUr!gukcwMxZ*1gbFc4sJ_#S_2 zi=+a}Kg)xR>oyqX8t-HTDguHCt{uz}7K4H82V(|pMmHWP|G^zrFstG^^W;NyeAr-fhfBgS%&#Y^Bcm?ZX vv7RV{9$f`-9yx9|<;p8ff!uDo4u=?Y?_90Vnfc@_P!ofvtDnm{r-UW|vHl#e literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-ldpi/ic_action_increase_menu.png b/app/src/main/res/drawable-ldpi/ic_action_increase_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..1a39b71f835d24c27ca729470a6c798039593003 GIT binary patch literal 119 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjcAhSdAr-fhfBgS%&#Y^Bcm=ET zxhBp4A7gGlhmR{*4n|ElzrUa8o?i*N5^xwE?&r!@^WUx-YfBWA` Sr8z*87(8A5T-G@yGywqEH70fd literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-mdpi/ic_action_decrease_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..88b3982fdd856807f108ccdb0e07ddc12c0f95ae GIT binary patch literal 111 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzGfx-CkcwMxFKy&xFc4sJ_#S_& zXM&o4g~h>hkGL+I*-Hb}071j)2ch4XY9O41J?t;7B__W1nd}Y{@O1TaS?83{1OOnP BA7TIi literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-mdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-mdpi/ic_action_increase_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..ed40b2b21627006beb1e6fa808e20b2304b557eb GIT binary patch literal 116 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdzYfl%)kcwMxuWjUHP!M1~@MeF> znmG=xQ@EGZuJibqIeRuQ1H*wwjgkxu4fTw>Kj|F+>HX8fz;N7};aHVL;lI$d7eEmP MPgg&ebxsLQ09S`3zyJUM literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xhdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-xhdpi/ic_action_decrease_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..5265f6d39176b3576905b58d0cb4be180b7f5d6e GIT binary patch literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=S)MMAAr-gYUOC9gV8Fv{_zopr04XFQCIA2c literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_decrease_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..b515e06e35342df8daf52b884f480d5cb68ead42 GIT binary patch literal 215 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGo^E_P~Ln>~)y~xPPz`(=g_3)w7&sUh7>N*k@Cs-)1dynm;QbP0l+XkK#dIJ` literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-xxhdpi/ic_action_increase_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..2ab780a89de78daeb3faaf82d295a0007449cbe9 GIT binary patch literal 242 zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoJ3U<-Ln>~)y>^h7!GMF=@LRmq z+y&>mxMW_69gx@ZT&eHQz~I2Zz`?-4$e_T$z{1eLz#zcDzyuQfb1j#FI8ecEPzqOh nF96QO&p@}7L530LjD$$`Hy8gfbhUB40GZ+G>gTe~DWM4f^m`)q literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_decrease_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..4a0b46bc04756a11b6899f785cf05ba5cbacfdca GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRSmpxq^Ln>~)y|Iz=uz>(;0J~8W zTY>WX_-cX1J3GGf8D3;HZByBMwE6@4g`dq!XR86V-~FVdQ&MBb@07Oqve*gdg literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png b/app/src/main/res/drawable-xxxhdpi/ic_action_increase_menu.png new file mode 100644 index 0000000000000000000000000000000000000000..e6ca376b305d4bb78c96ec2aa1a40d4a1e0b30fb GIT binary patch literal 500 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7xzrVBGEL;uunK>+K!KtV0eW4T-IC ziobUSd{mfstJ&ksqIb4U7cSV$n3`ZD((~z4t%0<4>w`Z>)r>YrF#?T%gPJYNGLzP* zx0!3bel-95^YypiZj(G#C$YO-aD8r4A4d_}hCbGJzyF!^yf)aC7<1~ysqE!5gp2nk zTQc96-ukcBXq}-uLnZT#sr$c0ym9{+C0@)j!MfqJ2ZJ~xhXVtXKm&sS1Cs*-2Lq!5 z0}D=$ok2scD?>Eno;<;i_Uy==^4RoSYhQ}~{v2<)E%jsn z;UAKm3Uy^YJD-+6+jH#Bb77x1=jSJHNo{=pxA?o!^0_~6eVXqdu+zT2&+zHo>(jp1 zG + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index a1408a377..dec1cfe65 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -13,6 +13,10 @@ android:id="@+id/action_about_instance" android:title="@string/action_about_instance" app:showAsAction="never" /> + Désolé ! Votre appareil ne supporte pas la commande vocale ! Tout effacer Programmer + Taille du texte et des icônes + Modifier la taille du texte : + Modifier la taille des icônes : Suivant Précédent Ouvrir avec diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 36bb549c9..c1a91f286 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -47,7 +47,9 @@ Delete all Schedule - + Text and icon sizes + Change the current text size: + Change the current icon size: Next Previous Open with