Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix some layout issues

This commit is contained in:
tom79 2019-06-25 14:52:46 +02:00
parent 8816260423
commit bf44dc3cc3
4 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/app/fedilab/android/activities/InstanceHealthActivity.java
View File

@ -91,7 +91,7 @@ public class InstanceHealthActivity extends BaseActivity {
setTheme(R.style.AppThemeDark);
}
setContentView(R.layout.activity_instance_social);
getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
Bundle b = getIntent().getExtras();
if( getSupportActionBar() != null)
getSupportActionBar().hide();

2
app/src/main/java/app/fedilab/android/activities/ManageAccountsInListActivity.java
View File

@ -86,7 +86,7 @@ public class ManageAccountsInListActivity extends BaseActivity implements OnList
getWindow().getDecorView().setBackgroundColor(ContextCompat.getColor(ManageAccountsInListActivity.this, R.color.mastodonC1));
}
setContentView(R.layout.activity_manage_accounts_list);
getWindow().setLayout(ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
if( getSupportActionBar() != null)
getSupportActionBar().hide();

2
app/src/main/res/layout/activity_instance_social.xml
View File

@ -89,7 +89,7 @@
android:layout_height="wrap_content" />
</LinearLayout>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout
android:id="@+id/loader"
android:layout_width="match_parent"
android:layout_height="match_parent"

93
app/src/main/res/layout/activity_manage_accounts_list.xml
View File

@ -3,62 +3,55 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:fitsSystemWindows="true"
tools:context="app.fedilab.android.activities.InstanceHealthActivity"
tools:context="app.fedilab.android.activities.ManageAccountsInListActivity"
android:layout_margin="@dimen/fab_margin"
android:id="@+id/container"
android:id="@+id/main_account_container"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/main_account_container"
android:orientation="vertical"
<TextView
android:id="@+id/list_title"
android:textSize="20sp"
android:textColor="@color/titleb"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/list_title"
android:textSize="20sp"
android:textColor="@color/titleb"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content" />
<EditText
android:id="@+id/search_account"
android:drawableRight="@drawable/ic_search"
android:drawableEnd="@drawable/ic_search"
android:maxLines="1"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
<EditText
android:id="@+id/search_account"
android:drawableRight="@drawable/ic_search"
android:drawableEnd="@drawable/ic_search"
android:maxLines="1"
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:inputType="text" />
<RelativeLayout
android:id="@+id/loader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
>
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:inputType="text" />
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/loader"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
>
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:indeterminate="true" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lv_accounts_current"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"
/>
<androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/lv_accounts_search"
android:layout_width="match_parent"
android:layout_height="300dp"
android:scrollbars="none"
android:divider="@null"
/>
</LinearLayout>
android:indeterminate="true" />
</RelativeLayout>
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/lv_accounts_current"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"
/>
<androidx.recyclerview.widget.RecyclerView
android:visibility="gone"
android:id="@+id/lv_accounts_search"
android:layout_width="match_parent"
android:layout_height="300dp"
android:scrollbars="none"
android:divider="@null"
/>
</LinearLayout>