Skip to content

Commit 07a200b

Browse files
author
Paul T
committed
Various Layout and Values Changes
Small tweaks to layouts and values. Switch the item view for the recylcer view to use constraint layout.
1 parent 6fa882e commit 07a200b

File tree

7 files changed

+62
-52
lines changed

7 files changed

+62
-52
lines changed

‎app/src/main/res/layout/activity_main.xml

Lines changed: 27 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,54 @@
11
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2-
xmlns:app="http://schemas.android.com/apk/res-auto"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
android:gravity="center"
7-
android:paddingBottom="@dimen/activity_vertical_margin"
8-
android:paddingLeft="@dimen/activity_horizontal_margin"
9-
android:paddingRight="@dimen/activity_horizontal_margin"
10-
android:paddingTop="@dimen/activity_vertical_margin"
11-
tools:context="com.github.developerpaul123.filepickerlibrary.app.MainActivity$PlaceholderFragment">
2+
xmlns:tools="http://schemas.android.com/tools"
3+
android:layout_width="match_parent"
4+
android:layout_height="match_parent"
5+
android:gravity="center"
6+
android:paddingBottom="@dimen/activity_vertical_margin"
7+
android:paddingLeft="@dimen/activity_horizontal_margin"
8+
android:paddingRight="@dimen/activity_horizontal_margin"
9+
android:paddingTop="@dimen/activity_vertical_margin"
10+
tools:context="com.github.developerpaul123.filepickerlibrary.app.MainActivity">
1211

13-
<com.devpaul.materiallibrary.views.MaterialFlatButton
12+
<android.support.v7.widget.AppCompatButton
1413
android:id="@+id/file_picker_activity"
1514
android:layout_width="wrap_content"
1615
android:layout_height="wrap_content"
17-
app:mat_flat_button_color="#303F9F"
18-
app:mat_flat_button_text="@string/file_picker_activity"/>
16+
android:text="@string/file_picker_activity"/>
1917

20-
<com.devpaul.materiallibrary.views.MaterialFlatButton
18+
<android.support.v7.widget.AppCompatButton
2119
android:id="@+id/file_picker_return_file_path"
2220
android:layout_width="wrap_content"
2321
android:layout_height="wrap_content"
2422
android:layout_below="@id/file_picker_activity"
2523
android:layout_marginTop="10dip"
26-
app:mat_flat_button_color="#303F9F"
27-
app:mat_flat_button_text="@string/return_file_path"/>
24+
android:text="@string/return_file_path"/>
2825

29-
<com.devpaul.materiallibrary.views.MaterialFlatButton
26+
<android.support.v7.widget.AppCompatButton
3027
android:id="@+id/file_picker_dialog"
3128
android:layout_width="wrap_content"
3229
android:layout_height="wrap_content"
3330
android:layout_below="@+id/file_picker_return_file_path"
3431
android:layout_marginTop="10dip"
35-
app:mat_flat_button_color="#303F9F"
36-
app:mat_flat_button_text="@string/file_picker_dialog"/>
32+
android:text="@string/file_picker_dialog"/>
3733

38-
<com.devpaul.materiallibrary.views.MaterialFlatButton
34+
<android.support.v7.widget.AppCompatButton
3935
android:id="@+id/file_picker_mime_png"
4036
android:layout_width="wrap_content"
4137
android:layout_height="wrap_content"
42-
android:layout_below="@id/file_picker_dialog"
43-
android:layout_marginTop="10dip"
44-
app:mat_flat_button_color="#303F9F"
45-
app:mat_flat_button_text="PNG Mime"/>
38+
android:layout_marginTop="13dp"
39+
android:text="PNG Mime"
40+
android:layout_below="@+id/file_picker_dialog"
41+
android:layout_alignLeft="@+id/new_file_picker_activity"
42+
android:layout_alignStart="@+id/new_file_picker_activity" />
4643

47-
<com.devpaul.materiallibrary.views.MaterialFlatButton
44+
<android.support.v7.widget.AppCompatButton
4845
android:id="@+id/new_file_picker_activity"
4946
android:layout_width="wrap_content"
5047
android:layout_height="wrap_content"
51-
android:layout_below="@id/file_picker_mime_png"
52-
android:layout_marginTop="10dip"
53-
app:mat_flat_button_color="#303F9F"
54-
app:mat_flat_button_text="Material"/>
48+
android:layout_marginTop="11dp"
49+
android:text="Material"
50+
android:layout_below="@+id/file_picker_mime_png"
51+
android:layout_alignLeft="@+id/file_picker_dialog"
52+
android:layout_alignStart="@+id/file_picker_dialog" />
5553

5654
</RelativeLayout>

‎library/src/main/AndroidManifest.xml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
1-
<manifest package="com.github.developerpaul123.filepickerlibrary"
2-
xmlns:android="http://schemas.android.com/apk/res/android">
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
package="com.github.developerpaul123.filepickerlibrary">
34

