Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Minor visual improvements #1

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.

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

Closed
locovna wants to merge 1 commit into amitshekhariitbhu:master from locovna:master
Closed
Show file tree
Hide file tree
Changes from all commits
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
Apply new style and add new icons
  • Loading branch information
locovna committed Mar 26, 2017
commit 3d00f0c0c9ca48b445a50355faec90c7cde207b2
2 changes: 1 addition & 1 deletion app/src/main/AndroidManifest.xml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:label="Tensor Flow Example"
android:supportsRtl="true"
android:largeHeap="true"
android:theme="@style/AppTheme">
Expand Down
Binary file added app/src/main/ic_launcher-web.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/ic_takephoto-web.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public interface Classifier {
/**
* An immutable result returned by a Classifier describing what was recognized.
*/
public class Recognition {
class Recognition {
/**
* A unique identifier for what has been recognized. Specific to the class, not the instance of
* the object.
Expand Down
Binary file added app/src/main/res/drawable-hdpi/ic_takephoto.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-hdpi/ic_togglecamera.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-mdpi/ic_takephoto.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-mdpi/ic_togglecamera.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-xhdpi/ic_takephoto.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-xhdpi/ic_togglecamera.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file added app/src/main/res/drawable-xxhdpi/ic_takephoto.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
6 changes: 6 additions & 0 deletions app/src/main/res/drawable/takephoto_button.xml
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<solid android:color="@color/colorPrimaryDark"/>
</shape>
105 changes: 57 additions & 48 deletions app/src/main/res/layout/activity_main.xml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,69 +14,78 @@
~ limitations under the License.
-->

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_main"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:background="@color/colorPrimary"
tools:context="com.mindorks.tensorflowexample.MainActivity">

<com.flurgle.camerakit.CameraView
android:id="@+id/cameraView"
android:layout_width="300dp"
android:layout_height="300dp"
android:layout_gravity="center|top" />


<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:layout_gravity="center|top"
android:layout_marginTop="300dp"
android:gravity="center"
android:orientation="horizontal">
android:layout_height="match_parent"
android:orientation="vertical">

<com.flurgle.camerakit.CameraView
android:id="@+id/cameraView"
android:layout_width="match_parent"
android:layout_height="400dp"
android:layout_gravity="center|top"/>

<ImageView
android:id="@+id/imageViewResult"
android:layout_width="75dp"
android:layout_height="75dp"
android:padding="2dp" />

<TextView
android:id="@+id/textViewResult"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
android:fadeScrollbars="false"
android:maxLines="15"
android:scrollbars="vertical"
android:layout_height="wrap_content"
android:layout_gravity="center|top"
android:gravity="center"
android:textColor="@android:color/black" />
android:orientation="horizontal"
android:padding="@dimen/activity_horizontal_margin">

</LinearLayout>
<ImageView
android:id="@+id/imageViewResult"
android:layout_width="75dp"
android:layout_height="75dp"
android:padding="2dp"/>

<TextView
android:id="@+id/textViewResult"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:fadeScrollbars="false"
android:gravity="center"
android:maxLines="15"
android:scrollbars="vertical"
android:textColor="@color/colorPrimaryLight"/>
</LinearLayout>

<Button
android:id="@+id/btnToggleCamera"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="bottom|center"
android:layout_marginBottom="50dp"
android:text="@string/toggle_camera"
android:textAllCaps="false"
android:textColor="@android:color/black" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center">

<Button
android:id="@+id/btnDetectObject"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_gravity="bottom|center"
android:text="@string/detect_object"
android:textAllCaps="false"
android:textColor="@android:color/black"
android:visibility="gone" />
<Button
android:id="@+id/btnDetectObject"
android:layout_width="65dp"
android:layout_height="65dp"
android:layout_centerHorizontal="true"
android:background="@drawable/takephoto_button"
android:drawableTop="@drawable/ic_takephoto"
android:paddingTop="15dp"/>

<Button
android:id="@+id/btnToggleCamera"
android:layout_width="65dp"
android:layout_height="65dp"
android:background="@drawable/ic_togglecamera"
android:paddingTop="10dp"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_marginBottom="5dp"/>

</RelativeLayout>

</LinearLayout>
</FrameLayout>
Binary file modified app/src/main/res/mipmap-hdpi/ic_launcher.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file modified app/src/main/res/mipmap-mdpi/ic_launcher.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file modified app/src/main/res/mipmap-xhdpi/ic_launcher.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file modified app/src/main/res/mipmap-xxhdpi/ic_launcher.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
Binary file modified app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
View file Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
[フレーム]
8 changes: 5 additions & 3 deletions app/src/main/res/values/colors.xml
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
-->

<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="colorPrimary">#2d2d2d</color>
<color name="colorPrimaryDark">#212121</color>
<color name="colorPrimaryLight">#bcbab5</color>
<color name="colorSecondaryLight">#93918d</color>
<color name="colorAccent">#ff845f</color>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.0'
classpath 'com.android.tools.build:gradle:2.3.0'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
20 changes: 2 additions & 18 deletions gradle/wrapper/gradle-wrapper.properties
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,6 @@
#
# Copyright (C) 2017 MINDORKS NEXTGEN PRIVATE LIMITED
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#Mon Dec 28 10:00:20 PST 2015
#Fri Mar 17 20:14:44 EET 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

AltStyle によって変換されたページ (->オリジナル) /