Skip to content

Commit

Permalink
Rename video -> camera
Browse files Browse the repository at this point in the history
  • Loading branch information
duanhong169 committed Jun 7, 2018
1 parent fd8c1eb commit ad06722
Show file tree
Hide file tree
Showing 10 changed files with 57 additions and 14 deletions.
2 changes: 1 addition & 1 deletion .idea/modules.xml

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

@@ -0,0 +1,26 @@
package top.defaults.cameraapp;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("top.defaults.videoapp", appContext.getPackageName());
}
}
6 changes: 3 additions & 3 deletions app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="top.defaults.videoapp">
package="top.defaults.cameraapp">

<uses-permission android:name="android.permission.CAMERA" />
<uses-permission android:name="android.permission.RECORD_AUDIO" />
Expand All @@ -17,7 +17,7 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity">
<activity android:name="top.defaults.cameraapp.MainActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>

Expand All @@ -26,7 +26,7 @@
</activity>

<activity
android:name=".PhotographerActivity"
android:name="top.defaults.cameraapp.PhotographerActivity"
android:theme="@style/Theme.AppCompat.NoActionBar"/>

<provider
Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp;
package top.defaults.cameraapp;

import android.Manifest;
import android.annotation.SuppressLint;
Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp;
package top.defaults.cameraapp;

import android.content.Intent;
import android.graphics.Color;
Expand All @@ -24,9 +24,9 @@
import top.defaults.camera.Keys;
import top.defaults.camera.Photographer;
import top.defaults.camera.PhotographerFactory;
import top.defaults.videoapp.dialog.PickerDialog;
import top.defaults.videoapp.dialog.SimplePickerDialog;
import top.defaults.videoapp.options.VideoSize;
import top.defaults.cameraapp.dialog.PickerDialog;
import top.defaults.cameraapp.dialog.SimplePickerDialog;
import top.defaults.cameraapp.options.VideoSize;
import top.defaults.view.TextButton;

public class PhotographerActivity extends AppCompatActivity {
Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp;
package top.defaults.cameraapp;

import android.app.Application;

Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp.dialog;
package top.defaults.cameraapp.dialog;

import android.app.DialogFragment;

Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp.dialog;
package top.defaults.cameraapp.dialog;

import android.os.Bundle;
import android.support.annotation.Nullable;
Expand All @@ -8,7 +8,7 @@

import java.util.List;

import top.defaults.videoapp.R;
import top.defaults.cameraapp.R;
import top.defaults.view.PickerView;

public class SimplePickerDialog<T extends PickerView.PickerItem> extends PickerDialog<T> {
Expand Down
@@ -1,4 +1,4 @@
package top.defaults.videoapp.options;
package top.defaults.cameraapp.options;

import android.util.Size;

Expand Down
17 changes: 17 additions & 0 deletions app/src/test/java/top/defaults/cameraapp/ExampleUnitTest.java
@@ -0,0 +1,17 @@
package top.defaults.cameraapp;

import org.junit.Test;

import static org.junit.Assert.*;

/**
* Example local unit test, which will execute on the development machine (host).
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
public class ExampleUnitTest {
@Test
public void addition_isCorrect() {
assertEquals(4, 2 + 2);
}
}

0 comments on commit ad06722

Please sign in to comment.