Apply UI theme (4) - Images and image buttons

tink-expo · Dec 1, 2019 · 2df24c3 · 2df24c3
1 parent b4d0348
commit 2df24c3
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 11 deletions.
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
@@ -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
@@ -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
diff --git a/android/app/src/main/res/drawable/icon_clear_24px.png b/android/app/src/main/res/drawable/icon_clear_24px.png
diff --git a/android/app/src/main/res/drawable/icon_main_start.png b/android/app/src/main/res/drawable/icon_main_start.png
diff --git a/android/app/src/main/res/drawable/icon_wifi_big.png b/android/app/src/main/res/drawable/icon_wifi_big.png
diff --git 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" />
         </RadioGroup>
 
-        <Button
+        <ImageButton
             android:id="@+id/cameraButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:layout_marginEnd="16dp"
             android:layout_marginStart="16dp"
-            android:text="Button"
+            android:background="@android:color/transparent"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:srcCompat="@drawable/icon_camera_btn" />
 
         <TextView
             android:id="@+id/textView3"

diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml
@@ -7,17 +7,18 @@
     android:layout_height="match_parent"
     tools:context="com.example.hsh0908y.auto_wifi.MainActivity">
 
-    <Button
+    <ImageButton
         android:id="@+id/mainButton"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="96dp"
         android:layout_marginEnd="16dp"
         android:layout_marginStart="16dp"
-        android:text="Button"
+        android:background="@android:color/transparent"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent" />
+        app:layout_constraintStart_toStartOf="parent"
+        app:srcCompat="@drawable/icon_main_start" />
 
     <TextView
         android:id="@+id/textView"
@@ -45,4 +46,14 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <ImageView
+        android:id="@+id/imageView2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        android:translationX="115dp"
+        app:srcCompat="@drawable/icon_wifi_big" />
+
 </android.support.constraint.ConstraintLayout>