Changes
This commit is contained in:
@@ -23,9 +23,9 @@
|
||||
-->
|
||||
|
||||
<LinearLayout
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:id="@+id/main_fragment_layout"
|
||||
style="@style/CppFragment"
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
@@ -41,10 +41,13 @@
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent">
|
||||
|
||||
<ListView style="@style/CppListView" />
|
||||
<android.support.v7.widget.RecyclerView
|
||||
a:id="@+id/history_recyclerview"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="match_parent" />
|
||||
|
||||
<com.melnykov.fab.FloatingActionButton
|
||||
a:id="@+id/fab"
|
||||
a:id="@+id/history_fab"
|
||||
style="@style/CppFab"
|
||||
a:src="@drawable/ic_delete_white_36dp" />
|
||||
</FrameLayout>
|
||||
|
@@ -23,20 +23,29 @@
|
||||
-->
|
||||
|
||||
<LinearLayout
|
||||
style="@style/CppListItem.TwoLines"
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
style="@style/CppListViewItem"
|
||||
a:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_item"
|
||||
style="@style/CppListViewItemTextPrimary.History"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent" />
|
||||
a:id="@+id/history_item_value"
|
||||
style="@style/CppListItemText.Primary"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content"
|
||||
a:ellipsize="end"
|
||||
a:maxLines="2" />
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_time"
|
||||
style="@style/CppListViewItemTextSecondary"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent" />
|
||||
a:id="@+id/history_item_comment"
|
||||
style="@style/CppListItemText.Secondary.OneLine"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content" />
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_item_time"
|
||||
style="@style/CppListItemText.Secondary.OneLine"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content"
|
||||
a:textSize="@dimen/list_item_text_size_small"
|
||||
a:gravity="center_vertical|end"/>
|
||||
</LinearLayout>
|
@@ -24,14 +24,14 @@
|
||||
|
||||
<LinearLayout
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
style="@style/CppListViewItem"
|
||||
style="@style/CppListItem"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content"
|
||||
a:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
a:id="@+id/math_entity_text"
|
||||
style="@style/CppListViewItemTextPrimary"
|
||||
style="@style/CppListItemText.Primary"
|
||||
a:layout_width="match_parent"
|
||||
a:layout_height="wrap_content" />
|
||||
|
||||
|
@@ -1,47 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
|
||||
<!--
|
||||
~ Copyright 2013 serso aka se.solovyev
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
~
|
||||
~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
|
||||
~ Contact details
|
||||
~
|
||||
~ Email: se.solovyev@gmail.com
|
||||
~ Site: http://se.solovyev.org
|
||||
-->
|
||||
|
||||
<LinearLayout
|
||||
xmlns:a="http://schemas.android.com/apk/res/android"
|
||||
style="@style/CppListViewItem"
|
||||
a:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_item"
|
||||
style="@style/CppListViewItemTextPrimary.History"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent" />
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_item_comment"
|
||||
style="@style/CppListViewItemTextSecondary"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent" />
|
||||
|
||||
<TextView
|
||||
a:id="@+id/history_time"
|
||||
style="@style/CppListViewItemTextSecondary"
|
||||
a:layout_width="fill_parent"
|
||||
a:layout_height="fill_parent" />
|
||||
</LinearLayout>
|
Reference in New Issue
Block a user