gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-06-19 19:49:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

change logo dim so that it fits for other images

Browse Source 
Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2020-10-13 08:35:13 +02:00
parent 0b7e4c09f4
commit fe4bf8afca
No known key found for this signature in database
GPG Key ID: 0E00D4D47D0C5AF7
9 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/nextcloud/talk/adapters/items/UserItem.java
View File

@ -243,7 +243,7 @@ public class UserItem extends AbstractFlexibleItem<UserItem.UserItemViewHolder>
if (!holder.contactMentionId.getText().equals(userType)) {
holder.contactMentionId.setText(userType);
holder.contactMentionId.setTextColor(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getColor(R.color.colorPrimary));
holder.contactMentionId.setTextColor(NextcloudTalkApplication.Companion.getSharedApplication().getResources().getColor(R.color.textColorMaxContrast));
}
}
}

1
app/src/main/java/com/nextcloud/talk/controllers/SettingsController.java
View File

@ -175,6 +175,7 @@ public class SettingsController extends BaseController {
private Disposable profileQueryDisposable;
private Disposable dbQueryDisposable;
@NonNull
@Override
protected View inflateView(@NonNull LayoutInflater inflater, @NonNull ViewGroup container) {
return inflater.inflate(R.layout.controller_settings, container, false);

4
app/src/main/res/drawable/ic_logo.xml
View File

@ -18,9 +18,9 @@
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vector android:autoMirrored="true" android:height="24dp"
<vector android:autoMirrored="true" android:height="128dp"
android:viewportHeight="128" android:viewportWidth="128"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#ffffff"
android:pathData="M63.992,0.689C29.031,0.689 0.691,29.031 0.692,63.992c0,34.96 28.34,63.301 63.3,63.302 6.982,-0.014 13.881,-1.183 20.426,-3.43 4.317,-1.482 8.48,-3.433 12.411,-5.831 3.383,1.344 8.59,3.838 13.736,5.902 6.688,2.683 13.274,4.639 15.618,2.399 2.317,-2.212 0.703,-8.809 -1.647,-15.575 -2.046,-5.892 -4.649,-11.913 -5.701,-15.282 2.544,-4.415 4.535,-9.101 5.945,-13.954 1.648,-5.674 2.5,-11.574 2.512,-17.532C127.291,29.032 98.952,0.692 63.992,0.691ZM63.999,24.756l0.001,0c21.677,0 39.25,17.573 39.25,39.251 -0.001,21.677 -17.574,39.249 -39.251,39.249 -21.676,0 -39.249,-17.572 -39.25,-39.249 0,-21.678 17.573,-39.251 39.25,-39.251z" android:strokeWidth="4.78543139"/>
</vector>

4
app/src/main/res/layout/controller_conversation_info.xml
View File

@ -35,7 +35,7 @@
android:layout_marginEnd="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
android:indeterminate="true"
android:indeterminateTint="@color/colorPrimary"
android:indeterminateTint="@color/textColorMaxContrast"
android:indeterminateTintMode="src_in" />
<ScrollView
@ -102,7 +102,7 @@
android:visibility="gone"
apc:mpc_title="@string/nc_participants"
apc:mpc_action="@string/nc_add"
apc:mpc_title_color="@color/colorPrimary"
apc:mpc_title_color="@color/textColorMaxContrast"
tools:ignore="UnknownIdInLayout">
<androidx.recyclerview.widget.RecyclerView

3
app/src/main/res/layout/controller_server_selection.xml
View File

@ -28,11 +28,10 @@
<ImageView
android:id="@+id/image_logo"
android:layout_width="96dp"
android:layout_height="96dp"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="92dp"
android:layout_marginBottom="36dp"
android:scaleType="fitXY"
app:srcCompat="@drawable/ic_logo" />
<!-- Server selection window should be ignorant of theme colour

10
app/src/main/res/layout/controller_settings.xml
View File

@ -118,7 +118,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_appearance"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_theme"
@ -138,7 +138,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_notification_sounds"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_call_sound"
@ -170,7 +170,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_privacy"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_screen_lock_timeout"
@ -224,7 +224,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_settings_proxy_title"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialChoicePreference
android:id="@+id/settings_proxy_choice"
@ -285,7 +285,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_about"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialStandardPreference
android:id="@+id/settings_privacy"

2
app/src/main/res/layout/notification_settings_item.xml
View File

@ -30,7 +30,7 @@
android:layout_height="wrap_content"
android:animateLayoutChanges="true"
apc:mpc_title="@string/nc_notification_settings"
apc:mpc_title_color="@color/colorPrimary">
apc:mpc_title_color="@color/textColorMaxContrast">
<com.yarolegovich.mp.MaterialSwitchPreference
android:id="@+id/conversation_info_priority_conversation"

2
app/src/main/res/layout/rv_item_conversation_info_participant.xml
View File

@ -81,7 +81,7 @@
android:layout_height="wrap_content"
android:ellipsize="middle"
android:singleLine="true"
android:textColor="?android:attr/textColorSecondary"
android:textColor="@color/textColorMaxContrast"
tools:text="A week ago" />
</LinearLayout>

2
app/src/main/res/values/colors.xml
View File

@ -20,7 +20,7 @@
-->
<resources>
<color name="colorPrimary">#0082C9</color>
<color name="colorPrimary">#043F21</color>
<color name="textColorOnPrimaryBackground">#ffffff</color> <!-- white/black depending on primary color -->
<!-- Text color of sent messages -->