Mastodon/Shitter-android-app
1
0
Fork 0
mirror of https://github.com/nuclearfog/Shitter.git synced 2025-02-02 12:17:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

layout fix, bug fix

Browse Source
This commit is contained in:
NudeDude 2019-06-15 19:21:11 +02:00
parent 4b4e19de6a
commit 9293992377
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/src/main/java/org/nuclearfog/twidda/window/AppSettings.java
View File

@ -136,13 +136,14 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
@Override
public void onBackPressed() {
settings.setProxyAddress(proxyAddr.getText().toString());
settings.setProxyPort(proxyPort.getText().toString());
settings.setProxyUser(proxyUser.getText().toString());
settings.setProxyPass(proxyPass.getText().toString());
settings.setProxy();
if (settings.getCustomWidSet()) {
String woeText = woeIdText.getText().toString();
settings.setProxyAddress(proxyAddr.getText().toString());
settings.setProxyPort(proxyPort.getText().toString());
settings.setProxyUser(proxyUser.getText().toString());
settings.setProxyPass(proxyPass.getText().toString());
settings.setProxy();
if (!woeText.isEmpty())
settings.setWoeId(Long.parseLong(woeText));
else

13
app/src/main/res/layout/page_settings.xml
View File

@ -27,6 +27,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_settings"
android:text="@string/color_settings"
android:textSize="@dimen/textsize_settings" />
@ -152,8 +153,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/margin_layout">
android:orientation="horizontal">
<Spinner
android:id="@+id/woeid"
@ -185,7 +185,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/button_margin"
android:layout_marginTop="@dimen/text_settings"
android:text="@string/user_data"
android:textSize="@dimen/textsize_settings" />
@ -228,7 +228,7 @@
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/button_margin"
android:layout_marginTop="@dimen/text_settings"
android:text="@string/proxy_settings"
android:textSize="@dimen/textsize_settings" />
@ -241,8 +241,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/margin_layout"
android:orientation="horizontal"
android:paddingTop="@dimen/margin_layout_tweet">
android:orientation="horizontal">
<EditText
android:id="@+id/edit_proxyadress"
@ -265,7 +264,7 @@
android:background="@android:color/transparent"
android:ems="10"
android:hint="@string/proxy_port"
android:inputType="numberPassword"
android:inputType="number"
android:singleLine="true" />
</LinearLayout>