TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-03 11:03:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Further Lokify UI

Browse Source
This commit is contained in:
Niels Andriesse
2019-07-22 13:08:56 +10:00
parent b71293fb11
commit 1da6f20f18
14 changed files with 32 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/org/thoughtcrime/securesms/ConversationListFragment.java
View File

@@ -427,8 +427,10 @@ public class ConversationListFragment extends Fragment
public boolean onCreateActionMode(ActionMode mode, Menu menu) {
MenuInflater inflater = getActivity().getMenuInflater();
/*
if (archive) inflater.inflate(R.menu.conversation_list_batch_unarchive, menu);
else inflater.inflate(R.menu.conversation_list_batch_archive, menu);
*/
inflater.inflate(R.menu.conversation_list_batch, menu);

6
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@@ -1553,8 +1553,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
if (manuallySelected) recordTransportPreference(newTransport);
});
/*
titleView.setOnClickListener(v -> handleConversationSettings());
titleView.setOnLongClickListener(v -> handleDisplayQuickContact());
*/
titleView.setOnBackClickedListener(view -> super.onBackPressed());
unblockButton.setOnClickListener(v -> handleUnblock());
makeDefaultSmsButton.setOnClickListener(v -> handleMakeDefaultSms());
@@ -1850,8 +1852,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
private void setActionBarColor(MaterialColor color) {
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar == null) throw new AssertionError();
supportActionBar.setBackgroundDrawable(new ColorDrawable(color.toActionBarColor(this)));
setStatusBarColor(color.toStatusBarColor(this));
supportActionBar.setBackgroundDrawable(new ColorDrawable(getResources().getColor(R.color.core_grey_90)));
setStatusBarColor(getResources().getColor(R.color.black));
}
private void setBlockedUserState(Recipient recipient, boolean isSecureText, boolean isDefaultSms) {

8
src/org/thoughtcrime/securesms/conversation/ConversationFragment.java
View File

@@ -370,9 +370,9 @@ public class ConversationFragment extends Fragment
}
if (messageRecords.size() > 1) {
menu.findItem(R.id.menu_context_forward).setVisible(false);
// menu.findItem(R.id.menu_context_forward).setVisible(false);
menu.findItem(R.id.menu_context_reply).setVisible(false);
menu.findItem(R.id.menu_context_details).setVisible(false);
// menu.findItem(R.id.menu_context_details).setVisible(false);
menu.findItem(R.id.menu_context_save_attachment).setVisible(false);
menu.findItem(R.id.menu_context_resend).setVisible(false);
} else {
@@ -384,8 +384,10 @@ public class ConversationFragment extends Fragment
!messageRecord.isMmsNotification() &&
((MediaMmsMessageRecord)messageRecord).containsMediaSlide());
/*
menu.findItem(R.id.menu_context_forward).setVisible(!actionMessage && !sharedContact);
menu.findItem(R.id.menu_context_details).setVisible(!actionMessage);
*/
menu.findItem(R.id.menu_context_reply).setVisible(!actionMessage &&
!messageRecord.isPending() &&
!messageRecord.isFailed() &&
@@ -1047,6 +1049,7 @@ public class ConversationFragment extends Fragment
handleDeleteMessages(getListAdapter().getSelectedItems());
actionMode.finish();
return true;
/*
case R.id.menu_context_details:
handleDisplayDetails(getSelectedMessageRecord());
actionMode.finish();
@@ -1055,6 +1058,7 @@ public class ConversationFragment extends Fragment
handleForwardMessage(getSelectedMessageRecord());
actionMode.finish();
return true;
*/
case R.id.menu_context_resend:
handleResendMessage(getSelectedMessageRecord());
actionMode.finish();

2
src/org/thoughtcrime/securesms/conversation/ConversationTitleView.java
View File

@@ -55,6 +55,8 @@ public class ConversationTitleView extends RelativeLayout {
this.subtitleContainer = ViewUtil.findById(this, R.id.subtitle_container);
this.avatar = ViewUtil.findById(this, R.id.contact_photo_image);
this.avatar.setEnabled(false);
ViewUtil.setTextViewGravityStart(this.title, getContext());
ViewUtil.setTextViewGravityStart(this.subtitle, getContext());
}

2
src/org/thoughtcrime/securesms/loki/FriendRequestView.kt
View File

@@ -26,7 +26,7 @@ class FriendRequestView(context: Context, attrs: AttributeSet?, defStyleAttr: In
private val label by lazy {
val result = TextView(context)
result.setTextColor(resources.getColorWithID(R.color.core_grey_90, context.theme))
result.setTextColor(resources.getColorWithID(R.color.white, context.theme))
result.textAlignment = TextView.TEXT_ALIGNMENT_CENTER
result
}

6
src/org/thoughtcrime/securesms/util/DynamicNoActionBarTheme.java
View File

@@ -7,10 +7,6 @@ import org.thoughtcrime.securesms.R;
public class DynamicNoActionBarTheme extends DynamicTheme {
@Override
protected int getSelectedTheme(Activity activity) {
String theme = TextSecurePreferences.getTheme(activity);
if (theme.equals("dark")) return R.style.TextSecure_DarkNoActionBar;
return R.style.TextSecure_LightNoActionBar;
return R.style.TextSecure_DarkNoActionBar;
}
}

6
src/org/thoughtcrime/securesms/util/DynamicRegistrationTheme.java
View File

@@ -7,10 +7,6 @@ import org.thoughtcrime.securesms.R;
public class DynamicRegistrationTheme extends DynamicTheme {
@Override
protected int getSelectedTheme(Activity activity) {
String theme = TextSecurePreferences.getTheme(activity);
if (theme.equals("dark")) return R.style.TextSecure_DarkRegistrationTheme;
return R.style.TextSecure_LightRegistrationTheme;
return R.style.TextSecure_DarkRegistrationTheme;
}
}

6
src/org/thoughtcrime/securesms/util/DynamicTheme.java
View File

@@ -28,11 +28,7 @@ public class DynamicTheme {
}
protected int getSelectedTheme(Activity activity) {
String theme = TextSecurePreferences.getTheme(activity);
if (theme.equals(DARK)) return R.style.TextSecure_DarkTheme;
return R.style.TextSecure_LightTheme;
return R.style.TextSecure_DarkTheme;
}
private static final class OverridePendingTransition {