Skip to content

Commit 520c4eb

Browse files
menessmeness
committed
There's no need to fragment and options menu at this time.
1 parent 8e67b54 commit 520c4eb

File tree

4 files changed

+129
-189
lines changed

4 files changed

+129
-189
lines changed

‎app/src/main/java/com/github/developerpaul123/filepickerlibrary/app/MainActivity.java‎

Lines changed: 73 additions & 117 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,12 @@
1616

1717
package com.github.developerpaul123.filepickerlibrary.app;
1818

19-
import android.app.Fragment;
2019
import android.content.Intent;
2120
import android.os.Bundle;
2221
import android.support.v7.app.AppCompatActivity;
23-
import android.view.LayoutInflater;
2422
import android.view.Menu;
2523
import android.view.MenuItem;
2624
import android.view.View;
27-
import android.view.ViewGroup;
2825
import android.widget.Toast;
2926

3027
import com.devpaul.filepicker.R;
@@ -46,125 +43,84 @@ public class MainActivity extends AppCompatActivity {
4643
protected void onCreate(Bundle savedInstanceState) {
4744
super.onCreate(savedInstanceState);
4845
setContentView(R.layout.activity_main);
49-
if (savedInstanceState == null) {
50-
getFragmentManager().beginTransaction()
51-
.add(R.id.container, new MainActivity.PlaceholderFragment())
52-
.commit();
53-
}
54-
}
5546

47+
MaterialFlatButton filePickerActivity = (MaterialFlatButton) findViewById(R.id.file_picker_activity);
5648

57-
@Override
58-
public boolean onCreateOptionsMenu(Menu menu) {
59-
// Inflate the menu; this adds items to the action bar if it is present.
60-
getMenuInflater().inflate(R.menu.main, menu);
61-
return true;
49+
filePickerActivity.setOnClickListener(new View.OnClickListener() {
50+
@Override
51+
public void onClick(View view) {
52+
Intent filePickerActivity = new Intent(MainActivity.this, FilePickerActivity.class);
53+
filePickerActivity.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
54+
filePickerActivity.putExtra(FilePickerActivity.REQUEST, Request.DIRECTORY);
55+
filePickerActivity.putExtra(FilePickerActivity.INTENT_EXTRA_FAB_COLOR_ID, android.R.color.holo_green_dark);
56+
startActivityForResult(filePickerActivity, REQUEST_DIRECTORY);
57+
}
58+
});
59+
60+
MaterialFlatButton filePickerForFile = (MaterialFlatButton) findViewById(R.id.file_picker_return_file_path);
61+
62+
filePickerForFile.setOnClickListener(new View.OnClickListener() {
63+
@Override
64+
public void onClick(View view) {
65+
Intent filePicker = new Intent(MainActivity.this, FilePickerActivity.class);
66+
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
67+
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
68+
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_orange_dark);
69+
startActivityForResult(filePicker, REQUEST_FILE);
70+
}
71+
});
72+
73+
MaterialFlatButton filePickerDialog = (MaterialFlatButton) findViewById(R.id.file_picker_dialog);
74+
filePickerDialog.setOnClickListener(new View.OnClickListener() {
75+
@Override
76+
public void onClick(View view) {
77+
Intent filePickerDialogIntent = new Intent(MainActivity.this, FilePickerActivity.class);
78+
filePickerDialogIntent.putExtra(FilePickerActivity.THEME_TYPE, ThemeType.DIALOG);
79+
filePickerDialogIntent.putExtra(FilePickerActivity.REQUEST, Request.FILE);
80+
startActivityForResult(filePickerDialogIntent, REQUEST_FILE);
81+
}
82+
});
83+
84+
MaterialFlatButton filePickerMimePng = (MaterialFlatButton) findViewById(R.id.file_picker_mime_png);
85+
filePickerMimePng.setOnClickListener(new View.OnClickListener() {
86+
@Override
87+
public void onClick(View view) {
88+
Intent filePicker = new Intent(MainActivity.this, FilePickerActivity.class);
89+
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
90+
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
91+
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_green_dark);
92+
filePicker.putExtra(FilePickerActivity.MIME_TYPE, MimeType.PNG);
93+
startActivityForResult(filePicker, REQUEST_FILE);
94+
}
95+
});
96+
97+
MaterialFlatButton newFilePicker = (MaterialFlatButton) findViewById(R.id.new_file_picker_activity);
98+
newFilePicker.setOnClickListener(new View.OnClickListener() {
99+
@Override
100+
public void onClick(View view) {
101+
102+
new FilePickerBuilder(MainActivity.this).withColor(android.R.color.holo_blue_bright)
103+
.withRequest(Request.FILE)
104+
.withScope(Scope.ALL)
105+
.withMimeType(MimeType.JPEG)
106+
.useMaterialActivity(true)
107+
.launch(REQUEST_FILE);
108+
}
109+
});
62110
}
63111

64112
@Override
65-
public boolean onOptionsItemSelected(MenuItem item) {
66-
// Handle action bar item clicks here. The action bar will
67-
// automatically handle clicks on the Home/Up button, so long
68-
// as you specify a parent activity in AndroidManifest.xml.
69-
int id = item.getItemId();
70-
if (id == R.id.action_settings) {
71-
return true;
72-
}
73-
return super.onOptionsItemSelected(item);
74-
}
75-
76-
/**
77-
* A placeholder fragment containing a simple view.
78-
*/
79-
public static class PlaceholderFragment extends Fragment {
80-
81-
public PlaceholderFragment() {
82-
}
83-
84-
@Override
85-
public void onActivityResult(int requestCode, int resultCode, Intent data) {
86-
super.onActivityResult(requestCode, resultCode, data);
87-
88-
if ((requestCode == REQUEST_DIRECTORY) && (resultCode == RESULT_OK)) {
89-
Toast.makeText(getActivity(), "Directory Selected: " + data
90-
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
91-
Toast.LENGTH_LONG).show();
92-
} else if ((requestCode == REQUEST_FILE) && (resultCode == RESULT_OK)) {
93-
Toast.makeText(getActivity(), "File Selected: " + data
94-
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
95-
Toast.LENGTH_LONG).show();
96-
}
97-
}
98-
99-
@Override
100-
public View onCreateView(LayoutInflater inflater, ViewGroup container,
101-
Bundle savedInstanceState) {
102-
View rootView = inflater.inflate(R.layout.fragment_main, container, false);
103-
104-
MaterialFlatButton filePickerActivity = (MaterialFlatButton) rootView.findViewById(R.id.file_picker_activity);
105-
106-
filePickerActivity.setOnClickListener(new View.OnClickListener() {
107-
@Override
108-
public void onClick(View view) {
109-
Intent filePickerActivity = new Intent(getActivity(), FilePickerActivity.class);
110-
filePickerActivity.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
111-
filePickerActivity.putExtra(FilePickerActivity.REQUEST, Request.DIRECTORY);
112-
filePickerActivity.putExtra(FilePickerActivity.INTENT_EXTRA_FAB_COLOR_ID, android.R.color.holo_green_dark);
113-
startActivityForResult(filePickerActivity, REQUEST_DIRECTORY);
114-
}
115-
});
116-
117-
MaterialFlatButton filePickerForFile = (MaterialFlatButton) rootView.findViewById(R.id.file_picker_return_file_path);
118-
119-
filePickerForFile.setOnClickListener(new View.OnClickListener() {
120-
@Override
121-
public void onClick(View view) {
122-
Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
123-
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
124-
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
125-
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_orange_dark);
126-
startActivityForResult(filePicker, REQUEST_FILE);
127-
}
128-
});
129-
130-
MaterialFlatButton filePickerDialog = (MaterialFlatButton) rootView.findViewById(R.id.file_picker_dialog);
131-
filePickerDialog.setOnClickListener(new View.OnClickListener() {
132-
@Override
133-
public void onClick(View view) {
134-
Intent filePickerDialogIntent = new Intent(getActivity(), FilePickerActivity.class);
135-
filePickerDialogIntent.putExtra(FilePickerActivity.THEME_TYPE, ThemeType.DIALOG);
136-
filePickerDialogIntent.putExtra(FilePickerActivity.REQUEST, Request.FILE);
137-
startActivityForResult(filePickerDialogIntent, REQUEST_FILE);
138-
}
139-
});
140-
141-
MaterialFlatButton filePickerMimePng = (MaterialFlatButton) rootView.findViewById(R.id.file_picker_mime_png);
142-
filePickerMimePng.setOnClickListener(new View.OnClickListener() {
143-
@Override
144-
public void onClick(View view) {
145-
Intent filePicker = new Intent(getActivity(), FilePickerActivity.class);
146-
filePicker.putExtra(FilePickerActivity.SCOPE, Scope.ALL);
147-
filePicker.putExtra(FilePickerActivity.REQUEST, Request.FILE);
148-
filePicker.putExtra(FilePickerActivity.INTENT_EXTRA_COLOR_ID, android.R.color.holo_green_dark);
149-
filePicker.putExtra(FilePickerActivity.MIME_TYPE, MimeType.PNG);
150-
startActivityForResult(filePicker, REQUEST_FILE);
151-
}
152-
});
153-
154-
MaterialFlatButton newFilePicker = (MaterialFlatButton) rootView.findViewById(R.id.new_file_picker_activity);
155-
newFilePicker.setOnClickListener(new View.OnClickListener() {
156-
@Override
157-
public void onClick(View view) {
158-
159-
new FilePickerBuilder(getActivity()).withColor(android.R.color.holo_blue_bright)
160-
.withRequest(Request.FILE)
161-
.withScope(Scope.ALL)
162-
.withMimeType(MimeType.JPEG)
163-
.useMaterialActivity(true)
164-
.launch(REQUEST_FILE);
165-
}
166-
});
167-
return rootView;
113+
public void onActivityResult(int requestCode, int resultCode, Intent data) {
114+
super.onActivityResult(requestCode, resultCode, data);
115+
116+
if ((requestCode == REQUEST_DIRECTORY) && (resultCode == RESULT_OK)) {
117+
Toast.makeText(this, "Directory Selected: " + data
118+
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
119+
Toast.LENGTH_LONG).show();
120+
} else if ((requestCode == REQUEST_FILE) && (resultCode == RESULT_OK)) {
121+
Toast.makeText(this, "File Selected: " + data
122+
.getStringExtra(FilePickerActivity.FILE_EXTRA_DATA_PATH),
123+
Toast.LENGTH_LONG).show();
168124
}
169125
}
170126
}

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

