From 212b08eba8d01aedeec0a2fba8b32fc7dab92343 Mon Sep 17 00:00:00 2001 From: zt515 Date: Sun, 30 Jul 2017 23:24:25 +0800 Subject: [PATCH] Fix: #2 and installation failed on arm device --- app/build.gradle | 16 ++------ app/src/main/AndroidManifest.xml | 6 ++- app/src/main/assets/eks_font.ttf | Bin 0 -> 17000 bytes .../java/io/neoterm/view/eks/ExtraKeysView.kt | 36 +++++++++++------- app/src/main/res/values-zh-rCN/strings.xml | 4 +- app/src/main/res/values-zh-rTW/strings.xml | 4 +- app/src/main/res/values/preference_keys.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/settings_ui.xml | 6 +-- 9 files changed, 40 insertions(+), 38 deletions(-) create mode 100644 app/src/main/assets/eks_font.ttf diff --git a/app/build.gradle b/app/build.gradle index 88bc785..188bbe8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,30 +1,21 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' android { - signingConfigs { - release { - keyAlias 'kiva' - keyPassword 'k12fd15dp' - storeFile file('docs/kiva.keystore') - storePassword 'k12fd15dp' - } - } compileSdkVersion 25 buildToolsVersion "25.0.2" defaultConfig { applicationId "io.neoterm" minSdkVersion 21 targetSdkVersion 25 - versionCode 18 - versionName "1.2.0-rc7" + versionCode 19 + versionName "1.2.0-rc8" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" resConfigs "zh-rCN", "zh-rTW" externalNativeBuild { cmake { cppFlags "-std=c++11" - abiFilters 'x86', 'x86_64', 'arm64-v8a' + abiFilters 'x86_64', 'arm64-v8a', 'armeabi-v7a' } } sourceSets { @@ -39,7 +30,6 @@ android { zipAlignEnabled true shrinkResources true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' - signingConfig signingConfigs.release proguardFile 'app/proguard-rules.pro' } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index b17995d..ec3766a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -13,10 +13,10 @@ android:name=".App" android:allowBackup="true" android:extractNativeLibs="true" + android:resizeableActivity="true" android:fullBackupContent="@xml/backup_config" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" - android:resizeableActivity="true" android:supportsRtl="true" android:theme="@style/AppTheme"> + + \ No newline at end of file diff --git a/app/src/main/assets/eks_font.ttf b/app/src/main/assets/eks_font.ttf new file mode 100644 index 0000000000000000000000000000000000000000..32f856a914c73750902634af6d05d1a844885ada GIT binary patch literal 17000 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
7vl&H|Pb#56w=gHn9}(hxQ!t zSXm!v+s=D|wi;uEG8voXo`Ony1vpNDEt1%LTfhq5Hk^HCLZ6;&ASBU5cHt&0g(IHD zBOGPA+!Vs`ju7$U{O{hl{cK9@a{bM(dHorlw|rjmSDzq~E;@Hy|N6)J$HsOd)0w2W zeQjeNs}~KvGK5VZ^$s47m?Gks(Th~>(f@!umS*iKUT*tRt~T=Dlld*Dt^)bO=v$&3L)uqo26=KceDoR_E^_Q%SM ze4fmkt1$A|3!vOw8;~!Qc{9!rF@Ha5;R?toW z^H@IW+Rp#rTe*urz~A74AJC^kj`VC>AuKdaj{gYlfRuL?oxOVvI?jXYb^hPM8?Ie1 zsGPkm>*xFX(!LDs!7ivbOkkmf9{GCH74+d29Wx=AKUI|ao&$dw?1{Y>?1Ec+NP`1xvLzK*W-rBZ>=n# zPc`Yw*?!Q?m=5}l2A$XF{|&ksqd~{$NL#kRzq))ij(k<>Z}iuUs^B+#Px=!0Enkk4 zzKk(ZLZ$wg1N^A;)p1hJ2=0+|=?k{ukYo5lhDhzQr=%P9%-~;2x?C|O-RM__sD(UE z_SZ6PJ86aK6^}WS*|kTUk27E){&VX)$FlYWh zcR_T2uaB_~-B;fSi43bOa3A#QqW|lSPy(N>|Awjhd}zHoa4R$j8sk_Ld^;6Xxp3TVynb-RvxOi+YDzhS=T{ zH$j827Np|td@MX|D!Y~4!RE5XYz12nEu!M%JXx6;N#?tk`HnH)R(VLbyhXR(-OIb@ z2X~WiwWoZTm6Mb8D1ra>dc2+l!gOyo{+{uAJYG>o(ASR$VpD+E*P4}+oh_O9>r|%C zAP5m2@1uk%^#CJ~)8F@cJzpZjcLS*)VJiUmzh`HT^c4X6WmZ;>7+^B#3Xs!O?Sq`G zoMAvri>(zmdrgrfV> zpME;MrG?;qx2wP2mj2sj!kd4azRi%yTTv5{lA|8&Y1~O(-uhAccKzZ+e&hCZ_3^)^ zZ|qFb`fg0ee&j~96mRgOB{y0?JMQ?2`o-<(AE6Sz@pkpSjp=_qmA(-(onhSDp)Xg% zfa5m>CeB$bat2-C7ZK}BTtQ^J&%{+W3}1E)9*qse>S*9LmdFR1cnB-t1tuQKhVgAC z9>#|7Lndx#Gx^6R?qInh$Hbk$mzj7EHbWdV@o+XxabkU3%$BfKtd7lxm(F9$pm7FE z!%CI`Y$8e*gT9c>L2eRT#O`D%z{Z2J5bv@;t)((Ihb;wX9lINFHaJUAdl^zJ)|o2Q zCaxls%>vIH%!quHEd=KjycbE{RnW$0s}?opLjEGaSeA_RucXBWScTflAhilTo5QFdb@+lGix#Q@uWi$RZ2`;r zS92Di73#rU*os=7gBEMC!>IyJx-18Mp0p&D(YVB-w5tx$VlgJG0I!x#eYjdWdCD@3 z)hI-|RCvW=+1C{4(B&~Hl3t7QB}m5jE(UgG-4*bI70{_xjsW?K;R9W@mx8t&@@b5U z0q=xHM()ZwBT(Lb)HCF$Ut6!LAXzEUpbmXZh1Uk_ zu@sbI%#R7!KbFAPuZO=HGHEu;KYum-mg|~-6d43|37GdNcOtDp5_BsiX(~KYfoCEv zL23r@Ogx-rF%NJrqnSPu565VX0zR6}0De0j1)Ll1uOg&GfGzqw1|9KZ4*8ppSI($NkcVDsk8s)Oz-D74EFcyT5c z%&A+%!fUJQ7SNpqC=q~^P=?l2e2=qXr3}T5u^o4HPMrC|5kLE~EZhW7=J$wvb))TY zNK{B&$UC7c!)DtbaU62K9zG;|NyI%7kGNj#l@Rq#Z#|}WOg?FZClr@=rBR>Z{yhcK zrr-pPCt?X;gM=~%tlgvJ&Rc;x_$>cjX&lM3rftH2tli@U*rfaEU(sZG|i1Q6B}TOL8_71pX-C5%CV-9-=5t zf@*~1DF+PngE=GLft@l~17y1b{zl%`6ZuH^Wq;UY5KaLZm_N7ET^OD4La?uh9EN+4 zzZp2?<;e`^8N#guTS%N%`tV$|G2489s}&-*pP;`%;!zSZZ4v0q7S5))>Ug&6G_QAU z=0&cRJlD03=ezFbbu!<;?{`t6{D*v(OcreyFOl?mK27pay+&Rk6Uk}jl~QgiU*~G$ z)vk8FQ0A#ED^c54nIEm_x6;q)++APN)zZ__@f!N^Iy@`!ti!XJZw}}a z=)0&P-N{>QO@L_Qz8Iifjp{TXEs1ro z;&@3s1EqfhWr}Mdp3QjjUHLp4V_V`X>2bKnVOJ3z;4*&{`Du8_3ya{Rxp+|GylB!Z zTotY~SDJQFyXdNS)!TBwgSU3swUFn6R)=RL9?-6M(6-fPuxwd}_^Dp-Q-oG1rS&-2 zr8BT@Ive`;XbH%qUXcFK)6&t@FD+OJEznOYr@qSmQe8YUSHck|6}q3|3XLM? z<0SlopqK?naax6U#IbBdJ49=q&v@A17A22Ud0UksuoUyT^UVpEGIQ zrHimcoJzRkh}nLWlwJo4W>HwAtVJ{ts$(tXj$K#qp>@X^#zVg``MRW+VZA^tMaNv> zJ#1#JXrdvK!fTx!0h)j{M^k*2E80N0q9tOTsmDws8SQKw_+JX}lZ+^=I^5YBpwTyu zYt32OeaxhojkRkVw50uz8=Qez?}WuL%M$?U*GvOYs(|}KAWgAf!cL$WYkD&*Kv2FN zPWH8=wzFmjexxetSobBZ4f%HSku@!DyxXusQ6f3U(RN5u4k=g-;b|lo! z*EAm3NfZLkmhe15f3d_LB*<03puRfbF|ZuDx_mms}~6 zBnIT!KW3*P{nL$u%laytW z@)wCGNPLNen0YstQ0|3B7c?^BU`=av|;Q188kP>j_5l<fIWX=#kAH-g(VYakc^y_m zj+tjkBi;_gPwXG~%Xiay^0sugLa1pX@TO;N*c#WjO^kRQgn&Fzgr5(M8v@yPyQ zfX1=rkHKzs9Cq6UIJ@52lFbS_ONvlJah*KEs6*o*!e(LT#KYtoD@#bH-h_)xyQBPfI?72&?17*Vzacf@7*-f}bU ziH+0M9P@Ow03N;+9<&M`wib7X>)E|*6aEwAKDHI>*TdL}=K1%q@!0uI@SkD@NY^7j z5$_VDQly)ZpN4l8-m~$p#(O^AHAoAP79!Pwb~oND@xBM|bx0e5Z^HXwBo3{IVh5ZD zcs)`v(oINJNYzMnNGp*xBH?5!_n~?IA2LX7$seL9cQkL(l>`-eC!w8}ln)7tW{KxW zxQ(E4S;DiD5&;;nnbKP+hRvMVA>cO?@MI&c48kp1br6lpDSpuV=h8ZqZ$`R5khuOh zMLB;2LHsa|;ANA7DB%APoLoNu$`p0Bx<(y^rx5=iH%={73zY)arfyWXsaeR4Qj66x zbqH%z9|Gq?tQp)j>Jp5Hd_Y4@lY5Q21ZDC;PaC>R4#+JenNnhxyjIBFh&HyV+u$*6 zct1o|Cq4Ntf`TlB^Q(j-00Y)#PW~ONJ3`*ih5zggM>s^}qHZ}7t;nO0#u+%DhIcU% z?l)vP@mLA}Cn`c|FT_42$j3=IO~MP3{<_3f+-*!@4Lls4k9{e6(ki{S4Zmm*JQO(1 z2bu%T@Y56Ec@Mm_Q#_6PKKa0MsA+P4h?zpOhaOn;D#@1Ib}5r22IR^84*5L(Ma^g( zE#dBf^b~0lJ}Px?k}#W~k|psq1mWKVH%M3@>0c03iX`PILDnYe^CTQ0;VubJ5LAW{ z#I0J;?h$h!AN7{dnGAE`S|^ih-zHdlBZ2!o<4i=Smx1zRG)SIdlH?g?qC6$tAWuof za<-B8(5#}FL^!=E!Jlx#?4qv(Zp|cXHW7btsz<&7_4eW27)YGG4jjHA;p;Td*nWc8 z;Sd}lDGy3`UQ+rZ{*lw zd{LWf7~G$k`(4`eQsnC{*^*0MNd7|gr3VIijPzFNH?%L9O?uMTcxc;4;&S&SDYDQv2i(u!d1vhs z)^GO0`EywuKouLZv})lp?9!;5^dfEPk50)1Rp=4UQUnwEVxia&6s4$r>JxoUpx-i( zHlw@BIjs#jm>tE~wO8Ukc^SNM8@@&~Ne{ru4;AeA_3S|W0ycx^@&QNyYmfSw>v+D?Ou?H34jG09zNp)(5Z+ z0qouYwozgsILFf$oJ5ROHujtg&{`Ix(>oQ|d~jtU1}OM$L|?Fo>Vee-;HH4A%@U)S zlK@E!<24?f6EJ#q>{ut^BzFVGD?;vDBk_Bqn_&SPdQ2lt{vZ%N$XDr`11=H(@tZQ( z1p9RK_owc5ROw0ND>SMk$*}E1sFi^4Py)M4x|1Cur5avk0}r*k9deEK>01-Np+m+f soYqP}rEev() @@ -64,6 +63,7 @@ class ExtraKeysView(context: Context, attrs: AttributeSet) : LinearLayout(contex alpha = DEFAULT_ALPHA gravity = Gravity.TOP orientation = LinearLayout.VERTICAL + typeface = Typeface.createFromAsset(context.assets, "eks_font.ttf") initBuiltinKeys() loadDefaultUserKeys() @@ -141,10 +141,9 @@ class ExtraKeysView(context: Context, attrs: AttributeSet) : LinearLayout(contex private fun updateButtonBars() { removeAllViews() + buttonBars.asReversed() - .forEach { - addView(it) - } + .forEach { addView(it) } } private fun expandButtonPanel(forceSetExpanded: Boolean? = null) { @@ -156,16 +155,26 @@ class ExtraKeysView(context: Context, attrs: AttributeSet) : LinearLayout(contex val visibility = if (buttonPanelExpanded) View.VISIBLE else View.GONE alpha = if (buttonPanelExpanded) EXPANDED_ALPHA else DEFAULT_ALPHA - for (i in 2..buttonBars.size - 1) { - buttonBars[i].visibility = visibility - } + IntRange(USER_KEYS_BUTTON_LINE_START, buttonBars.size - 1) + .map { buttonBars[it] } + .forEach { it.visibility = visibility } } private fun createNewButtonBar(): LinearLayout { val line = LinearLayout(context) + + val layoutParams = + if (NeoPreference.loadBoolean(R.string.key_ui_eks_weight_explicit, false)) + LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f) + else + LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.WRAP_CONTENT) + + layoutParams.setMargins(0, 0, 0, 0) + line.setPadding(0, 0, 0, 0) line.gravity = Gravity.START line.orientation = LinearLayout.HORIZONTAL - line.layoutParams = LinearLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, 0, 1f) + line.layoutParams = layoutParams return line } @@ -191,14 +200,13 @@ class ExtraKeysView(context: Context, attrs: AttributeSet) : LinearLayout(contex param.setGravity(Gravity.CENTER) param.width = calculateButtonWidth() param.height = context.resources.getDimensionPixelSize(R.dimen.eks_height) - param.topMargin = 0 - param.rightMargin = 0 - param.leftMargin = 0 - param.bottomMargin = 0 + param.setMargins(0, 0, 0, 0) outerButton.layoutParams = param + outerButton.maxLines = 1 outerButton.typeface = typeface outerButton.text = extraButton.buttonText + outerButton.setPadding(0, 0, 0, 0) outerButton.setTextColor(IExtraButton.NORMAL_TEXT_COLOR) outerButton.setAllCaps(false) diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index fef0fc3..59815af 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -30,8 +30,8 @@ 键盘显示时隐藏标题栏 显示建议 (需要 oh-my-zsh) 使用一些软件时，屏幕下方显示快捷键 - 为宽字符设置权重 - 如果快捷输入栏显示不正确，请勾选本项 + 为快捷键盘强制设置权重 + 如果快捷键盘显示不正确，请勾选本项 配色方案 字体 设置 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 9999690..16ec26f 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -30,8 +30,8 @@ 在鍵盤顯示時隱藏標題欄 顯示建議 (需要 oh-my-zsh) 使用一些程式時，在螢幕底部顯示快捷鍵 - 為寬字元設定權重 - 如果快捷輸入欄顯示錯誤，請勾選此項目 + 為快捷鍵盤強制設定權重 + 如果快捷鍵盤顯示錯誤，請勾選此項目 色彩主題 字體 設定 diff --git a/app/src/main/res/values/preference_keys.xml b/app/src/main/res/values/preference_keys.xml index 706136e..4edaccc 100644 --- a/app/src/main/res/values/preference_keys.xml +++ b/app/src/main/res/values/preference_keys.xml @@ -11,7 +11,7 @@ neoterm_ui_hide_toolbar neoterm_ui_next_tab_anim neoterm_ui_suggestions - neoterm_ui_wide_char_explicit + neoterm_ui_eks_weight_explicit neoterm_package_source diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d0da5a8..2a7901e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -74,8 +74,8 @@ Switch to the next tab instead of the previous tab when closing tab Show Suggestions (oh-my-zsh required) When using some programs, show shortcut keys - Use explicit weight for wide char - If suggestion bar show incorrect, please enable this + Use explicit weight for ExtraKeysView + If ExtraKeysView shows incorrectly, please enable this Font Color Scheme Extra Keys diff --git a/app/src/main/res/xml/settings_ui.xml b/app/src/main/res/xml/settings_ui.xml index bb4f589..ff04e87 100644 --- a/app/src/main/res/xml/settings_ui.xml +++ b/app/src/main/res/xml/settings_ui.xml @@ -25,7 +25,7 @@ + android:key="@string/key_ui_eks_weight_explicit" + android:summary="@string/pref_ui_eks_weight_explicit_desc" + android:title="@string/pref_ui_eks_weight_explicit" /> \ No newline at end of file