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

bug fix

Browse Source
This commit is contained in:
NudeDude 2019-06-22 23:18:27 +02:00
parent 95c87377a6
commit e9c4ceac98
2 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
Button delButton = findViewById(R.id.delete_db);
Button load_popup = findViewById(R.id.load_dialog);
Button logout = findViewById(R.id.logout);
View login_layout = findViewById(R.id.user_data_layout);
View login_layout = findViewById(R.id.Login_options);
colorButton1 = findViewById(R.id.color_background);
colorButton2 = findViewById(R.id.color_font);
colorButton3 = findViewById(R.id.color_popup);
@ -132,7 +132,7 @@ public class AppSettings extends AppCompatActivity implements OnClickListener,
proxyUser.setText(settings.getProxyUser());
proxyPass.setText(settings.getProxyPass());
if (adapter.getCount() <= 1) {
if (settings.getLogin() && adapter.getCount() <= 1) {
locationAsync = new LocationLoader(this);
locationAsync.execute();
}

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

@ -138,36 +138,29 @@
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_settings"
android:text="@string/trend_setting"
android:textSize="@dimen/textsize_settings" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<LinearLayout
android:id="@+id/Login_options"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/text_settings"
android:text="@string/trend_setting"
android:textSize="@dimen/textsize_settings" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/divider"
android:background="?android:attr/listDivider" />
<Spinner
android:id="@+id/woeid"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
<LinearLayout
android:id="@+id/user_data_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -208,7 +201,6 @@
android:text="@string/logout" />
</LinearLayout>
</LinearLayout>
<TextView