Skip to content

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

Merge remote-tracking branch 'origin/master' 

# Conflicts:
#	.gradle/5.4.1/executionHistory/executionHistory.bin
#	.gradle/5.4.1/executionHistory/executionHistory.lock
#	.gradle/5.4.1/fileHashes/fileHashes.bin
#	.gradle/5.4.1/fileHashes/fileHashes.lock
#	.gradle/5.4.1/javaCompile/classAnalysis.bin
#	.gradle/5.4.1/javaCompile/javaCompile.lock
#	.gradle/buildOutputCleanup/buildOutputCleanup.lock
#	.gradle/buildOutputCleanup/outputFiles.bin
#	.idea/caches/build_file_checksums.ser
#	.idea/workspace.xml
#	app/app.iml
parents 3594c48d b3b02262
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 237 additions and 19 deletions
.idea/gradle.xml
View file @ 88051476
......@@ -3,6 +3,9 @@
<component name="GradleSettings">
<option name="linkedExternalProjectsSettings">
<GradleProjectSettings>
<compositeConfiguration>
<compositeBuild compositeDefinitionSource="SCRIPT" />
</compositeConfiguration>
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules">
......
.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_activation_jar_unspecified_jar.xml 0 → 100644
View file @ 88051476
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/activation.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/activation.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_additionnal_jar_unspecified_jar.xml 0 → 100644
View file @ 88051476
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/additionnal.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/additionnal.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle____local_aars____home_abc_AndroidStudioProjects_InstiLostAndFound_app_libs_mail_jar_unspecified_jar.xml 0 → 100644
View file @ 88051476
<component name="libraryTable">
<library name="Gradle: __local_aars__:/home/abc/AndroidStudioProjects/InstiLostAndFound/app/libs/mail.jar:unspecified@jar">
<CLASSES>
<root url="jar://$PROJECT_DIR$/app/libs/mail.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</component>
\ No newline at end of file
.idea/libraries/Gradle__com_google_android_gms_play_services_basement_17_0_0_aar.xml
View file @ 88051476
<component name="libraryTable">
<library name="Gradle: com.google.android.gms:play-services-basement:17.0.0@aar">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/17b5cdcb3e31a36e8bde86f3754af349/jetified-play-services-basement-17.0.0/res" />
<root url="jar://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b44a467ef215ace407b0f6cf221c780/jetified-play-services-basement-17.0.0/jars/classes.jar!/" />
<root url="file://$USER_HOME$/.gradle/caches/transforms-2/files-2.1/5b44a467ef215ace407b0f6cf221c780/jetified-play-services-basement-17.0.0/res" />
</CLASSES>
<JAVADOC>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/com.google.android.gms/play-services-basement/17.0.0/4faccf8c10bad282388a4067b8ef53d8476bbbc8/play-services-basement-17.0.0-javadoc.jar!/" />
......
app/build.gradle
View file @ 88051476
......@@ -44,7 +44,7 @@ dependencies {
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
// implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha09'
implementation files('libs/activation.jar')
implementation files('libs/additionnal.jar')
implementation files('libs/mail.jar')
......
app/src/main/AndroidManifest.xml
View file @ 88051476
......@@ -18,8 +18,10 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".ItemClaim"></activity>
<activity android:name=".NewsFeedLost"></activity>
<activity android:name=".MyPostsLostRV" />
<activity android:name=".NewsFeedFound" />
<activity android:name=".ItemClaim"></activity>
<activity android:name=".MyPostsFoundRV" />
<activity android:name=".RedirectMyPosts" />
<activity android:name=".ItemDetails" />
......
app/src/main/java/com/example/instilostandfound/Navigation.java
View file @ 88051476
......@@ -71,6 +71,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
case R.id.post_lost:
intent = new Intent(Navigation.this, LostItem.class);
intent.putExtra("username", username);
intent.putExtra("CallingClass","Navigation");
startActivity(intent);
break;
case R.id.home:
......@@ -97,7 +98,7 @@ public class Navigation extends AppCompatActivity implements NavigationView.OnNa
public void onClick(View v) {
switch (v.getId()){
case R.id.lost_button_newsfeed:
Intent intent = new Intent(Navigation.this, MyPosts.class);
Intent intent = new Intent(Navigation.this, NewsFeedLost.class);
intent.putExtra("type", "lost");
intent.putExtra("username", username);
startActivity(intent);
......
app/src/main/java/com/example/instilostandfound/RedirectMyPosts.java
View file @ 88051476
......@@ -23,7 +23,7 @@ public class RedirectMyPosts extends AppCompatActivity implements View.OnClickLi
public void onClick(View v) {
switch (v.getId()){
case R.id.lost_button:
Intent intent = new Intent(RedirectMyPosts.this, MyPosts.class);
Intent intent = new Intent(RedirectMyPosts.this, MyPostsLostRV.class);
intent.putExtra("type", "lost");
intent.putExtra("username", username);
startActivity(intent);
......
app/src/main/res/layout/activity_my_posts_found_rv.xml
View file @ 88051476
......@@ -9,7 +9,9 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/my_posts_rv"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true">
</androidx.recyclerview.widget.RecyclerView>
......
local.properties
View file @ 88051476
......@@ -4,5 +4,5 @@
# Location of the SDK. This is only used by Gradle.
# For customization when using a Version Control System, please read the
# header note.
#Fri Nov 22 12:15:22 IST 2019
sdk.dir=/home/chikki/Android/Sdk
#Tue Nov 26 09:55:15 IST 2019
sdk.dir=/home/abc/Android/Sdk
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