Skip to content

I
InstiLostAndFound
Commit 3594c48d authored by ankitasingh's avatar ankitasingh
Browse files
Options

filter activity complete changes

parent d1c3c607
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 95 deletions
.idea/workspace.xml
View file @ 3594c48d
......@@ -6,11 +6,10 @@
</shared>
</component>
<component name="AndroidLogFilters">
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="No Filters" />
<option name="TOOL_WINDOW_CONFIGURED_FILTER" value="Show only selected application" />
</component>
<component name="ChangeListManager">
<list default="true" id="d3ee5bd8-a194-4e5e-99e3-99dd32fc4efe" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/app/src/main/res/menu/menu.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/executionHistory/executionHistory.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/fileHashes/fileHashes.bin" afterDir="false" />
......@@ -18,11 +17,7 @@
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/classAnalysis.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/5.4.1/javaCompile/javaCompile.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/buildOutputCleanup.lock" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" beforeDir="false" afterPath="$PROJECT_DIR$/.gradle/buildOutputCleanup/outputFiles.bin" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/caches/build_file_checksums.ser" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/app.iml" beforeDir="false" afterPath="$PROJECT_DIR$/app/app.iml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" beforeDir="false" afterPath="$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
......@@ -88,12 +83,12 @@
<file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-162">
<caret line="65" column="37" lean-forward="true" selection-start-line="65" selection-start-column="37" selection-end-line="65" selection-end-column="37" />
<state relative-caret-position="12">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#7231#8698#0" expanded="true" />
<element signature="e#8697#8698#0" expanded="true" />
<element signature="e#7265#8738#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
</folding>
</state>
</provider>
......@@ -102,8 +97,8 @@
<file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-444">
<caret line="30" column="26" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<state relative-caret-position="382">
<caret line="85" selection-start-line="85" selection-end-line="85" />
<folding>
<element signature="imports" expanded="true" />
</folding>
......@@ -124,7 +119,7 @@
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103">
<caret line="50" column="35" lean-forward="true" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
<caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
</state>
</provider>
</entry>
......@@ -265,9 +260,9 @@
</list>
</option>
</component>
<component name="ProjectFrameBounds">
<option name="x" value="76" />
<option name="y" value="29" />
<component name="ProjectFrameBounds" extendedState="6">
<option name="x" value="65" />
<option name="y" value="64" />
<option name="width" value="1281" />
<option name="height" value="704" />
</component>
......@@ -621,15 +616,21 @@
<option name="project" value="LOCAL" />
<updated>1574500932506</updated>
</task>
<option name="localTasksCounter" value="19" />
<task id="LOCAL-00019" summary="filter activity partial changes">
<created>1574745835977</created>
<option name="number" value="00019" />
<option name="presentableId" value="LOCAL-00019" />
<option name="project" value="LOCAL" />
<updated>1574745835977</updated>
</task>
<option name="localTasksCounter" value="20" />
<servers />
</component>
<component name="ToolWindowManager">
<frame x="76" y="29" width="1281" height="704" extended-state="0" />
<editor active="true" />
<frame x="65" y="-4" width="1301" height="772" extended-state="6" />
<layout>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="1" visible="true" weight="0.2574899" />
<window_info content_ui="combo" id="Project" order="1" visible="true" weight="0.25338647" />
<window_info id="Structure" order="2" side_tool="true" />
<window_info id="Favorites" order="3" side_tool="true" />
<window_info id="Build Variants" order="4" side_tool="true" />
......@@ -640,13 +641,13 @@
<window_info anchor="bottom" id="Run" order="0" weight="0.32928944" />
<window_info anchor="bottom" id="Logcat" order="1" weight="0.06908463" />
<window_info anchor="bottom" id="TODO" order="2" />
<window_info anchor="bottom" id="Debug" order="3" visible="true" weight="0.33448875" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.33448875" />
<window_info anchor="bottom" id="Terminal" order="4" />
<window_info anchor="bottom" id="Event Log" order="5" sideWeight="0.50121456" side_tool="true" weight="0.25996533" />
<window_info anchor="bottom" id="Version Control" order="6" weight="0.40069085" />
<window_info anchor="bottom" id="Build" order="7" sideWeight="0.49878544" weight="0.37088388" />
<window_info anchor="bottom" id="Find" order="8" weight="0.4852713" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.19584055" />
<window_info active="true" anchor="bottom" id="Messages" order="9" visible="true" weight="0.13953489" />
<window_info anchor="bottom" id="Android Profiler" order="10" />
<window_info anchor="right" id="Hierarchy" order="0" weight="0.32955465" />
<window_info anchor="right" id="Capture Analysis" order="1" />
......@@ -655,7 +656,7 @@
<window_info anchor="right" id="Preview" order="4" sideWeight="0.44044322" weight="0.21862349" />
<window_info anchor="right" id="Palette&#9;" order="5" />
<window_info anchor="right" id="Assistant" order="6" sideWeight="0.49861497" weight="0.046153847" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.089878544" />
<window_info anchor="right" id="Device File Explorer" order="7" sideWeight="0.50138503" visible="true" weight="0.088446215" />
</layout>
<layout-to-restore>
<window_info id="Captures" order="0" side_tool="true" weight="0.25" />
......@@ -749,19 +750,8 @@
<MESSAGE value="email activities working" />
<MESSAGE value="email activities bug fixes minor" />
<MESSAGE value="email activities changes" />
<option name="LAST_COMMIT_MESSAGE" value="email activities changes" />
</component>
<component name="XDebuggerManager">
<breakpoint-manager>
<breakpoints>
<line-breakpoint enabled="true" type="java-line">
<url>file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java</url>
<line>93</line>
<properties />
<option name="timeStamp" value="7" />
</line-breakpoint>
</breakpoints>
</breakpoint-manager>
<MESSAGE value="filter activity partial changes" />
<option name="LAST_COMMIT_MESSAGE" value="filter activity partial changes" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/app/src/main/res/layout/activity_abrakadabra.xml" />
......@@ -1040,55 +1030,55 @@
</provider>
<provider editor-type-id="android-designer2" />
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="60">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPostsFoundRV.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="103">
<caret line="50" column="35" lean-forward="true" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
<caret line="50" column="35" selection-start-line="50" selection-start-column="35" selection-end-line="50" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-444">
<caret line="30" column="26" selection-start-line="30" selection-start-column="26" selection-end-line="30" selection-end-column="26" />
<state relative-caret-position="260">
<caret line="79" column="121" selection-start-line="79" selection-start-column="47" selection-end-line="79" selection-end-column="121" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/FoundItem.java">
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="260">
<caret line="79" column="121" selection-start-line="79" selection-start-column="47" selection-end-line="79" selection-end-column="121" />
<state relative-caret-position="-363">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/SendMail.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="382">
<caret line="85" selection-start-line="85" selection-end-line="85" />
<folding>
<element signature="imports" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/build.gradle">
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/MyPosts.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-363">
<caret line="8" column="27" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="27" />
<state relative-caret-position="60">
<caret line="22" column="46" selection-start-line="22" selection-start-column="29" selection-end-line="22" selection-end-column="46" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/src/main/java/com/example/instilostandfound/NewsFeedFound.java">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-162">
<caret line="65" column="37" lean-forward="true" selection-start-line="65" selection-start-column="37" selection-end-line="65" selection-end-column="37" />
<state relative-caret-position="12">
<caret line="143" selection-start-line="143" selection-end-line="143" />
<folding>
<element signature="imports" expanded="true" />
<element signature="e#7231#8698#0" expanded="true" />
<element signature="e#8697#8698#0" expanded="true" />
<element signature="e#7265#8738#0" expanded="true" />
<element signature="e#8737#8738#0" expanded="true" />
</folding>
</state>
</provider>
......
app/src/main/java/com/example/instilostandfound/NewsFeedFound.java
View file @ 3594c48d
......@@ -62,39 +62,11 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
//set title
mSharedPref = getSharedPreferences("SortSettings", MODE_PRIVATE);
String mSorting = mSharedPref.getString("Sort", "Others");//where if no settingsis selected newest will be default
if (mSorting.equals("newest")) {
mDatabaseRef.orderByChild("mCategory").equalTo("category").addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
mPosts.add(post);
}
mAdaptor = new NewsfeedAdaptor(NewsFeedFound.this, mPosts);
mrecyclerView.setAdapter(mAdaptor);
mAdaptor.setOnItemClickListener(NewsFeedFound.this);
}
@Override
public void onCancelled(@NonNull DatabaseError databaseError) {
Toast.makeText(NewsFeedFound.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show();
}
});
mLayoutManager = new LinearLayoutManager(this);
//this will load the items from bottom means newest first
mLayoutManager.setReverseLayout(true);
mLayoutManager.setStackFromEnd(true);
} else if (mSorting.equals("oldest")) {
mDatabaseRef.orderByChild("mCategory").equalTo("nocategory").addValueEventListener(new ValueEventListener() {
//if (mSorting.equals("newest")) {
mDatabaseRef.orderByChild("mCategory").equalTo(mSorting).addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot postSnapShot : dataSnapshot.getChildren()){
for (DataSnapshot postSnapShot : dataSnapshot.getChildren()) {
CreateFoundObject post = postSnapShot.getValue(CreateFoundObject.class);
post.setKey(postSnapShot.getKey());
......@@ -114,12 +86,12 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
Toast.makeText(NewsFeedFound.this, databaseError.getMessage(), Toast.LENGTH_SHORT).show();
}
});
};
mLayoutManager = new LinearLayoutManager(this);
//this will load the items from bottom means oldest first
mLayoutManager.setReverseLayout(false);
mLayoutManager.setStackFromEnd(false);
}
mLayoutManager = new LinearLayoutManager(this);
//this will load the items from bottom means newest first
mLayoutManager.setReverseLayout(true);
mLayoutManager.setStackFromEnd(true);
}
@Override
public void onItemClick(int position) {
......@@ -178,7 +150,7 @@ public class NewsFeedFound extends AppCompatActivity implements NewsfeedAdaptor.
//create alert dialog
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Sort by") //set title
.setIcon(R.drawable.common_google_signin_btn_icon_dark_normal) //set icon
.setIcon(R.drawable.filter) //set icon
.setItems(sortOptions, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment