Skip to content

A
AloqaIM-Android
Commit db741a34 authored by aniket's avatar aniket
Browse files
Options

fixes minor issues

parent fdc71a42
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 35 deletions
app/src/main/java/chat/rocket/android/createChannel/ui/CreateNewChannelActivity.kt
View file @ db741a34
......@@ -73,18 +73,20 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
override fun showChannelCreatedSuccessfullyMessage() {
showToast(getString(R.string.msg_channel_created_successfully))
finish()
//TODO check why the activity is not finishing
}
override fun showMessage(resId: Int) {
channel_name_edit_text.setText("")
showToast(getString(resId))
}
override fun showMessage(message: String) {
channel_name_edit_text.setText("")
showToast(message)
}
override fun showGenericErrorMessage() {
channel_name_edit_text.setText("")
showMessage(getString(R.string.msg_generic_error))
}
......@@ -123,20 +125,20 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
channel_type.text = getString(R.string.public_channel_type)
channel_description.text = getString(R.string.public_channel_description)
placeholder.setImageDrawable(getDrawable(R.drawable.ic_hashtag_black))
placeholder.setImageDrawable(getDrawable(R.drawable.ic_hashtag_black_12dp))
(getDrawable(R.drawable.button_border) as GradientDrawable).setColor(
resources.getColor(
R.color.colorLightTheme
R.color.default_background
)
)
(getDrawable(R.drawable.button_solid) as GradientDrawable).setColor(resources.getColor(R.color.red))
(getDrawable(R.drawable.button_solid) as GradientDrawable).setColor(resources.getColor(R.color.colorRed))
private_channel.background = getDrawable(R.drawable.button_border)
public_channel.background = getDrawable(R.drawable.button_solid)
private_channel.setTextColor(resources.getColor(R.color.red))
public_channel.setTextColor(resources.getColor(R.color.colorLightTheme))
private_channel.setTextColor(resources.getColor(R.color.colorRed))
public_channel.setTextColor(resources.getColor(R.color.default_background))
}
private_channel.setOnClickListener {
......@@ -145,24 +147,24 @@ class CreateNewChannelActivity : AppCompatActivity(), CreateNewChannelView {
channel_type.text = getString(R.string.private_channel_type)
channel_description.text = getString(R.string.private_channel_type_description)
placeholder.setImageDrawable(getDrawable(R.drawable.ic_room_lock))
placeholder.setImageDrawable(getDrawable(R.drawable.ic_lock_black_12_dp))
(getDrawable(R.drawable.button_border) as GradientDrawable).setColor(
resources.getColor(
R.color.red
R.color.colorRed
)
)
(getDrawable(R.drawable.button_solid) as GradientDrawable).setColor(resources.getColor(R.color.colorLightTheme))
(getDrawable(R.drawable.button_solid) as GradientDrawable).setColor(resources.getColor(R.color.default_background))
(getDrawable(R.drawable.button_solid) as GradientDrawable).setStroke(
1,
resources.getColor(R.color.red)
resources.getColor(R.color.colorRed)
)
private_channel.background = getDrawable(R.drawable.button_border)
public_channel.background = getDrawable(R.drawable.button_solid)
private_channel.setTextColor(resources.getColor(R.color.colorLightTheme))
public_channel.setTextColor(resources.getColor(R.color.red))
private_channel.setTextColor(resources.getColor(R.color.default_background))
public_channel.setTextColor(resources.getColor(R.color.colorRed))
}
toolbar_action_text.setOnClickListener {
......
app/src/main/res/drawable/button_border.xml
View file @ db741a34
......@@ -2,11 +2,11 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:endColor="@color/colorLightTheme"
android:startColor="@color/colorLightTheme" />
android:endColor="@color/default_background"
android:startColor="@color/default_background" />
<stroke
android:width="1dp"
android:color="@color/red" />
android:color="@color/colorRed" />
<corners
android:bottomRightRadius="5dp"
android:topRightRadius="5dp" />
......
app/src/main/res/drawable/button_solid.xml
View file @ db741a34
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/red" />
<solid android:color="@color/colorRed" />
<corners
android:bottomLeftRadius="5dp"
android:topLeftRadius="5dp" />
......
app/src/main/res/drawable/ic_add_white_24dp.xml
View file @ db741a34
......@@ -4,6 +4,6 @@
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="@color/white"
android:fillColor="@color/colorWhite"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
</vector>
app/src/main/res/drawable/ic_hashtag_black.xml deleted 100644 → 0
View file @ fdc71a42
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="13dp"
android:height="16dp"
android:viewportWidth="13.0"
android:viewportHeight="16.0">
<path
android:pathData="M6.626,11.495L4.505,11.495L3.714,16L1.703,16L2.495,11.495L0,11.495L0,9.604L2.824,9.604L3.374,6.484L0.824,6.484L0.824,4.571L3.714,4.571L4.516,0L6.516,0L5.714,4.571L7.846,4.571L8.648,0L10.659,0L9.857,4.571L12.264,4.571L12.264,6.484L9.516,6.484L8.967,9.604L11.429,9.604L11.429,11.495L8.637,11.495L7.846,16L5.835,16L6.626,11.495ZM4.835,9.604L6.956,9.604L7.505,6.484L5.374,6.484L4.835,9.604Z"
android:strokeColor="#00000000"
android:fillType="evenOdd"
android:fillColor="@color/colorSecondaryText"
android:strokeWidth="1"/>
</vector>
app/src/main/res/layout/activity_create_new_channel.xml
View file @ db741a34
......@@ -18,7 +18,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone"
app:indicatorColor="@color/black"
app:indicatorColor="@color/colorBlack"
app:indicatorName="BallPulseIndicator"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
......@@ -57,7 +57,7 @@
android:layout_height="0dp"
android:background="@drawable/button_solid"
android:text="@string/public_channel_type"
android:textColor="@color/white"
android:textColor="@color/default_background"
app:layout_constraintBottom_toBottomOf="@id/button_bottom_guideline"
app:layout_constraintEnd_toStartOf="@+id/private_channel"
app:layout_constraintHorizontal_chainStyle="packed"
......@@ -70,7 +70,7 @@
android:layout_height="0dp"
android:background="@drawable/button_border"
android:text="@string/private_channel_type"
android:textColor="@color/red"
android:textColor="@color/colorRed"
app:layout_constraintBottom_toBottomOf="@id/button_bottom_guideline"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/public_channel"
......@@ -114,7 +114,7 @@
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:src="@drawable/ic_hashtag_black"
android:src="@drawable/ic_hashtag_black_12dp"
app:layout_constraintBottom_toBottomOf="@id/channel_name_text_input_layout"
app:layout_constraintEnd_toStartOf="@id/channel_name_text_input_layout"
app:layout_constraintStart_toStartOf="parent"
......
app/src/main/res/layout/fragment_chat_rooms.xml
View file @ db741a34
......@@ -65,6 +65,6 @@
app:useCompatPadding="true"
android:layout_alignParentBottom="true"
android:src="@drawable/ic_add_white_24dp"
app:backgroundTint="@color/black"
app:backgroundTint="@color/colorBlack"
/>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/layout/layout_toolbar.xml
View file @ db741a34
......@@ -27,7 +27,6 @@
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:alpha="0.7"
android:background="?selectableItemBackground"
android:enabled="false"
android:gravity="end"
android:textSize="16sp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023