Skip to content

Revert "pull request" #2

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

Open
jennadeng wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Revert "pull request" #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .idea/.name
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 0 additions & 6 deletions .idea/encodings.xml
View file
Open in desktop

This file was deleted.

3 changes: 1 addition & 2 deletions .idea/gradle.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 4 additions & 1 deletion .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 19 additions & 19 deletions mobile/mobile.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,31 +113,31 @@
</content>
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="play-services-maps-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-wallet-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-drive-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appstate-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-games-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-fitness-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-maps-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-panorama-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appindexing-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-cast-7.3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-ads-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-identity-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
<orderEntry type="library" exported="" name="design-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-safetynet-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-7.3.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appindexing-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-panorama-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-location-7.3.0" level="project" />
<orderEntry type="library" exported="" name="phone-gest-lib-0.8.2" level="project" />
<orderEntry type="library" exported="" name="play-services-analytics-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appinvite-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-safetynet-7.3.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-nearby-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appinvite-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-gcm-7.3.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
<orderEntry type="library" exported="" name="play-services-nearby-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-fitness-7.3.0" level="project" />
<orderEntry type="library" exported="" name="design-23.0.1" level="project" />
<orderEntry type="library" exported="" name="phone-gest-lib-0.8.2" level="project" />
<orderEntry type="library" exported="" name="play-services-plus-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-wearable-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-appstate-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-games-7.3.0" level="project" />
<orderEntry type="library" exported="" name="play-services-identity-7.3.0" level="project" />
</component>
</module>
10 changes: 0 additions & 10 deletions mobile/src/main/java/hackny/awkscape/AlarmActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
import android.view.View;
import android.view.Window;
import android.view.WindowManager;

import android.os.Handler;
Expand All @@ -27,15 +26,6 @@ public class AlarmActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {

super.onCreate(savedInstanceState);

requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);

setContentView(R.layout.activity_alarm);

super.onCreate(savedInstanceState);
setContentView(R.layout.activity_alarm);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
Expand Down
6 changes: 2 additions & 4 deletions mobile/src/main/res/layout/activity_alarm.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@
android:layout_height="match_parent" android:fitsSystemWindows="true"
tools:context="hackny.awkscape.AlarmActivity">


<android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay"
android:background="@mipmap/calling">
android:layout_width="match_parent" android:theme="@style/AppTheme.AppBarOverlay">

<android.support.v7.widget.Toolbar android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_height="?attr/actionBarSize"
android:background="@android:color/transparent" app:popupTheme="@style/AppTheme.PopupOverlay" />
android:background="?attr/colorPrimary" app:popupTheme="@style/AppTheme.PopupOverlay" />

</android.support.design.widget.AppBarLayout>

Expand Down
Binary file removed mobile/src/main/res/mipmap-hdpi/calling.png
View file
Open in desktop
Binary file not shown.
Binary file removed mobile/src/main/res/mipmap-hdpi/received.png
View file
Open in desktop
Binary file not shown.
6 changes: 0 additions & 6 deletions wear/src/main/java/hackny/awkscape/MainWatchActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
package hackny.awkscape;

import android.content.Context;
import android.os.Bundle;
import android.os.Vibrator;
import android.support.wearable.view.BoxInsetLayout;
import android.view.View;
import android.widget.TextView;
Expand Down Expand Up @@ -64,15 +62,11 @@ public void onSnap() {

@Override
public void onFlick() {
Vibrator vibration2 = (Vibrator)this.getSystemService(Context.VIBRATOR_SERVICE);
vibration2.vibrate(2000);
Toast.makeText(this,"It's a flick!",Toast.LENGTH_LONG).show();
}

@Override
public void onTwist() {
Vibrator vibration1 = (Vibrator)this.getSystemService(Context.VIBRATOR_SERVICE);
vibration1.vibrate(200);
Toast.makeText(this,"Just twist it",Toast.LENGTH_LONG).show();
}

Expand Down
6 changes: 3 additions & 3 deletions wear/wear.iml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,12 +94,12 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="gesturelibrary-0.8.8" level="project" />
<orderEntry type="library" exported="" name="play-services-wearable-7.8.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.0" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.0" level="project" />
<orderEntry type="library" exported="" name="wearable-1.3.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-22.0.0" level="project" />
<orderEntry type="library" exported="" name="gesturelibrary-0.8.8" level="project" />
<orderEntry type="library" exported="" name="play-services-base-7.8.0" level="project" />
</component>
</module>