mirror of
https://codeberg.org/monocles/monocles_chat.git
synced 2025-01-31 01:01:37 +01:00
12aw
parent
a845ac7acf
commit
c84b841499
5 changed files with 36 additions and 124 deletions
|
|
@ -15,19 +15,6 @@
|
|||
"versionName": "1.7.8.5",
|
||||
"outputFile": "monocles chat-1.7.8.5-git-universal-release.apk"
|
||||
},
|
||||
{
|
||||
"type": "ONE_OF_MANY",
|
||||
"filters": [
|
||||
{
|
||||
"filterType": "ABI",
|
||||
"value": "x86"
|
||||
}
|
||||
],
|
||||
"attributes": [],
|
||||
"versionCode": 15602,
|
||||
"versionName": "1.7.8.5",
|
||||
"outputFile": "monocles chat-1.7.8.5-git-x86-release.apk"
|
||||
},
|
||||
{
|
||||
"type": "ONE_OF_MANY",
|
||||
"filters": [
|
||||
|
|
@ -54,6 +41,19 @@
|
|||
"versionName": "1.7.8.5",
|
||||
"outputFile": "monocles chat-1.7.8.5-git-armeabi-v7a-release.apk"
|
||||
},
|
||||
{
|
||||
"type": "ONE_OF_MANY",
|
||||
"filters": [
|
||||
{
|
||||
"filterType": "ABI",
|
||||
"value": "x86"
|
||||
}
|
||||
],
|
||||
"attributes": [],
|
||||
"versionCode": 15602,
|
||||
"versionName": "1.7.8.5",
|
||||
"outputFile": "monocles chat-1.7.8.5-git-x86-release.apk"
|
||||
},
|
||||
{
|
||||
"type": "ONE_OF_MANY",
|
||||
"filters": [
|
||||
|
|
|
|||
|
|
@ -992,17 +992,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
|
|||
return true;
|
||||
}
|
||||
case R.id.manageaccounts -> {
|
||||
if (xmppConnectionServiceBound && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
|
||||
final Intent intent = new Intent(getApplicationContext(), EditAccountActivity.class);
|
||||
Account mAccount = xmppConnectionService.getAccounts().get(0);
|
||||
intent.putExtra("jid", mAccount.getJid().asBareJid().toString());
|
||||
intent.putExtra("init", false);
|
||||
startActivity(intent);
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
} else {
|
||||
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
}
|
||||
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
}
|
||||
/* TODO:
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package eu.siacs.conversations.ui;
|
||||
|
||||
import static android.view.View.VISIBLE;
|
||||
import static eu.siacs.conversations.utils.PermissionUtils.allGranted;
|
||||
import static eu.siacs.conversations.utils.PermissionUtils.readGranted;
|
||||
import eu.siacs.conversations.crypto.axolotl.FingerprintStatus;
|
||||
|
|
@ -43,7 +42,6 @@ import androidx.appcompat.app.AlertDialog;
|
|||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.databinding.DataBindingUtil;
|
||||
|
||||
import com.google.android.material.bottomnavigation.BottomNavigationView;
|
||||
import com.google.android.material.materialswitch.MaterialSwitch;
|
||||
import com.google.android.material.textfield.TextInputLayout;
|
||||
import com.google.common.base.CharMatcher;
|
||||
|
|
@ -834,7 +832,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
@Override
|
||||
protected void onStart() {
|
||||
super.onStart();
|
||||
|
||||
final Intent intent = getIntent();
|
||||
final int theme = findTheme();
|
||||
if (this.mTheme != theme) {
|
||||
|
|
@ -875,13 +872,11 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
if (mExisting) {
|
||||
this.binding.accountRegisterNew.setVisibility(View.GONE);
|
||||
}
|
||||
|
||||
if (!mInitMode) {
|
||||
this.binding.accountRegisterNew.setVisibility(View.GONE);
|
||||
setTitle(getString(R.string.account_details));
|
||||
configureActionBar(getSupportActionBar(), !openedFromNotification);
|
||||
} else {
|
||||
this.binding.bottomNavigation.setVisibility(View.GONE);
|
||||
this.binding.yourNameBox.setVisibility(View.GONE);
|
||||
this.binding.yourStatusBox.setVisibility(View.GONE);
|
||||
if (xmppConnectionService != null && xmppConnectionService.getBooleanPreference("set_round_avatars", R.bool.set_round_avatars)) {
|
||||
|
|
@ -902,53 +897,6 @@ public class EditAccountActivity extends OmemoActivity implements OnAccountUpdat
|
|||
this.binding.quietHoursBox.setVisibility(View.GONE);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Initialize and assign variable
|
||||
BottomNavigationView bottomNavigationView=findViewById(R.id.bottom_navigation);
|
||||
// Set Home selected
|
||||
bottomNavigationView.setSelectedItemId(R.id.manageaccounts);
|
||||
|
||||
// Perform item selected listener
|
||||
bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
|
||||
@Override
|
||||
public boolean onNavigationItemSelected(@NonNull MenuItem item) {
|
||||
|
||||
switch (item.getItemId()) {
|
||||
case R.id.chats -> {
|
||||
startActivity(new Intent(getApplicationContext(), ConversationsActivity.class));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
}
|
||||
case R.id.contactslist -> {
|
||||
startActivity(new Intent(getApplicationContext(), StartConversationActivity.class));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
}
|
||||
case R.id.manageaccounts -> {
|
||||
return true;
|
||||
}
|
||||
/* TODO:
|
||||
case R.id.calls:
|
||||
startActivity(new Intent(getApplicationContext(), CallsActivity.class));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
case R.id.stories:
|
||||
startActivity(new Intent(getApplicationContext(),MediaBrowserActivity.class));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
*/
|
||||
default ->
|
||||
throw new IllegalStateException("Unexpected value: " + item.getItemId());
|
||||
}
|
||||
}
|
||||
});
|
||||
if (xmppConnectionService != null && xmppConnectionService.multipleAccounts()) {
|
||||
bottomNavigationView.setVisibility(View.GONE);
|
||||
} else {
|
||||
bottomNavigationView.setVisibility(VISIBLE);
|
||||
}
|
||||
|
||||
SharedPreferences preferences = getPreferences();
|
||||
mUseTor = preferences.getBoolean("use_tor", getResources().getBoolean(R.bool.use_tor));
|
||||
mUseI2P = QuickConversationsService.isConversations() && preferences.getBoolean("use_i2p", getResources().getBoolean(R.bool.use_i2p));
|
||||
|
|
|
|||
|
|
@ -472,17 +472,8 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
|
|||
return true;
|
||||
}
|
||||
case R.id.manageaccounts -> {
|
||||
if (xmppConnectionServiceBound && xmppConnectionService.getAccounts().size() == 1 && !xmppConnectionService.multipleAccounts()) {
|
||||
final Intent intent = new Intent(getApplicationContext(), EditAccountActivity.class);
|
||||
Account mAccount = xmppConnectionService.getAccounts().get(0);
|
||||
intent.putExtra("jid", mAccount.getJid().asBareJid().toString());
|
||||
intent.putExtra("init", false);
|
||||
startActivity(intent);
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
} else {
|
||||
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
}
|
||||
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
|
||||
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
|
||||
return true;
|
||||
}
|
||||
/* TODO:
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
xmlns:card_view="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools">
|
||||
|
||||
<androidx.coordinatorlayout.widget.CoordinatorLayout
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?attr/color_background_tertiary">
|
||||
|
|
@ -16,8 +16,6 @@
|
|||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="?attr/actionBarSize"
|
||||
android:layout_marginBottom="108dp"
|
||||
android:layout_above="@+id/button_bar"
|
||||
android:layout_below="@id/toolbar">
|
||||
|
||||
|
|
@ -105,7 +103,7 @@
|
|||
<eu.siacs.conversations.ui.widget.TextInputEditText
|
||||
android:id="@+id/port"
|
||||
style="@style/Widget.Material3.TextInputEditText.FilledBox"
|
||||
android:fontFamily="notosansregular"
|
||||
android:fontFamily="notosansregular"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:inputType="number"
|
||||
|
|
@ -126,7 +124,7 @@
|
|||
<AutoCompleteTextView
|
||||
android:id="@+id/account_jid"
|
||||
style="@style/Widget.Material3.TextInputEditText.FilledBox"
|
||||
android:fontFamily="notosansregular"
|
||||
android:fontFamily="notosansregular"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:imeOptions="actionNext"
|
||||
|
|
@ -1032,52 +1030,36 @@
|
|||
|
||||
<LinearLayout
|
||||
android:id="@+id/button_bar"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="30dp"
|
||||
android:layout_gravity="bottom"
|
||||
android:layout_marginBottom="70dp"
|
||||
android:orientation="horizontal"
|
||||
android:gravity="center" >
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentBottom="true">
|
||||
|
||||
<Button
|
||||
android:id="@+id/cancel_button"
|
||||
style="@style/Widget.Conversations.Button.Borderless"
|
||||
android:padding="2dp"
|
||||
android:insetBottom="0dp"
|
||||
android:insetTop="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="38dp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/cancel" />
|
||||
|
||||
<View
|
||||
android:layout_width="4dp"
|
||||
android:layout_height="match_parent" />
|
||||
android:layout_width="1dp"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="7dp"
|
||||
android:layout_marginBottom="7dp" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/save_button"
|
||||
style="@style/Widget.Conversations.Button.Borderless"
|
||||
android:padding="2dp"
|
||||
android:insetBottom="0dp"
|
||||
android:insetTop="0dp"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="38dp"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="1"
|
||||
android:enabled="false"
|
||||
android:text="@string/save" />
|
||||
</LinearLayout>
|
||||
|
||||
|
||||
<com.google.android.material.bottomnavigation.BottomNavigationView
|
||||
android:id="@+id/bottom_navigation"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="70dp"
|
||||
android:layout_gravity="end|bottom"
|
||||
android:layout_below="@+id/button_bar"
|
||||
android:background="?attr/color_background_secondary"
|
||||
app:labelVisibilityMode="labeled"
|
||||
app:itemActiveIndicatorStyle="@style/monocles.Active.Indicator"
|
||||
app:menu="@menu/bottom_navigation_menu"
|
||||
android:animateLayoutChanges="true" />
|
||||
</androidx.coordinatorlayout.widget.CoordinatorLayout>
|
||||
</RelativeLayout>
|
||||
</layout>
|
||||
Loading…
Add table
Reference in a new issue