bitmessage/Abit
bitmessage/Abit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed layout for composing messages

Browse Source
This commit is contained in:
Christian Basler 2016-08-13 12:06:41 +02:00
parent 709e333e78
commit f0e03f15a3
6 changed files with 59 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/ch/dissem/apps/abit/AddressDetailActivity.java
View File

@ -38,7 +38,7 @@ public class AddressDetailActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.toolbar_layout); setContentView(R.layout.scrolling_toolbar_layout);
final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);

2
app/src/main/java/ch/dissem/apps/abit/MessageDetailActivity.java
View File

@ -22,7 +22,7 @@ public class MessageDetailActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.toolbar_layout); setContentView(R.layout.scrolling_toolbar_layout);
final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); final Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);

2
app/src/main/java/ch/dissem/apps/abit/SettingsActivity.java
View File

@ -11,7 +11,7 @@ public class SettingsActivity extends AppCompatActivity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.toolbar_layout); setContentView(R.layout.scrolling_toolbar_layout);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);

15
app/src/main/res/layout/fragment_compose_message.xml
View File

@ -1,9 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:orientation="vertical">
android:orientation="vertical">
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@ -16,7 +15,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/to" android:hint="@string/to"
android:inputType="textNoSuggestions" android:inputType="textNoSuggestions"
android:singleLine="true" /> android:singleLine="true"/>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
@ -30,7 +29,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="@string/subject" android:hint="@string/subject"
android:inputType="textEmailSubject" android:inputType="textEmailSubject"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="?android:attr/textAppearanceLarge"/>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
@ -39,9 +38,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="0dp"
android:layout_weight="1" android:layout_weight="1"
android:gravity="start|top"
android:hint="@string/compose_body_hint" android:hint="@string/compose_body_hint"
android:inputType="textMultiLine|textCapSentences" android:inputType="textMultiLine|textCapSentences"
android:gravity="top" android:scrollbars="vertical"/>
android:isScrollContainer="true" />
</LinearLayout> </LinearLayout>

37
app/src/main/res/layout/scrolling_toolbar_layout.xml Normal file
View File

@ -0,0 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ComposeMessageActivity">
<FrameLayout android:id="@+id/content"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:context=".ComposeMessageActivity"
tools:layout="@layout/fragment_compose_message"/>
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary"
android:elevation="4dp"
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
tools:ignore="UnusedAttribute"/>
</android.support.design.widget.AppBarLayout>
</android.support.design.widget.CoordinatorLayout>

24
app/src/main/res/layout/toolbar_layout.xml
View File

@ -1,20 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.design.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true"> android:fitsSystemWindows="true"
tools:context=".ComposeMessageActivity">
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout android:id="@+id/content"
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/content" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_below="@id/toolbar" android:layout_marginTop="@dimen/action_bar_offset"
app:layout_behavior="@string/appbar_scrolling_view_behavior" tools:context=".ComposeMessageActivity"
tools:context=".MessageListActivity" tools:layout="@layout/fragment_compose_message"/>
tools:layout="@android:layout/list_content" />
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
android:layout_width="match_parent" android:layout_width="match_parent"