diff --git a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/CameraActivity.java b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/CameraActivity.java index 952fe6f..f717c6b 100644 --- a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/CameraActivity.java +++ b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/CameraActivity.java @@ -6,7 +6,7 @@ import android.view.SurfaceView; import android.view.View; import android.view.WindowManager; -import android.widget.Button; +import android.widget.ImageButton; public class CameraActivity extends AppCompatActivity { private SurfaceView surfaceView; @@ -24,7 +24,7 @@ protected void onCreate(Bundle savedInstanceState) { surfaceView = findViewById(R.id.cameraSurfaceView); cameraPreview = new CameraPreview(this, this, Camera.CameraInfo.CAMERA_FACING_BACK, surfaceView); - Button button = findViewById(R.id.cameraButton); + ImageButton button = findViewById(R.id.cameraButton); button.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/MainActivity.java b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/MainActivity.java index f5df43e..db549b1 100644 --- a/android/app/src/main/java/com/example/hsh0908y/auto_wifi/MainActivity.java +++ b/android/app/src/main/java/com/example/hsh0908y/auto_wifi/MainActivity.java @@ -5,7 +5,7 @@ import android.support.v7.app.AppCompatActivity; import android.util.Log; import android.view.View; -import android.widget.Button; +import android.widget.ImageButton; public class MainActivity extends AppCompatActivity { @@ -14,8 +14,8 @@ protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - Button button = (Button) findViewById(R.id.mainButton); - button.setOnClickListener(new Button.OnClickListener() { + ImageButton button = (ImageButton) findViewById(R.id.mainButton); + button.setOnClickListener(new ImageButton.OnClickListener() { @Override public void onClick(View view) { Intent intent = new Intent(MainActivity.this, CameraActivity.class); diff --git a/android/app/src/main/res/drawable/icon_camera_btn.png b/android/app/src/main/res/drawable/icon_camera_btn.png new file mode 100644 index 0000000..8cb448f Binary files /dev/null and b/android/app/src/main/res/drawable/icon_camera_btn.png differ diff --git a/android/app/src/main/res/drawable/icon_clear_24px.png b/android/app/src/main/res/drawable/icon_clear_24px.png new file mode 100644 index 0000000..d8abfd8 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_clear_24px.png differ diff --git a/android/app/src/main/res/drawable/icon_main_start.png b/android/app/src/main/res/drawable/icon_main_start.png new file mode 100644 index 0000000..1ad396e Binary files /dev/null and b/android/app/src/main/res/drawable/icon_main_start.png differ diff --git a/android/app/src/main/res/drawable/icon_wifi_big.png b/android/app/src/main/res/drawable/icon_wifi_big.png new file mode 100644 index 0000000..0f5c462 Binary files /dev/null and b/android/app/src/main/res/drawable/icon_wifi_big.png differ diff --git a/android/app/src/main/res/layout/activity_camera.xml b/android/app/src/main/res/layout/activity_camera.xml index f16674b..4deed10 100644 --- a/android/app/src/main/res/layout/activity_camera.xml +++ b/android/app/src/main/res/layout/activity_camera.xml @@ -51,17 +51,18 @@ android:text="Only PW" /> -