Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xabber-android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
xabber-android
Commits
60fa6221
Commit
60fa6221
authored
Apr 23, 2015
by
Grigory Fedorov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Toolbar layouts: ?attr/actionBarSize used everwhere, small title size in landscape mode fixed.
parent
246afd2a
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
43 additions
and
39 deletions
+43
-39
ChatViewerFragment.java
...c/main/java/com/xabber/android/ui/ChatViewerFragment.java
+1
-1
chat_fragment.xml
app/src/main/res/layout/chat_fragment.xml
+35
-36
expandable_contact_title_activity.xml
...src/main/res/layout/expandable_contact_title_activity.xml
+1
-0
toolbar_default.xml
app/src/main/res/layout/toolbar_default.xml
+2
-2
theme.xml
app/src/main/res/values/theme.xml
+4
-0
No files found.
app/src/main/java/com/xabber/android/ui/ChatViewerFragment.java
View file @
60fa6221
...
...
@@ -117,7 +117,7 @@ public class ChatViewerFragment extends Fragment implements PopupMenu.OnMenuItem
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
super
.
onCreateView
(
inflater
,
container
,
savedInstanceState
);
View
view
=
inflater
.
inflate
(
R
.
layout
.
chat_
viewer_item
,
container
,
false
);
View
view
=
inflater
.
inflate
(
R
.
layout
.
chat_
fragment
,
container
,
false
);
View
contactTitle
=
view
.
findViewById
(
R
.
id
.
contact_title
);
...
...
app/src/main/res/layout/chat_
viewer_item
.xml
→
app/src/main/res/layout/chat_
fragment
.xml
View file @
60fa6221
...
...
@@ -22,9 +22,8 @@
<android.support.v7.widget.Toolbar
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/toolbar_default"
android:layout_height=
"
wrap_content
"
android:layout_height=
"
?attr/actionBarSize
"
android:layout_width=
"match_parent"
android:minHeight=
"52dp"
android:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
...
...
@@ -75,11 +74,11 @@
<EditText
android:id=
"@+id/chat_input"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:inputType=
"textShortMessage|textAutoCorrect|textCapSentences|textMultiLine"
android:cursorVisible=
"true"
android:hint=
"@string/chat_input_hint"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:maxLines=
"4"
android:scrollbars=
"vertical"
android:fadingEdge=
"vertical"
...
...
app/src/main/res/layout/expandable_contact_title_activity.xml
View file @
60fa6221
...
...
@@ -33,6 +33,7 @@
android:id=
"@+id/toolbar_overlay"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
app:titleTextAppearance=
"@style/ToolbarTitle"
android:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
android:elevation=
"8dp"
...
...
app/src/main/res/layout/toolbar_default.xml
View file @
60fa6221
...
...
@@ -3,10 +3,10 @@
<android.support.v7.widget.Toolbar
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:id=
"@+id/toolbar_default"
android:layout_height=
"wrap_content"
android:layout_width=
"match_parent"
android:
minH
eight=
"?attr/actionBarSize"
android:
layout_h
eight=
"?attr/actionBarSize"
app:titleTextAppearance=
"@style/ToolbarTitle"
android:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
android:background=
"?attr/colorPrimary"
...
...
app/src/main/res/values/theme.xml
View file @
60fa6221
...
...
@@ -23,4 +23,8 @@
<!-- for hardware button menu -->
<item
name=
"panelBackground"
>
?attr/colorPrimary
</item>
</style>
<style
name=
"ToolbarTitle"
parent=
"@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
>
<item
name=
"android:textSize"
>
17sp
</item>
</style>
</resources>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment