Applied code convention guidelines :wrench: :truck:

15 files changed, 14 insertions, 14 deletions

diff --git a/app/src/main/java/me/texx/Texx/IntroActivity.kt b/app/src/main/java/me/texx/Texx/IntroActivity.kt
index 816317a..67b2800 100644
--- a/app/src/main/java/me/texx/Texx/IntroActivity.kt
+++ b/app/src/main/java/me/texx/Texx/IntroActivity.kt
@@ -32,10 +32,10 @@ class IntroActivity : AppIntro2() {
     }
 
     private fun createSlides() {
-        addSlide(AppIntro2Fragment.newInstance("Texx", "For the people", R.drawable.logo_placeholder, Color.parseColor("#304ffe")))
+        addSlide(AppIntro2Fragment.newInstance("Texx", "For the people", R.drawable.ic_logo_placeholder, Color.parseColor("#304ffe")))
         addSlide(AppIntro2Fragment.newInstance("Camera", "If you want to take and upload pictures, please allow us to do so.",
-                R.drawable.logo_placeholder, Color.parseColor("#1976d2")))
-        addSlide(AppIntro2Fragment.newInstance("Log in", "Please register or login now.", R.drawable.logo_placeholder, Color.parseColor("#29b6f6")))
+                R.drawable.ic_logo_placeholder, Color.parseColor("#1976d2")))
+        addSlide(AppIntro2Fragment.newInstance("Log in", "Please register or login now.", R.drawable.ic_logo_placeholder, Color.parseColor("#29b6f6")))
     }
 
     override fun onDonePressed(currentFragment: Fragment) {
diff --git a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
index a971f5c..1dd39c9 100644
--- a/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
+++ b/app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt
@@ -100,7 +100,7 @@ class PhotoEditorActivity : AppCompatActivity() {
         if (currentlyDrawing) seekbar_color.visibility = View.VISIBLE
         else {
             seekbar_color.visibility = View.GONE
-            button_draw.background = ContextCompat.getDrawable(this, R.drawable.ic_mode_edit_white_24dp)
+            button_draw.background = ContextCompat.getDrawable(this, R.drawable.btn_edit)
         }
     }
 
@@ -115,7 +115,7 @@ class PhotoEditorActivity : AppCompatActivity() {
             val inputManager = this@PhotoEditorActivity.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager
             inputManager.showSoftInput(text_edit, 0)
         } else {
-            button_type.background = ContextCompat.getDrawable(this, R.drawable.ic_text_fields_white_24dp)
+            button_type.background = ContextCompat.getDrawable(this, R.drawable.btn_text)
             seekbar_color.visibility = View.GONE
             text_edit.visibility = View.GONE
         }
diff --git a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml b/app/src/main/res/drawable/btn_edit.xml
index c67fadd..c67fadd 100644
--- a/app/src/main/res/drawable/ic_mode_edit_white_24dp.xml
+++ b/app/src/main/res/drawable/btn_edit.xml
diff --git a/app/src/main/res/drawable/ic_redo_white_24dp.xml b/app/src/main/res/drawable/btn_redo.xml
index d07c380..d07c380 100644
--- a/app/src/main/res/drawable/ic_redo_white_24dp.xml
+++ b/app/src/main/res/drawable/btn_redo.xml
diff --git a/app/src/main/res/drawable/ic_text_fields_white_24dp.xml b/app/src/main/res/drawable/btn_text.xml
index 3baa101..3baa101 100644
--- a/app/src/main/res/drawable/ic_text_fields_white_24dp.xml
+++ b/app/src/main/res/drawable/btn_text.xml
diff --git a/app/src/main/res/drawable/ic_undo_white_24dp.xml b/app/src/main/res/drawable/btn_undo.xml
index 8c9b8dd..8c9b8dd 100644
--- a/app/src/main/res/drawable/ic_undo_white_24dp.xml
+++ b/app/src/main/res/drawable/btn_undo.xml
diff --git a/app/src/main/res/drawable/ic_account_circle_black_24dp.xml b/app/src/main/res/drawable/ic_account_circle.xml
index 6e8924c..6e8924c 100644
--- a/app/src/main/res/drawable/ic_account_circle_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_account_circle.xml
diff --git a/app/src/main/res/drawable/ic_camera_black_24dp.xml b/app/src/main/res/drawable/ic_fab_camera.xml
index 0a734f3..0a734f3 100644
--- a/app/src/main/res/drawable/ic_camera_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_fab_camera.xml
diff --git a/app/src/main/res/drawable/ic_send_black_24dp.xml b/app/src/main/res/drawable/ic_fab_send.xml
index 00c668c..00c668c 100644
--- a/app/src/main/res/drawable/ic_send_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_fab_send.xml
diff --git a/app/src/main/res/drawable/logo_placeholder.xml b/app/src/main/res/drawable/ic_logo_placeholder.xml
index 20d5f0c..20d5f0c 100644
--- a/app/src/main/res/drawable/logo_placeholder.xml
+++ b/app/src/main/res/drawable/ic_logo_placeholder.xml
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings.xml
index 6d0c6e6..6d0c6e6 100644
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ b/app/src/main/res/drawable/ic_settings.xml
diff --git a/app/src/main/res/layout/activity_bug_report.xml b/app/src/main/res/layout/activity_bug_report.xml
index ac50d2f..eb39629 100644
--- a/app/src/main/res/layout/activity_bug_report.xml
+++ b/app/src/main/res/layout/activity_bug_report.xml
@@ -68,7 +68,7 @@
             android:layout_marginEnd="16dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
-            app:srcCompat="@drawable/ic_send_black_24dp" />
+            app:srcCompat="@drawable/ic_fab_send" />
 
         <TextView
             android:id="@+id/title"
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 7050466..3946bee 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -28,6 +28,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@drawable/ic_camera_black_24dp" />
+        app:srcCompat="@drawable/ic_fab_camera" />
 
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_photo_editor.xml b/app/src/main/res/layout/activity_photo_editor.xml
index be22d3a..4c848da 100644
--- a/app/src/main/res/layout/activity_photo_editor.xml
+++ b/app/src/main/res/layout/activity_photo_editor.xml
@@ -29,7 +29,7 @@
         app:fabSize="normal"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:srcCompat="@drawable/ic_send_black_24dp" />
+        app:srcCompat="@drawable/ic_fab_send" />
 
     <Button
         android:id="@+id/button_undo"
@@ -39,7 +39,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="24dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/ic_undo_white_24dp"
+        android:background="@drawable/btn_undo"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -51,7 +51,7 @@
         android:layout_alignParentTop="true"
         android:layout_marginStart="8dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/ic_redo_white_24dp"
+        android:background="@drawable/btn_redo"
         app:layout_constraintStart_toEndOf="@+id/button_undo"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -61,7 +61,7 @@
         android:layout_height="30dp"
         android:layout_marginEnd="24dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/ic_mode_edit_white_24dp"
+        android:background="@drawable/btn_edit"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
@@ -71,7 +71,7 @@
         android:layout_height="30dp"
         android:layout_marginEnd="16dp"
         android:layout_marginTop="24dp"
-        android:background="@drawable/ic_text_fields_white_24dp"
+        android:background="@drawable/btn_text"
         app:layout_constraintEnd_toStartOf="@+id/button_draw"
         app:layout_constraintTop_toTopOf="parent" />
 
diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml
index 3579241..d328dd5 100644
--- a/app/src/main/res/xml/pref_headers.xml
+++ b/app/src/main/res/xml/pref_headers.xml
@@ -4,12 +4,12 @@
 
     <header
         android:fragment="me.texx.Texx.SettingsActivity$GeneralPreferenceFragment"
-        android:icon="@drawable/ic_settings_black_24dp"
+        android:icon="@drawable/ic_settings"
         android:title="@string/pref_header_general" />
 
     <header
         android:fragment="me.texx.Texx.SettingsActivity$AccountPreferenceFragment"
-        android:icon="@drawable/ic_account_circle_black_24dp"
+        android:icon="@drawable/ic_account_circle"
         android:title="@string/pref_header_account" />
 
 </preference-headers>