Lines changed: 56 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,56 @@
1-
<FrameLayout android:id="@+id/container"
2-
xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:tools="http://schemas.android.com/tools"
4-
android:layout_width="match_parent"
5-
android:layout_height="match_parent"
6-
tools:context="com.github.developerpaul123.filepickerlibrary.app.MainActivity"
7-
tools:ignore="MergeRootFrame"/>
1+
<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">
12+
13+
<com.devpaul.materiallibrary.views.MaterialFlatButton
14+
android:id="@+id/file_picker_activity"
15+
android:layout_width="wrap_content"
16+
android:layout_height="wrap_content"
17+
app:mat_flat_button_color="#303F9F"
18+
app:mat_flat_button_text="@string/file_picker_activity"/>
19+
20+
<com.devpaul.materiallibrary.views.MaterialFlatButton
21+
android:id="@+id/file_picker_return_file_path"
22+
android:layout_width="wrap_content"
23+
android:layout_height="wrap_content"
24+
android:layout_below="@id/file_picker_activity"
25+
android:layout_marginTop="10dip"
26+
app:mat_flat_button_color="#303F9F"
27+
app:mat_flat_button_text="@string/return_file_path"/>
28+
29+
<com.devpaul.materiallibrary.views.MaterialFlatButton
30+
android:id="@+id/file_picker_dialog"
31+
android:layout_width="wrap_content"
32+
android:layout_height="wrap_content"
33+
android:layout_below="@+id/file_picker_return_file_path"
34+
android:layout_marginTop="10dip"
35+
app:mat_flat_button_color="#303F9F"
36+
app:mat_flat_button_text="@string/file_picker_dialog"/>
37+
38+
<com.devpaul.materiallibrary.views.MaterialFlatButton
39+
android:id="@+id/file_picker_mime_png"
40+
android:layout_width="wrap_content"
41+
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"/>
46+
47+
<com.devpaul.materiallibrary.views.MaterialFlatButton
48+
android:id="@+id/new_file_picker_activity"
49+
android:layout_width="wrap_content"
50+
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"/>
55+
56+
</RelativeLayout>

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

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎app/src/main/res/menu/main.xml‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)