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

Merged in remote_follow (pull request #76) 

Improves the layout for tablets
This commit is contained in:
tom79 2017-08-23 09:06:09 +00:00
parent 8a9f52a77a 1ba2bc31cb
commit 1e01ef6567
2 changed files with 115 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/activities/RemoteFollowActivity.java
View File

@ -16,6 +16,7 @@ package fr.gouv.etalab.mastodon.activities;
import android.content.Context;
import android.content.SharedPreferences;
import android.database.sqlite.SQLiteDatabase;
import android.graphics.Bitmap;
@ -30,6 +31,7 @@ import android.view.LayoutInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.AutoCompleteTextView;
import android.widget.Button;
@ -236,6 +238,8 @@ public class RemoteFollowActivity extends AppCompatActivity implements OnRetriev
if( screen_name.startsWith("@"))
screen_name = screen_name.substring(1);
new RetrieveRemoteAccountsAsyncTask(screen_name, instance_name, RemoteFollowActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
InputMethodManager imm = (InputMethodManager)getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(rf_search.getWindowToken(), 0);
}
});
}

111
app/src/main/res/layout-sw600dp/activity_remote_follow.xml Normal file
View File

@ -0,0 +1,111 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright 2017 Thomas Schneider
This file is a part of Mastalab
This program is free software; you can redistribute it and/or modify it under the terms of the
GNU General Public License as published by the Free Software Foundation; either version 3 of the
License, or (at your option) any later version.
Mastalab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even
the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
Public License for more details.
You should have received a copy of the GNU General Public License along with Mastalab; if not,
see <http://www.gnu.org/licenses>.
-->
<ScrollView android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="@dimen/fab_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/fab_margin"
android:paddingRight="@dimen/fab_margin"
xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:orientation="vertical"
>
<AutoCompleteTextView
android:id="@+id/rf_instance"
android:layout_width="400dp"
android:layout_height="wrap_content"
android:inputType="textWebEmailAddress"
android:hint="@string/instance_example"
/>
<LinearLayout
android:layout_width="400dp"
android:gravity="center"
android:layout_marginTop="20dp"
android:layout_height="wrap_content"
android:orientation="horizontal">
<EditText
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:id="@+id/rf_username"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
android:inputType="textEmailAddress"
android:hint="@string/username"
/>
<Button
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:gravity="center_vertical"
android:layout_gravity="center_vertical"
android:id="@+id/rf_search"
android:textAllCaps="false"
android:drawableLeft="@drawable/ic_action_search"
android:drawableStart="@drawable/ic_action_search"
android:drawablePadding="5dp"
android:paddingLeft="5dp"
android:paddingRight="15dp"
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="14sp"
android:text="@string/action_search" />
</LinearLayout>
<ListView
android:visibility="gone"
android:layout_marginTop="30dp"
android:id="@+id/lv_account"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scrollbars="none"
android:divider="@null"
/>
<TextView
android:visibility="gone"
android:layout_marginTop="30dp"
android:id="@+id/rf_no_result"
android:padding="10dp"
android:gravity="center"
android:textSize="25sp"
android:layout_gravity="center"
android:textStyle="italic|bold"
android:typeface="serif"
android:text="@string/no_accounts"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<!-- Main Loader -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/loader"
android:visibility="gone"
android:layout_marginTop="30dp"
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>
</LinearLayout>
</ScrollView>