aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/src/main/java
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/java')
-rw-r--r--app/src/main/java/me/texx/Texx/IntroActivity.kt6
-rw-r--r--app/src/main/java/me/texx/Texx/PhotoEditorActivity.kt4
2 files changed, 5 insertions, 5 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
}