Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

簡易投稿バーのアイコン図柄の大きさはカラムストリップアイコンの大きさの設定に追従する。

This commit is contained in:
tateisu 2019-12-22 22:15:07 +09:00
parent 46df41f032
commit 9fb6755229
1 changed files with 25 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
app/src/main/res/layout/act_main.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.drawerlayout.widget.DrawerLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/drawer_layout"
@ -8,73 +7,63 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="jp.juggler.subwaytooter.ActMain"
tools:openDrawer="start"
>
tools:openDrawer="start">
<LinearLayout
android:id="@+id/llFormRoot"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:id="@+id/llFormRoot"
>
android:orientation="vertical">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
>
android:orientation="vertical">
<LinearLayout
android:id="@+id/llEmpty"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:text="@string/column_empty"
/>
android:text="@string/column_empty" />
</LinearLayout>
<jp.juggler.subwaytooter.view.MyViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
<jp.juggler.subwaytooter.view.TabletModeRecyclerView
android:id="@+id/rvPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
/>
android:layout_height="match_parent" />
</FrameLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
>
android:orientation="horizontal">
<ImageButton
android:id="@+id/btnMenu"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/menu"
android:src="@drawable/ic_hamburger"
android:scaleType="fitCenter"
/>
android:src="@drawable/ic_hamburger" />
<View
android:id="@+id/vFooterDivider1"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
/>
android:background="?attr/colorImageButton" />
<HorizontalScrollView
android:id="@+id/svColumnStrip"
@ -86,32 +75,28 @@
android:fadingEdge="horizontal"
android:fadingEdgeLength="20dp"
android:fillViewport="true"
android:scrollbars="none"
>
android:scrollbars="none">
<jp.juggler.subwaytooter.view.ColumnStripLinearLayout
android:id="@+id/llColumnStrip"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
/>
android:orientation="horizontal" />
</HorizontalScrollView>
<View
android:id="@+id/vFooterDivider2"
android:layout_width="1dp"
android:layout_height="match_parent"
android:background="?attr/colorImageButton"
/>
android:background="?attr/colorImageButton" />
<ImageButton
android:id="@+id/btnToot"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/toot"
android:src="@drawable/ic_edit"
android:scaleType="fitCenter"
/>
android:src="@drawable/ic_edit" />
</LinearLayout>
<LinearLayout
@ -120,36 +105,35 @@
android:layout_height="wrap_content"
android:baselineAligned="false"
android:orientation="horizontal"
>
android:gravity="center_vertical">
<ImageButton
android:id="@+id/btnQuickTootMenu"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/quick_toot_menu"
app:srcCompat="@drawable/ic_description"
/>
android:scaleType="fitCenter"
android:src="@drawable/ic_description" />
<jp.juggler.subwaytooter.view.MyEditText
android:id="@+id/etQuickToot"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="6dp"
android:layout_marginStart="6dp"
android:layout_marginEnd="6dp"
android:layout_weight="1"
android:inputType="text"
android:hint="@string/quick_toot_hint"
android:imeOptions="actionSend"
android:scrollbars = "vertical"
/>
android:inputType="text"
android:scrollbars="vertical" />
<ImageButton
android:id="@+id/btnQuickToot"
android:layout_width="48dp"
android:layout_height="48dp"
android:contentDescription="@string/post"
app:srcCompat="@drawable/ic_send"
/>
android:scaleType="fitCenter"
android:src="@drawable/ic_send" />
</LinearLayout>
</LinearLayout>
<!--<android.support.design.widget.FloatingActionButton-->
@ -183,8 +167,7 @@
android:id="@+id/nav_view"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
>
android:layout_gravity="start">
</com.google.android.material.navigation.NavigationView>
<!-- app:headerLayout="@layout/nav_header_act_main" -->