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

Layout improvements + prepares release 1.2.6

This commit is contained in:
tom79 2017-06-28 17:42:33 +02:00
parent f3426294be
commit f4800666e9
28 changed files with 882 additions and 802 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/build.gradle
View File

@ -7,8 +7,8 @@ android {
applicationId "fr.gouv.etalab.mastodon" applicationId "fr.gouv.etalab.mastodon"
minSdkVersion 15 minSdkVersion 15
targetSdkVersion 25 targetSdkVersion 25
versionCode 22 versionCode 23
versionName "1.2.5" versionName "1.2.6"
} }
buildTypes { buildTypes {
release { release {
@ -27,6 +27,7 @@ dependencies {
compile 'com.android.support:appcompat-v7:25.3.1' compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1' compile 'com.android.support:design:25.3.1'
compile 'com.android.support:support-v4:25.3.1' compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.loopj.android:android-async-http:1.4.9' compile 'com.loopj.android:android-async-http:1.4.9'
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5' compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
compile 'com.evernote:android-job:1.1.11' compile 'com.evernote:android-job:1.1.11'

2
app/src/main/java/fr/gouv/etalab/mastodon/activities/MainActivity.java
View File

@ -86,7 +86,7 @@ public class MainActivity extends AppCompatActivity
private ImageLoader imageLoader; private ImageLoader imageLoader;
private DisplayImageOptions options; private DisplayImageOptions options;
private View headerLayout; private View headerLayout;
static final int MIN_DISTANCE = 150; static final int MIN_DISTANCE = 100;
private float downX, downY; private float downX, downY;
private int currentScreen = 1; private int currentScreen = 1;
private actionSwipe currentAction; private actionSwipe currentAction;

3
app/src/main/java/fr/gouv/etalab/mastodon/activities/MediaActivity.java
View File

@ -84,7 +84,7 @@ public class MediaActivity extends AppCompatActivity {
MediaActivity.actionSwipe currentAction; MediaActivity.actionSwipe currentAction;
private ImageLoader imageLoader; private ImageLoader imageLoader;
private DisplayImageOptions options; private DisplayImageOptions options;
static final int MIN_DISTANCE = 200; static final int MIN_DISTANCE = 100;
private String finalUrlDownload; private String finalUrlDownload;
private String preview_url; private String preview_url;
private ImageView prev, next; private ImageView prev, next;
@ -206,6 +206,7 @@ public class MediaActivity extends AppCompatActivity {
float deltaX = downX - upX; float deltaX = downX - upX;
float deltaY = downY - upY; float deltaY = downY - upY;
// swipe horizontal // swipe horizontal
if( downX > MIN_DISTANCE & (Math.abs(deltaX) > MIN_DISTANCE && Math.abs(deltaY) < MIN_DISTANCE)){ if( downX > MIN_DISTANCE & (Math.abs(deltaX) > MIN_DISTANCE && Math.abs(deltaY) < MIN_DISTANCE)){
if(deltaX < 0) { switchOnSwipe(MediaActivity.actionSwipe.LEFT_TO_RIGHT); return true; } if(deltaX < 0) { switchOnSwipe(MediaActivity.actionSwipe.LEFT_TO_RIGHT); return true; }
if(deltaX > 0) { switchOnSwipe(MediaActivity.actionSwipe.RIGHT_TO_LEFT); return true; } if(deltaX > 0) { switchOnSwipe(MediaActivity.actionSwipe.RIGHT_TO_LEFT); return true; }

24
app/src/main/java/fr/gouv/etalab/mastodon/activities/WebviewActivity.java
View File

@ -15,13 +15,19 @@
package fr.gouv.etalab.mastodon.activities; package fr.gouv.etalab.mastodon.activities;
import android.Manifest;
import android.content.pm.PackageManager;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.support.v4.app.ActivityCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity; import android.support.v7.app.AppCompatActivity;
import android.util.Log; import android.util.Log;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.webkit.DownloadListener;
import android.webkit.WebView; import android.webkit.WebView;
import android.widget.FrameLayout; import android.widget.FrameLayout;
@ -30,6 +36,9 @@ import fr.gouv.etalab.mastodon.webview.MastalabWebChromeClient;
import fr.gouv.etalab.mastodon.webview.MastalabWebViewClient; import fr.gouv.etalab.mastodon.webview.MastalabWebViewClient;
import mastodon.etalab.gouv.fr.mastodon.R; import mastodon.etalab.gouv.fr.mastodon.R;
import static fr.gouv.etalab.mastodon.helper.Helper.EXTERNAL_STORAGE_REQUEST_CODE;
import static fr.gouv.etalab.mastodon.helper.Helper.manageDownloads;
/** /**
* Created by Thomas on 24/06/2017. * Created by Thomas on 24/06/2017.
@ -84,6 +93,21 @@ public class WebviewActivity extends AppCompatActivity {
}); });
webView.setWebChromeClient(mastalabWebChromeClient); webView.setWebChromeClient(mastalabWebChromeClient);
webView.setWebViewClient(new MastalabWebViewClient(WebviewActivity.this)); webView.setWebViewClient(new MastalabWebViewClient(WebviewActivity.this));
webView.setDownloadListener(new DownloadListener() {
@Override
public void onDownloadStart(String url, String userAgent, String contentDisposition, String mimetype, long contentLength) {
if(Build.VERSION.SDK_INT >= 23 ){
if (ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(WebviewActivity.this, Manifest.permission.READ_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) {
ActivityCompat.requestPermissions(WebviewActivity.this, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE}, EXTERNAL_STORAGE_REQUEST_CODE);
} else {
manageDownloads(WebviewActivity.this, url);
}
}else{
manageDownloads(WebviewActivity.this, url);
}
}
});
webView.loadUrl(url); webView.loadUrl(url);
} }

BIN
app/src/main/res/drawable-hdpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 252 B

After

Width:  |  Height:  |  Size: 247 B

BIN
app/src/main/res/drawable-ldpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 346 B

After

Width:  |  Height:  |  Size: 153 B

BIN
app/src/main/res/drawable-mdpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 173 B

After

Width:  |  Height:  |  Size: 173 B

BIN
app/src/main/res/drawable-xhdpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 287 B

After

Width:  |  Height:  |  Size: 259 B

BIN
app/src/main/res/drawable-xxhdpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 418 B

After

Width:  |  Height:  |  Size: 355 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_save.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 548 B

After

Width:  |  Height:  |  Size: 1.1 KiB

1
app/src/main/res/layout/activity_hashtag.xml
View File

@ -32,6 +32,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

1
app/src/main/res/layout/activity_search_result.xml
View File

@ -29,6 +29,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
<RelativeLayout <RelativeLayout

1
app/src/main/res/layout/activity_show_conversation.xml
View File

@ -17,6 +17,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
<!-- Main Loader --> <!-- Main Loader -->

258
app/src/main/res/layout/drawer_account.xml
View File

@ -15,142 +15,146 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_container" xmlns:card_view="http://schemas.android.com/tools"
android:paddingLeft="@dimen/drawer_padding" android:layout_marginTop="10dp"
android:paddingRight="@dimen/drawer_padding" card_view:cardPreventCornerOverlap="true"
android:orientation="horizontal"> app:cardUseCompatPadding="true">
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:id="@+id/main_container"
<ImageView android:orientation="horizontal">
android:layout_gravity="center_horizontal"
android:id="@+id/account_pp"
android:layout_width="60dp"
android:layout_height="60dp"
tools:ignore="ContentDescription" />
<android.support.design.widget.FloatingActionButton
android:layout_marginTop="20dp"
android:visibility="gone"
android:id="@+id/account_action_block"
app:fabSize="mini"
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="center"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_block_white" />
<android.support.design.widget.FloatingActionButton
android:layout_marginTop="20dp"
android:visibility="gone"
android:id="@+id/account_action_mute"
app:fabSize="mini"
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="center"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_mute_white" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/account_container"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <ImageView
android:id="@+id/account_dn" android:layout_gravity="center_horizontal"
android:maxLines="1" android:id="@+id/account_pp"
android:layout_width="60dp"
android:layout_height="60dp"
tools:ignore="ContentDescription" />
<android.support.design.widget.FloatingActionButton
android:layout_marginTop="20dp"
android:visibility="gone"
android:id="@+id/account_action_block"
app:fabSize="mini"
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="center"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_block_white" />
<android.support.design.widget.FloatingActionButton
android:layout_marginTop="20dp"
android:visibility="gone"
android:id="@+id/account_action_mute"
app:fabSize="mini"
android:layout_width="40dp"
android:layout_height="40dp"
android:scaleType="center"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_mute_white" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/account_container"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:orientation="horizontal">
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView
android:id="@+id/account_dn"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/account_un"
android:maxLines="1"
android:layout_width="wrap_content"
android:textSize="14sp"
android:layout_height="wrap_content"
/>
</LinearLayout>
<TextView <TextView
android:id="@+id/account_un" android:layout_marginTop="10dp"
android:visibility="gone"
android:id="@+id/account_ac"
android:textSize="16sp"
android:maxLines="1" android:maxLines="1"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:textSize="14sp" android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:text="@string/status"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_sc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:maxLines="1"
android:text="@string/following"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_fgc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:maxLines="1"
android:text="@string/followers"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_frc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<TextView
android:animateLayoutChanges="true"
android:visibility="gone"
android:id="@+id/account_ds"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<TextView
android:layout_marginTop="10dp"
android:visibility="gone"
android:id="@+id/account_ac"
android:textSize="16sp"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:baselineAligned="false">
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:text="@string/status"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_sc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:maxLines="1"
android:text="@string/following"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_fgc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:maxLines="1"
android:text="@string/followers"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_frc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
<TextView
android:animateLayoutChanges="true"
android:visibility="gone"
android:id="@+id/account_ds"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v7.widget.CardView>

108
app/src/main/res/layout/drawer_account_follow_request.xml
View File

@ -15,57 +15,65 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/account_container" xmlns:card_view="http://schemas.android.com/tools"
android:orientation="horizontal"> android:layout_marginTop="10dp"
<ImageView card_view:cardPreventCornerOverlap="true"
android:layout_gravity="center" app:cardUseCompatPadding="true">
android:id="@+id/account_pp" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="60dp" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="60dp" android:layout_width="match_parent"
tools:ignore="ContentDescription" />
<TextView
android:id="@+id/account_un"
android:padding="5dp"
android:maxLines="1"
android:gravity="center"
android:textSize="16sp"
android:layout_gravity="center"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="wrap_content"
android:gravity="end"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:id="@+id/account_container"
<Button android:orientation="horizontal">
android:id="@+id/btn_authorize" <ImageView
android:text="@string/authorize" android:layout_gravity="center"
android:layout_marginStart="5dp" android:id="@+id/account_pp"
android:layout_marginLeft="5dp" android:layout_width="60dp"
android:layout_gravity="end" android:layout_height="60dp"
android:gravity="center"
android:textColor="@color/white"
style="@style/Base.Widget.AppCompat.Button.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/btn_reject"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:text="@string/reject"
android:layout_gravity="end"
android:gravity="center"
android:textColor="@color/white"
style="@style/Base.Widget.AppCompat.Button.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout> tools:ignore="ContentDescription" />
<TextView
android:id="@+id/account_un"
android:padding="5dp"
android:maxLines="1"
android:gravity="center"
android:textSize="16sp"
android:layout_gravity="center"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_width="wrap_content"
android:gravity="end"
android:layout_height="wrap_content"
android:orientation="vertical">
<Button
android:id="@+id/btn_authorize"
android:text="@string/authorize"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_gravity="end"
android:gravity="center"
android:textColor="@color/white"
style="@style/Base.Widget.AppCompat.Button.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<Button
android:id="@+id/btn_reject"
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:text="@string/reject"
android:layout_gravity="end"
android:gravity="center"
android:textColor="@color/white"
style="@style/Base.Widget.AppCompat.Button.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>

236
app/src/main/res/layout/drawer_account_main_search.xml
View File

@ -15,136 +15,140 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_container" xmlns:card_view="http://schemas.android.com/tools"
android:paddingLeft="@dimen/drawer_padding" android:layout_marginTop="10dp"
android:paddingRight="@dimen/drawer_padding" card_view:cardPreventCornerOverlap="true"
android:orientation="vertical"> app:cardUseCompatPadding="true">
<TextView <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/account_search_title" xmlns:tools="http://schemas.android.com/tools"
android:visibility="gone"
android:textSize="18sp"
android:background="@color/blue_light"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/accounts"
android:textColor="@color/colorPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/account_search_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:id="@+id/main_container"
android:orientation="vertical">
<TextView
android:id="@+id/account_search_title"
android:visibility="gone"
android:textSize="18sp"
android:background="@color/blue_light"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/accounts"
android:textColor="@color/colorPrimary"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:id="@+id/account_search_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="horizontal">
<ImageView
android:layout_gravity="center_horizontal"
android:id="@+id/account_pp"
android:layout_width="60dp"
android:layout_height="60dp"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/account_container"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <ImageView
android:id="@+id/account_dn" android:layout_gravity="center_horizontal"
android:maxLines="1" android:id="@+id/account_pp"
android:layout_width="60dp"
android:layout_height="60dp"
tools:ignore="ContentDescription" />
</LinearLayout>
<LinearLayout
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/account_container"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textSize="18sp" android:orientation="horizontal">
android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> <TextView
android:id="@+id/account_dn"
android:maxLines="1"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
<TextView
android:id="@+id/account_un"
android:maxLines="1"
android:layout_width="wrap_content"
android:textSize="14sp"
android:layout_height="wrap_content"
/>
</LinearLayout>
<TextView <TextView
android:id="@+id/account_un" android:layout_marginTop="10dp"
android:visibility="gone"
android:maxLines="1" android:maxLines="1"
android:layout_width="wrap_content" android:id="@+id/account_ac"
android:textSize="14sp" android:textSize="16sp"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout
android:layout_marginTop="10dp"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
/> android:orientation="horizontal"
</LinearLayout> android:baselineAligned="false">
<TextView <LinearLayout
android:layout_marginTop="10dp" android:layout_width="0dp"
android:visibility="gone" android:layout_weight="1"
android:maxLines="1" android:orientation="vertical"
android:id="@+id/account_ac" android:layout_height="wrap_content">
android:textSize="16sp" <TextView
android:layout_width="match_parent" android:text="@string/status"
android:layout_height="wrap_content" /> android:maxLines="1"
<LinearLayout android:layout_width="match_parent"
android:layout_marginTop="10dp" android:layout_height="wrap_content" />
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:id="@+id/account_sc"
android:orientation="horizontal" android:layout_width="match_parent"
android:baselineAligned="false"> android:layout_height="wrap_content" />
<LinearLayout </LinearLayout>
android:layout_width="0dp" <LinearLayout
android:layout_weight="1" android:layout_width="0dp"
android:orientation="vertical" android:layout_weight="1"
android:layout_height="wrap_content"> android:orientation="vertical"
<TextView android:layout_height="wrap_content">
android:text="@string/status" <TextView
android:maxLines="1" android:maxLines="1"
android:layout_width="match_parent" android:text="@string/following"
android:layout_height="wrap_content" /> android:layout_width="match_parent"
<TextView android:layout_height="wrap_content" />
android:id="@+id/account_sc" <TextView
android:layout_width="match_parent" android:id="@+id/account_fgc"
android:layout_height="wrap_content" /> android:layout_width="match_parent"
</LinearLayout> android:layout_height="wrap_content" />
<LinearLayout </LinearLayout>
android:layout_width="0dp" <LinearLayout
android:layout_weight="1" android:layout_width="0dp"
android:orientation="vertical" android:layout_weight="1"
android:layout_height="wrap_content"> android:orientation="vertical"
<TextView android:layout_height="wrap_content">
android:maxLines="1" <TextView
android:text="@string/following" android:maxLines="1"
android:layout_width="match_parent" android:text="@string/followers"
android:layout_height="wrap_content" /> android:layout_width="match_parent"
<TextView android:layout_height="wrap_content" />
android:id="@+id/account_fgc" <TextView
android:layout_width="match_parent" android:id="@+id/account_frc"
android:layout_height="wrap_content" /> android:layout_width="match_parent"
</LinearLayout> android:layout_height="wrap_content" />
<LinearLayout </LinearLayout>
android:layout_width="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:maxLines="1"
android:text="@string/followers"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_frc"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>

64
app/src/main/res/layout/drawer_account_search.xml
View File

@ -15,34 +15,42 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/account_container" xmlns:card_view="http://schemas.android.com/tools"
android:orientation="horizontal"> android:layout_marginTop="10dp"
<ImageView card_view:cardPreventCornerOverlap="true"
android:layout_gravity="center" app:cardUseCompatPadding="true">
android:id="@+id/account_pp" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="30dp" xmlns:tools="http://schemas.android.com/tools"
android:layout_height="30dp" android:layout_width="match_parent"
tools:ignore="ContentDescription" /> android:layout_height="wrap_content"
<TextView android:id="@+id/account_container"
android:layout_marginStart="10dp" android:orientation="horizontal">
android:layout_marginLeft="10dp" <ImageView
android:maxLines="1" android:layout_gravity="center"
android:id="@+id/account_un" android:id="@+id/account_pp"
android:layout_gravity="center_vertical" android:layout_width="30dp"
android:layout_width="wrap_content" android:layout_height="30dp"
android:layout_height="wrap_content" /> tools:ignore="ContentDescription" />
<TextView <TextView
android:id="@+id/account_dn" android:layout_marginStart="10dp"
android:layout_marginStart="10dp" android:layout_marginLeft="10dp"
android:layout_marginLeft="10dp" android:maxLines="1"
android:maxLines="1" android:id="@+id/account_un"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:id="@+id/account_dn"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:maxLines="1"
android:layout_gravity="center_vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>

215
app/src/main/res/layout/drawer_notification.xml
View File

@ -15,134 +15,139 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="5dp" xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/main_container" xmlns:card_view="http://schemas.android.com/tools"
android:maxWidth="500dp" android:layout_marginTop="10dp"
android:orientation="horizontal"> card_view:cardPreventCornerOverlap="true"
<ImageView app:cardUseCompatPadding="true">
android:id="@+id/notification_account_profile" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="50dp" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="50dp" android:layout_width="match_parent"
android:layout_gravity="center_horizontal|top"
android:gravity="center_horizontal|top"
tools:ignore="ContentDescription" />
<LinearLayout
android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:id="@+id/main_container"
<TextView android:orientation="horizontal">
android:padding="5dp" <ImageView
android:id="@+id/notification_type" android:id="@+id/notification_account_profile"
android:textStyle="bold" android:layout_height="50dp"
android:textSize="16sp" android:layout_width="50dp"
android:layout_width="match_parent" android:layout_gravity="center_horizontal|top"
android:layout_height="wrap_content" /> android:gravity="center_horizontal|top"
tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:layout_marginStart="5dp"
android:layout_width="match_parent" android:layout_marginLeft="5dp"
android:layout_height="wrap_content"> android:layout_width="0dp"
<TextView android:layout_weight="1"
android:id="@+id/notification_account_displayname"
android:drawablePadding="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:id="@+id/notification_account_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@+id/status_date"
android:layout_width="match_parent"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/notification_status_container"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/notification_status_content" android:padding="5dp"
android:layout_marginTop="10dp" android:id="@+id/notification_type"
android:autoLink="web" android:textStyle="bold"
android:textSize="16sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:id="@+id/status_document_container" android:orientation="horizontal"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView
android:id="@+id/notification_account_displayname"
android:drawablePadding="5dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:id="@+id/notification_account_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout> </LinearLayout>
<TextView
android:id="@+id/status_date"
android:layout_width="match_parent"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:id="@+id/status_action_container" android:id="@+id/notification_status_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:orientation="vertical">
android:padding="@dimen/drawer_padding"
android:layout_marginStart="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginEnd="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:orientation="horizontal">
<TextView <TextView
android:drawablePadding="2dp" android:id="@+id/notification_status_content"
android:layout_gravity="center_vertical" android:layout_marginTop="10dp"
android:gravity="center_vertical" android:autoLink="web"
android:id="@+id/status_favorite_count" android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:id="@+id/status_reply"
android:layout_gravity="center_vertical"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_reply"
tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:id="@+id/status_document_container"
android:layout_weight="1" android:orientation="vertical"
android:layout_gravity="end" android:layout_width="match_parent"
android:gravity="end"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView </LinearLayout>
android:layout_marginRight="20dp" <LinearLayout
android:layout_marginEnd="20dp" android:id="@+id/status_action_container"
android:id="@+id/status_privacy" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="@dimen/drawer_padding"
android:layout_marginStart="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginEnd="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:orientation="horizontal">
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="25dp" android:gravity="center_vertical"
android:layout_height="25dp" android:id="@+id/status_favorite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:id="@+id/status_reply"
android:layout_gravity="center_vertical"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_reply"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_gravity="end"
android:gravity="end"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_height="wrap_content">
<ImageView
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:id="@+id/status_privacy"
android:layout_gravity="center_vertical"
android:layout_width="25dp"
android:layout_height="25dp"
tools:ignore="ContentDescription" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v7.widget.CardView>

522
app/src/main/res/layout/drawer_status.xml
View File

@ -15,325 +15,329 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/drawer_padding" xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingRight="@dimen/drawer_padding" xmlns:card_view="http://schemas.android.com/tools"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:id="@+id/main_container" card_view:cardPreventCornerOverlap="true"
android:orientation="vertical"> app:cardUseCompatPadding="true">
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:id="@+id/main_container"
android:baselineAligned="false"> android:orientation="vertical">
<RelativeLayout
android:layout_height="60dp"
android:layout_width="60dp"
android:layout_gravity="center_horizontal|top"
android:gravity="center_horizontal|top">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:id="@+id/status_account_profile"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/status_account_profile_boost"
android:layout_height="30dp"
android:layout_width="30dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:background="@drawable/imageview_border"
android:visibility="gone"
tools:ignore="ContentDescription" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:layout_marginStart="5dp" android:layout_width="match_parent"
android:layout_marginLeft="5dp"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="horizontal"
android:baselineAligned="false">
<RelativeLayout
android:layout_height="60dp"
android:layout_width="60dp"
android:layout_gravity="center_horizontal|top"
android:gravity="center_horizontal|top">
<ImageView
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignParentTop="true"
android:id="@+id/status_account_profile"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/status_account_profile_boost"
android:layout_height="30dp"
android:layout_width="30dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:background="@drawable/imageview_border"
android:visibility="gone"
tools:ignore="ContentDescription" />
</RelativeLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:layout_marginStart="5dp"
android:layout_width="match_parent" android:layout_marginLeft="5dp"
android:layout_height="wrap_content"> android:layout_width="0dp"
<TextView android:layout_weight="1"
android:id="@+id/status_account_displayname" android:layout_height="wrap_content"
android:textSize="16sp" android:orientation="vertical">
android:textStyle="bold" <LinearLayout
android:maxLines="1" android:orientation="horizontal"
android:drawablePadding="2dp" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content" /> <TextView
android:id="@+id/status_account_displayname"
android:textSize="16sp"
android:textStyle="bold"
android:maxLines="1"
android:drawablePadding="2dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:textSize="14sp"
android:textStyle="bold"
android:maxLines="1"
android:id="@+id/status_account_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView <TextView
android:visibility="gone"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"
android:maxLines="1" android:maxLines="1"
android:id="@+id/status_account_username" android:id="@+id/status_reblog_user"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:visibility="gone"
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:textSize="14sp"
android:maxLines="1"
android:id="@+id/status_reblog_user"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_toot_date"
android:layout_width="match_parent"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content" />
<LinearLayout
android:id="@+id/status_spoiler_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:visibility="gone"
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_spoiler"
android:layout_marginTop="10dp"
android:autoLink="web"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<Button <TextView
android:id="@+id/status_spoiler_button" android:id="@+id/status_toot_date"
android:textAllCaps="false" android:layout_width="match_parent"
android:drawableLeft="@drawable/ic_remove_red_eye"
android:drawableStart="@drawable/ic_remove_red_eye"
android:gravity="center"
android:drawablePadding="5dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingRight="10dp" android:paddingRight="10dp"
android:paddingEnd="10dp" android:paddingLeft="10dp"
android:paddingTop="5dp" android:layout_gravity="end"
android:paddingBottom="5dp" android:gravity="end"
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_content_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_content"
android:layout_marginTop="10dp"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:id="@+id/status_document_container" android:id="@+id/status_spoiler_container"
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="200dp" android:orientation="vertical"
android:baselineAligned="false"> android:visibility="gone"
<RelativeLayout android:layout_height="wrap_content">
android:layout_width="0dp" <TextView
android:layout_weight="1" android:id="@+id/status_spoiler"
android:layout_height="match_parent" android:layout_marginTop="10dp"
> android:autoLink="web"
<ImageView android:layout_width="match_parent"
android:id="@+id/status_prev1" android:layout_height="wrap_content" />
android:layout_width="match_parent" <Button
android:scaleType="centerCrop" android:id="@+id/status_spoiler_button"
android:layout_height="match_parent" android:textAllCaps="false"
tools:ignore="ContentDescription" /> android:drawableLeft="@drawable/ic_remove_red_eye"
<ImageView android:drawableStart="@drawable/ic_remove_red_eye"
android:id="@+id/status_prev1_play" android:gravity="center"
android:visibility="gone" android:drawablePadding="5dp"
android:layout_centerInParent="true" android:paddingLeft="10dp"
android:layout_width="20dp" android:paddingStart="10dp"
android:src="@drawable/ic_play_arrow" android:paddingRight="10dp"
android:layout_height="20dp" android:paddingEnd="10dp"
tools:ignore="ContentDescription" /> android:paddingTop="5dp"
</RelativeLayout> android:paddingBottom="5dp"
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/load_attachment_spoiler" />
</LinearLayout>
<LinearLayout
android:id="@+id/status_content_container"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="wrap_content">
<TextView
android:id="@+id/status_content"
android:layout_marginTop="10dp"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<LinearLayout <LinearLayout
android:orientation="vertical" android:id="@+id/status_document_container"
android:layout_width="0dp" android:orientation="horizontal"
android:layout_marginLeft="2dp" android:layout_width="match_parent"
android:layout_marginStart="2dp" android:layout_height="200dp"
android:id="@+id/status_container2" android:baselineAligned="false">
android:layout_weight="1"
android:layout_height="match_parent">
<RelativeLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:scaleType="centerCrop" android:layout_weight="1"
android:layout_height="0dp" android:layout_height="match_parent"
android:layout_weight="1"> >
<ImageView <ImageView
android:id="@+id/status_prev2" android:id="@+id/status_prev1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<ImageView <ImageView
android:id="@+id/status_prev1_play"
android:visibility="gone" android:visibility="gone"
android:id="@+id/status_prev2_play"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:layout_width="20dp" android:layout_width="20dp"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="0dp"
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:id="@+id/status_container2"
android:layout_weight="1" android:layout_weight="1"
android:layout_width="match_parent" android:layout_height="match_parent">
android:orientation="horizontal"
android:layout_marginTop="2dp"
android:id="@+id/status_container3"
android:layout_height="0dp"
android:baselineAligned="false">
<RelativeLayout <RelativeLayout
android:layout_marginLeft="2dp" android:layout_width="match_parent"
android:layout_marginStart="2dp" android:scaleType="centerCrop"
android:layout_weight="1" android:layout_height="0dp"
android:layout_width="0dp" android:layout_weight="1">
android:layout_height="wrap_content">
<ImageView <ImageView
android:id="@+id/status_prev3" android:id="@+id/status_prev2"
android:layout_width="match_parent" android:layout_width="match_parent"
android:scaleType="centerCrop" android:scaleType="centerCrop"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<ImageView <ImageView
android:id="@+id/status_prev3_play"
android:layout_centerInParent="true"
android:layout_width="20dp"
android:src="@drawable/ic_play_arrow"
android:visibility="gone" android:visibility="gone"
android:layout_height="20dp" android:id="@+id/status_prev2_play"
tools:ignore="ContentDescription" />
</RelativeLayout>
<RelativeLayout
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:layout_width="0dp"
android:id="@+id/status_prev4_container"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/status_prev4"
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="match_parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/status_prev4_play"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:visibility="gone"
android:layout_width="20dp" android:layout_width="20dp"
android:src="@drawable/ic_play_arrow" android:src="@drawable/ic_play_arrow"
android:layout_height="20dp" android:layout_height="20dp"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
</RelativeLayout> </RelativeLayout>
<LinearLayout
android:layout_weight="1"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginTop="2dp"
android:id="@+id/status_container3"
android:layout_height="0dp"
android:baselineAligned="false">
<RelativeLayout
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:layout_width="0dp"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/status_prev3"
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="match_parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/status_prev3_play"
android:layout_centerInParent="true"
android:layout_width="20dp"
android:src="@drawable/ic_play_arrow"
android:visibility="gone"
android:layout_height="20dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
<RelativeLayout
android:layout_marginLeft="2dp"
android:layout_marginStart="2dp"
android:layout_weight="1"
android:layout_width="0dp"
android:id="@+id/status_prev4_container"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/status_prev4"
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="match_parent"
tools:ignore="ContentDescription" />
<ImageView
android:id="@+id/status_prev4_play"
android:layout_centerInParent="true"
android:visibility="gone"
android:layout_width="20dp"
android:src="@drawable/ic_play_arrow"
android:layout_height="20dp"
tools:ignore="ContentDescription" />
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<Button
android:id="@+id/status_show_more"
android:visibility="gone"
android:textAllCaps="false"
android:drawableLeft="@drawable/ic_photo"
android:drawableStart="@drawable/ic_photo"
android:gravity="center"
android:drawablePadding="5dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingRight="10dp"
android:paddingEnd="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/load_attachment" />
</LinearLayout> </LinearLayout>
<Button
android:id="@+id/status_show_more"
android:visibility="gone"
android:textAllCaps="false"
android:drawableLeft="@drawable/ic_photo"
android:drawableStart="@drawable/ic_photo"
android:gravity="center"
android:drawablePadding="5dp"
android:paddingLeft="10dp"
android:paddingStart="10dp"
android:paddingRight="10dp"
android:paddingEnd="10dp"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:maxLines="1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/load_attachment" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/status_action_container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:padding="@dimen/drawer_padding"
android:layout_marginStart="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_vertical_margin"
android:layout_marginEnd="@dimen/activity_vertical_margin"
android:layout_marginRight="@dimen/activity_vertical_margin"
android:orientation="horizontal">
<TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_favorite_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:id="@+id/status_reply"
android:layout_gravity="center_vertical"
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/ic_reply"
tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:id="@+id/status_action_container"
android:layout_weight="1" android:layout_width="match_parent"
android:layout_gravity="end" android:layout_height="wrap_content"
android:gravity="end" android:layout_marginTop="10dp"
android:paddingRight="10dp" android:padding="@dimen/drawer_padding"
android:paddingLeft="10dp" android:layout_marginStart="@dimen/activity_vertical_margin"
android:layout_height="wrap_content"> android:layout_marginLeft="@dimen/activity_vertical_margin"
<ImageView android:layout_marginEnd="@dimen/activity_vertical_margin"
android:layout_marginRight="20dp" android:layout_marginRight="@dimen/activity_vertical_margin"
android:layout_marginEnd="20dp" android:orientation="horizontal">
android:id="@+id/status_privacy" <TextView
android:drawablePadding="2dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_width="25dp" android:gravity="center_vertical"
android:layout_height="25dp" android:id="@+id/status_favorite_count"
tools:ignore="ContentDescription" /> android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:drawablePadding="2dp"
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:id="@+id/status_reblog_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<ImageView <ImageView
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginStart="20dp" android:layout_marginStart="20dp"
android:id="@+id/status_more" android:id="@+id/status_reply"
android:layout_width="25dp" android:layout_gravity="center_vertical"
android:layout_height="25dp" android:layout_width="20dp"
android:src="@drawable/ic_action_more" android:layout_height="20dp"
android:src="@drawable/ic_reply"
tools:ignore="ContentDescription" /> tools:ignore="ContentDescription" />
<LinearLayout
android:layout_width="0dp"
android:layout_weight="1"
android:layout_gravity="end"
android:gravity="end"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_height="wrap_content">
<ImageView
android:layout_marginRight="20dp"
android:layout_marginEnd="20dp"
android:id="@+id/status_privacy"
android:layout_gravity="center_vertical"
android:layout_width="25dp"
android:layout_height="25dp"
tools:ignore="ContentDescription" />
<ImageView
android:layout_marginLeft="20dp"
android:layout_marginStart="20dp"
android:id="@+id/status_more"
android:layout_width="25dp"
android:layout_height="25dp"
android:src="@drawable/ic_action_more"
tools:ignore="ContentDescription" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </android.support.v7.widget.CardView>

164
app/src/main/res/layout/drawer_status_main_search.xml
View File

@ -15,97 +15,101 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:paddingTop="10dp"
android:paddingBottom="10dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/drawer_padding" xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingRight="@dimen/drawer_padding" xmlns:card_view="http://schemas.android.com/tools"
android:layout_marginTop="5dp" android:layout_marginTop="10dp"
android:id="@+id/main_container" card_view:cardPreventCornerOverlap="true"
android:orientation="vertical"> app:cardUseCompatPadding="true">
<TextView <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/status_search_title" xmlns:tools="http://schemas.android.com/tools"
android:visibility="gone"
android:text="@string/status"
android:textColor="@color/colorPrimary"
android:textSize="18sp"
android:background="@color/blue_light"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout
android:id="@+id/statuts_search_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:id="@+id/main_container"
<ImageView android:orientation="vertical">
android:id="@+id/status_account_profile" <TextView
android:layout_height="50dp" android:id="@+id/status_search_title"
android:layout_width="50dp" android:visibility="gone"
android:layout_gravity="center_horizontal|top" android:text="@string/status"
android:gravity="center_horizontal|top" android:textColor="@color/colorPrimary"
tools:ignore="ContentDescription" /> android:textSize="18sp"
android:background="@color/blue_light"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<LinearLayout <LinearLayout
android:layout_marginStart="5dp" android:id="@+id/statuts_search_container"
android:layout_marginLeft="5dp" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="horizontal">
<ImageView
android:id="@+id/status_account_profile"
android:layout_height="50dp"
android:layout_width="50dp"
android:layout_gravity="center_horizontal|top"
android:gravity="center_horizontal|top"
tools:ignore="ContentDescription" />
<LinearLayout <LinearLayout
android:orientation="horizontal" android:layout_marginStart="5dp"
android:layout_width="match_parent" android:layout_marginLeft="5dp"
android:layout_height="wrap_content"> android:layout_width="0dp"
<TextView android:layout_weight="1"
android:id="@+id/status_account_displayname" android:layout_height="wrap_content"
android:textSize="16sp" android:orientation="vertical">
android:textStyle="bold" <LinearLayout
android:maxLines="1" android:orientation="horizontal"
android:drawablePadding="2dp" android:layout_width="match_parent"
android:layout_width="wrap_content" android:layout_height="wrap_content">
android:layout_height="wrap_content" /> <TextView
android:id="@+id/status_account_displayname"
android:textSize="16sp"
android:textStyle="bold"
android:maxLines="1"
android:drawablePadding="2dp"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
<TextView
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:textSize="14sp"
android:textStyle="bold"
android:maxLines="1"
android:id="@+id/status_account_username"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView <TextView
android:visibility="gone"
android:layout_marginLeft="5dp" android:layout_marginLeft="5dp"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:textSize="14sp" android:textSize="14sp"
android:textStyle="bold"
android:maxLines="1" android:maxLines="1"
android:id="@+id/status_account_username" android:id="@+id/status_reblog_user"
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" /> android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_toot_date"
android:layout_width="match_parent"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_content"
android:layout_marginTop="10dp"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<TextView </LinearLayout>
android:visibility="gone" </android.support.v7.widget.CardView>
android:layout_marginLeft="5dp"
android:layout_marginStart="5dp"
android:textSize="14sp"
android:maxLines="1"
android:id="@+id/status_reblog_user"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_toot_date"
android:layout_width="match_parent"
android:paddingRight="10dp"
android:paddingLeft="10dp"
android:layout_gravity="end"
android:gravity="end"
android:layout_height="wrap_content" />
<TextView
android:id="@+id/status_content"
android:layout_marginTop="10dp"
android:autoLink="web"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

69
app/src/main/res/layout/drawer_tag.xml
View File

@ -15,37 +15,44 @@
You should have received a copy of the GNU General Public License along with Thomas Schneider; if not, You should have received a copy of the GNU General Public License along with Thomas Schneider; if not,
see <http://www.gnu.org/licenses>. see <http://www.gnu.org/licenses>.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="@dimen/drawer_padding" xmlns:app="http://schemas.android.com/apk/res-auto"
android:paddingRight="@dimen/drawer_padding" xmlns:card_view="http://schemas.android.com/tools"
android:id="@+id/account_container" android:layout_marginTop="10dp"
android:orientation="vertical"> card_view:cardPreventCornerOverlap="true"
<TextView app:cardUseCompatPadding="true">
android:id="@+id/tag_search_title" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:textColor="@color/colorPrimary"
android:visibility="gone"
android:textSize="18sp"
android:background="@color/blue_light"
android:paddingBottom="10dp"
android:paddingTop="10dp"
android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:text="@string/tags"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"/> android:layout_height="wrap_content"
<TextView android:id="@+id/account_container"
android:layout_marginStart="10dp" android:orientation="vertical">
android:layout_marginLeft="10dp" <TextView
android:padding="20dp" android:id="@+id/tag_search_title"
android:id="@+id/tag_name" android:textColor="@color/colorPrimary"
android:textSize="16sp" android:visibility="gone"
android:layout_gravity="center_vertical" android:textSize="18sp"
android:clickable="true" android:background="@color/blue_light"
android:layout_width="match_parent" android:paddingBottom="10dp"
android:layout_height="wrap_content" /> android:paddingTop="10dp"
</LinearLayout> android:layout_marginTop="5dp"
android:layout_marginBottom="5dp"
android:textStyle="bold"
android:text="@string/tags"
android:layout_gravity="center"
android:gravity="center"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
<TextView
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:padding="20dp"
android:id="@+id/tag_name"
android:textSize="16sp"
android:layout_gravity="center_vertical"
android:clickable="true"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</LinearLayout>
</android.support.v7.widget.CardView>

1
app/src/main/res/layout/fragment_accounts.xml
View File

@ -32,6 +32,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

1
app/src/main/res/layout/fragment_notifications.xml
View File

@ -32,6 +32,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

1
app/src/main/res/layout/fragment_status.xml
View File

@ -32,6 +32,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:scrollbars="none" android:scrollbars="none"
android:divider="@null"
> >
</ListView> </ListView>
</android.support.v4.widget.SwipeRefreshLayout> </android.support.v4.widget.SwipeRefreshLayout>

4
app/src/main/res/layout/nav_header_main.xml
View File

@ -27,7 +27,6 @@
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:theme="@style/ThemeOverlay.AppCompat.Dark"> android:theme="@style/ThemeOverlay.AppCompat.Dark">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
@ -82,6 +81,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="2dp"
android:orientation="vertical" android:orientation="vertical"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -99,6 +99,7 @@
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:padding="2dp"
android:orientation="vertical" android:orientation="vertical"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
@ -117,6 +118,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:padding="2dp"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<TextView <TextView
android:maxLines="1" android:maxLines="1"

1
app/src/main/res/values-sw600dp/dimens.xml
View File

@ -4,4 +4,5 @@
<dimen name="toot_padding">200dp</dimen> <dimen name="toot_padding">200dp</dimen>
<dimen name="fab_margin">100dp</dimen> <dimen name="fab_margin">100dp</dimen>
<dimen name="activity_vertical_margin">20dp</dimen> <dimen name="activity_vertical_margin">20dp</dimen>
<dimen name="activity_padding_top_header">15dp</dimen>
</resources> </resources>

2
app/src/main/res/values/colors.xml
View File

@ -14,7 +14,7 @@
<color name="splashc">#F5F5F5</color> <color name="splashc">#F5F5F5</color>
<color name="white">#FFF</color> <color name="white">#FFF</color>
<color name="blue_light">#E3F2FD</color> <color name="blue_light">#C5CAE9</color>
<color name="light_grey">#E0E0E0</color> <color name="light_grey">#E0E0E0</color>
<color name="darkicon">#424242</color> <color name="darkicon">#424242</color>
<color name="yellowicon">#FDD835</color> <color name="yellowicon">#FDD835</color>

1
app/src/main/res/values/dimens.xml
View File

@ -2,6 +2,7 @@
<!-- Default screen margins, per the Android Design guidelines. --> <!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_horizontal_margin">16dp</dimen> <dimen name="activity_horizontal_margin">16dp</dimen>
<dimen name="activity_vertical_margin">16dp</dimen> <dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="activity_padding_header">10dp</dimen>
<dimen name="nav_header_vertical_spacing">16dp</dimen> <dimen name="nav_header_vertical_spacing">16dp</dimen>
<dimen name="nav_header_height">160dp</dimen> <dimen name="nav_header_height">160dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>