Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified Learn from Map/App/HoloGraphLibrary/bin/holographlibrary.jar
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion Learn from Map/App/HoloGraphLibrary/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,5 +11,5 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-18
target=android-21
android.library=true
10 changes: 5 additions & 5 deletions Learn from Map/App/LearnFromMap/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

# Project target.
target=android-19
android.library.reference.1=..\\google-play-services_lib
android.library.reference.2=..\\appcompat_v7
android.library.reference.3=..\\volley_buildmlearn
android.library.reference.4=..\\HoloGraphLibrary
target=android-21
android.library.reference.1=../HoloGraphLibrary
android.library.reference.2=../volley_buildmlearn
android.library.reference.3=../../../../../Android/android-sdk/extras/android/support/v7/appcompat
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@yogeshmadaan100 Can you please resolve these libraries. appcompat is pointing to some location on your system that is not included into the repo. Appcompat is already present in the repo. You may want to use (or update) that version of appcompat. Rest I think everything is fine. Just fix this and after that I will merge it :)

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have fixed that. Kindly review it .
Thanx

On Wed, Mar 25, 2015 at 3:57 PM, Abhishek Batra [email protected]
wrote:

In Learn from Map/App/LearnFromMap/project.properties
#4 (comment)
:

@@ -11,8 +11,8 @@
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt

Project target.

-target=android-19
-android.library.reference.1=..\google-play-services_lib
-android.library.reference.2=..\appcompat_v7
-android.library.reference.3=..\volley_buildmlearn
-android.library.reference.4=..\HoloGraphLibrary
+target=android-21
+android.library.reference.1=../HoloGraphLibrary
+android.library.reference.2=../volley_buildmlearn
+android.library.reference.3=../../../../../Android/android-sdk/extras/android/support/v7/appcompat

@yogeshmadaan100 https://github.com/yogeshmadaan100 Can you please
resolve these libraries. appcompat is pointing to some location on your
system that is not included into the repo. Appcompat is already present in
the repo. You may want to use (or update) that version of appcompat. Rest I
think everything is fine. Just fix this and after that I will merge it :)


Reply to this email directly or view it on GitHub
https://github.com/BuildmLearn/Mobile-applications/pull/4/files#r27108692
.

You didn't hire me , I will fire you!!

Yogesh Madaan
Tel: +91-7838685554 | W: www.yogeshmadaan.in http://www.yogeshmadaan.in

android.library.reference.4=../../../../../Android/android-sdk/extras/google/google_play_services/libproject/google-play-services_lib
6 changes: 6 additions & 0 deletions Learn from Map/App/LearnFromMap/res/menu/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,12 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context="org.buildmlearn.learnfrommap.MainActivity" >

<item
android:id="@+id/action_share"
android:orderInCategory="100"
android:title="@string/action_share"
android:icon="@android:drawable/ic_menu_share"
app:showAsAction="always"/>
<item
android:id="@+id/action_settings"
android:orderInCategory="100"
Expand Down
1 change: 1 addition & 0 deletions Learn from Map/App/LearnFromMap/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<string name="app_name">Learn From Map</string>
<string name="hello_world">Hello world!</string>
<string name="action_settings">About</string>
<string name="action_share">Share App</string>

<color android:id="@+id/color1" name="black_alpha">#70000000</color>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,7 @@ public void loadMode(View v)
intent = new Intent(getApplicationContext(), SettingsActivity.class);
startActivity(intent);
break;


default:
break;
Expand Down Expand Up @@ -138,6 +139,13 @@ public boolean onOptionsItemSelected(MenuItem item) {
if (id == R.id.action_settings) {
CustomDialog.AboutDialog(MainActivity.this);
return true;
}else if (id == R.id.action_share) {
Intent sendIntent = new Intent();
sendIntent.setAction(Intent.ACTION_SEND);
sendIntent.putExtra(Intent.EXTRA_TEXT, "Hi I am using Learn From Maps - An initiative by BuildmLearn .");
sendIntent.setType("text/plain");
startActivity(sendIntent);
return true;
}
return super.onOptionsItemSelected(item);
}
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified Learn from Map/App/volley_buildmlearn/bin/volley_buildmlearn.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion Learn from Map/App/volley_buildmlearn/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# project structure.

# Project target.
target=android-19
target=android-21

# Make sure to pass a valid value to renderscript
# https://code.google.com/p/android/issues/detail?id=40487
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@
# project structure.

# Project target.
target=android-19
target=android-21