4-
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
5-
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
5+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
6+
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
67

78
<application
89
android:allowBackup="true"
910
android:theme="@style/AppTheme">
1011
<activity
1112
android:name=".FilePickerActivity"
12-
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"/>
13+
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
1314
<activity
1415
android:name=".FilePicker"
15-
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden"/>
16+
android:configChanges="orientation|screenSize|screenLayout|keyboardHidden" />
1617
</application>
1718

18-
</manifest>
19+
</manifest>

‎library/src/main/res/layout/file_list_item.xml

Lines changed: 18 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,39 +16,45 @@
1616
~ limitations under the License.
1717
-->
1818

19-
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
20-
android:layout_width="fill_parent"
21-
android:layout_height="fill_parent"
22-
android:orientation="vertical"
23-
android:padding="16dp">
19+
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
20+
xmlns:app="http://schemas.android.com/apk/res-auto"
21+
android:id="@+id/relativeLayout"
22+
android:layout_width="fill_parent"
23+
android:layout_height="wrap_content"
24+
android:orientation="vertical"
25+
android:padding="16dp">
2426

2527
<ImageView
2628
android:id="@+id/file_item_image_view"
2729
android:layout_width="48dp"
2830
android:layout_height="48dp"
2931
android:layout_marginLeft="4dp"
30-
android:background="@drawable/fplib_circle"/>
32+
android:background="@drawable/fplib_circle"
33+
app:layout_constraintStart_toStartOf="parent"
34+
app:layout_constraintTop_toTopOf="parent" />
3135

3236
<TextView
3337
android:id="@+id/file_item_file_name"
3438
style="@style/FileName.Title"
3539
android:layout_marginLeft="8dip"
3640
android:layout_marginTop="8dip"
37-
android:layout_toRightOf="@+id/file_item_image_view"/>
41+
app:layout_constraintLeft_toRightOf="@+id/file_item_image_view"
42+
app:layout_constraintTop_toTopOf="parent" />
3843

3944
<TextView
4045
android:id="@+id/file_item_file_info"
4146
style="@style/FileName.Secondary"
42-
android:layout_below="@id/file_item_file_name"
4347
android:layout_marginLeft="8dip"
4448
android:layout_marginTop="2dip"
45-
android:layout_toRightOf="@id/file_item_image_view"/>
49+
app:layout_constraintLeft_toRightOf="@id/file_item_image_view"
50+
app:layout_constraintTop_toBottomOf="@id/file_item_file_name" />
4651

4752
<ImageView
4853
android:id="@+id/file_item_file_info_button"
4954
android:layout_width="24dp"
5055
android:layout_height="24dp"
51-
android:layout_alignParentRight="true"
52-
android:layout_centerVertical="true"/>
56+
app:layout_constraintBottom_toBottomOf="parent"
57+
app:layout_constraintRight_toRightOf="parent"
58+
app:layout_constraintTop_toTopOf="parent" />
5359

54-
</RelativeLayout>
60+
</android.support.constraint.ConstraintLayout>

‎library/src/main/res/layout/material_file_picker_activity_layout.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
android:id="@+id/file_picker_floating_action_button"
2929
android:layout_width="wrap_content"
3030
android:layout_height="wrap_content"
31-
android:layout_gravity="bottom|right"
31+
android:layout_gravity="bottom|end"
3232
android:layout_margin="16dp"
3333
android:src="@drawable/ic_plus"
3434
app:fabSize="normal"

‎library/src/main/res/values/dimens.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<!--
1+
<?xml version="1.0" encoding="utf-8"?><!--
32
~ Copyright 2014 Paul Tsouchlos
43
~
54
~ Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,4 +17,5 @@
1817
<resources>
1918
<dimen name="file_picker_lib_default_icon_size">24dp</dimen>
2019
<dimen name="file_picker_lib_default_icon_padding">6dp</dimen>
20+
<dimen name="fab_margin">16dp</dimen>
2121
</resources>

‎library/src/main/res/values/strings.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,6 @@
1717
<string name="file_picker_adapter_file_size_only_string">%d bytes</string>
1818
<string name="file_picker_file_info_dialog_file_path">File: %s</string>
1919
<string name="file_picker_recycler_adapter_view_holder_type_error">No type that matches that type.</string>
20-
<item name="POSITION_KEY" type="id"/>
20+
<item name="POSITION_KEY" type="id" />
21+
<string name="title_activity_main">Test</string>
2122
</resources>

‎library/src/main/res/values/styles.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,4 +19,8 @@
1919
<item name="android:textColor">@android:color/darker_gray</item>
2020
<item name="android:textStyle">italic</item>
2121
</style>
22+
23+
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
24+
25+
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
2226
</resources>

0 commit comments

Comments
 (0)