Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added Code for required Icon #289

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Added Code for required Icon #289

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f30c4ce
added code to provide icon
sashrikakaur Apr 9, 2019
ce8367b
Update ProtobufAstronomicalSource.java
sashrikakaur Apr 29, 2019
9d0de74
removed unnecessary updates
sashrikakaur Apr 29, 2019
87b1484
Update ProtobufAstronomicalSource.java
sashrikakaur Apr 29, 2019
d1d74e4
Update ProtobufAstronomicalSource.java
sashrikakaur Apr 29, 2019
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
8 changes: 4 additions & 4 deletions app/src/main/java/com/google/android/stardroid/source/proto/ProtobufAstronomicalSource.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public synchronized ArrayList<String> getNames() {
if (names == null) {
names = new ArrayList<String>(proto.getNameIdsCount());
for (int id : proto.getNameIdsList()) {
names.add(resources.getString(id));
// names.add(resources.getString(id));
Copy link
Member

Choose a reason for hiding this comment

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

Lots of changes in here that don't seem relevant.

}
}
return names;
Expand Down Expand Up @@ -107,9 +107,9 @@ public List<TextSource> getLabels() {
}
ArrayList<TextSource> points = new ArrayList<TextSource>(proto.getLabelCount());
for (LabelElementProto element : proto.getLabelList()) {
points.add(new TextSourceImpl(getCoords(element.getLocation()),
resources.getString(element.getStringIndex()),
element.getColor(), element.getOffset(), element.getFontSize()));
// points.add(new TextSourceImpl(getCoords(element.getLocation()),
// resources.getString(element.getStringIndex()),
// element.getColor(), element.getOffset(), element.getFontSize()));
}
return points;

Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/ic_description_white_24dp.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
</vector>
3 changes: 2 additions & 1 deletion app/src/main/res/menu/main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,5 +66,6 @@
<item android:id="@+id/menu_item_tos"
android:orderInCategory="10"
android:showAsAction="never"
android:title="@string/menu_tos"/>
android:title="@string/menu_tos"
android:icon="@drawable/ic_description_white_24dp"/>
</menu>
2 changes: 1 addition & 1 deletion tools/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ dependencies {
implementation project(path: ':app',configuration:'default')
implementation 'com.google.guava:guava:21.0'
// TODO(jontayler): Terrible hack that should go when we revamp the tools.
implementation files('../app/build/intermediates/classes/gms/release/')
implementation files('../app/build/intermediates/classes/')
Copy link
Member

Choose a reason for hiding this comment

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

Why this change?

Copy link
Author

Choose a reason for hiding this comment

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

The project did not build because it was not able to find some files. This fixed that issue.

implementation fileTree(include: ['*.jar'], dir: 'libs')
}

Expand Down