소스 검색

Theme TakePhotoActivity

Signed-off-by: Álvaro Brey <alvaro.brey@nextcloud.com>
Álvaro Brey 2 년 전
부모
커밋
94479d0943
2개의 변경된 파일14개의 추가작업 그리고 0개의 파일을 삭제
  1. 13 0
      app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java
  2. 1 0
      app/src/main/res/layout/activity_take_picture.xml

+ 13 - 0
app/src/main/java/com/nextcloud/talk/activities/TakePhotoActivity.java

@@ -41,8 +41,10 @@ import android.widget.Toast;
 
 import com.google.common.util.concurrent.ListenableFuture;
 import com.nextcloud.talk.R;
+import com.nextcloud.talk.application.NextcloudTalkApplication;
 import com.nextcloud.talk.databinding.ActivityTakePictureBinding;
 import com.nextcloud.talk.models.TakePictureViewModel;
+import com.nextcloud.talk.ui.theme.ViewThemeUtils;
 import com.nextcloud.talk.utils.BitmapShrinker;
 import com.nextcloud.talk.utils.FileUtils;
 
@@ -52,6 +54,8 @@ import java.util.Date;
 import java.util.Locale;
 import java.util.concurrent.ExecutionException;
 
+import javax.inject.Inject;
+
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.annotation.OptIn;
@@ -66,9 +70,11 @@ import androidx.camera.lifecycle.ProcessCameraProvider;
 import androidx.core.content.ContextCompat;
 import androidx.exifinterface.media.ExifInterface;
 import androidx.lifecycle.ViewModelProvider;
+import autodagger.AutoInjector;
 
 import static com.nextcloud.talk.utils.Mimetype.IMAGE_JPEG;
 
+@AutoInjector(NextcloudTalkApplication.class)
 public class TakePhotoActivity extends AppCompatActivity {
 
     private static final String TAG = TakePhotoActivity.class.getSimpleName();
@@ -86,15 +92,22 @@ public class TakePhotoActivity extends AppCompatActivity {
 
     private Camera camera;
 
+    @Inject
+    ViewThemeUtils viewThemeUtils;
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        NextcloudTalkApplication.Companion.getSharedApplication().getComponentApplication().inject(this);
 
         binding = ActivityTakePictureBinding.inflate(getLayoutInflater());
         viewModel = new ViewModelProvider(this).get(TakePictureViewModel.class);
 
         setContentView(binding.getRoot());
 
+        viewThemeUtils.themeFAB(binding.takePhoto);
+        viewThemeUtils.colorMaterialButtonBackground(binding.send);
+
         cameraProviderFuture = ProcessCameraProvider.getInstance(this);
         cameraProviderFuture.addListener(() -> {
             try {

+ 1 - 0
app/src/main/res/layout/activity_take_picture.xml

@@ -222,6 +222,7 @@
         android:theme="@style/Button.Primary"
         android:tint="@android:color/white"
         android:visibility="gone"
+        tools:visibility="visible"
         app:backgroundTint="@color/colorPrimary"
         app:cornerRadius="48dp"
         app:elevation="0dp"