mirror/monocles_chat
1
0
Fork 1
mirror of https://codeberg.org/monocles/monocles_chat.git synced 2025-01-15 22:22:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix wrong button assignment + change order

Browse source
This commit is contained in:
Arne 2024-08-05 15:52:58 +02:00
parent 3dd905b6f2
commit 479ff31dcb
9 changed files with 39 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/de/monocles/chat/WebXDCStore.java
View file

@ -106,7 +106,7 @@ public class WebXDCStore extends AppCompatActivity {
BottomNavigationView bottomNavigationView = findViewById(R.id.bottom_navigation);
// Set Home selected
bottomNavigationView.setSelectedItemId(R.id.contactslist);
bottomNavigationView.setSelectedItemId(R.id.webxdc);
// Perform item selected listener
bottomNavigationView.setOnNavigationItemSelectedListener(new BottomNavigationView.OnNavigationItemSelectedListener() {
@ -124,13 +124,13 @@ public class WebXDCStore extends AppCompatActivity {
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.webxdc -> {
return true;
}
case R.id.manageaccounts -> {
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.webxdc -> {
return true;
}
/* TODO:
case R.id.calls:

8
src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
View file

@ -1011,13 +1011,13 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.manageaccounts -> {
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
case R.id.webxdc -> {
startActivity(new Intent(getApplicationContext(), WebXDCStore.class));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.webxdc -> {
startActivity(new Intent(getApplicationContext(), WebXDCStore.class));
case R.id.manageaccounts -> {
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}

6
src/main/java/eu/siacs/conversations/ui/ManageAccountActivity.java
View file

@ -180,13 +180,13 @@ public class ManageAccountActivity extends XmppActivity implements OnAccountUpda
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.manageaccounts -> {
return true;
}
case R.id.webxdc -> {
startActivity(new Intent(getApplicationContext(), WebXDCStore.class));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.manageaccounts -> {
return true;
}
/* TODO:
case R.id.calls:

8
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -469,13 +469,13 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
case R.id.contactslist -> {
return true;
}
case R.id.manageaccounts -> {
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
case R.id.webxdc -> {
startActivity(new Intent(getApplicationContext(), WebXDCStore.class));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}
case R.id.webxdc -> {
startActivity(new Intent(getApplicationContext(), WebXDCStore.class));
case R.id.manageaccounts -> {
startActivity(new Intent(getApplicationContext(), MANAGE_ACCOUNT_ACTIVITY));
overridePendingTransition(R.animator.fade_in, R.animator.fade_out);
return true;
}

8
src/main/res/menu/bottom_navigation_menu.xml
View file

@ -8,14 +8,14 @@
android:id="@+id/contactslist"
android:icon="?attr/icon_group"
android:title="@string/contacts"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<item
android:id="@+id/webxdc"
android:icon="?attr/icon_webxdcs"
android:title="@string/webxdcs"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<!-- TODO: Later -->
<item

9
src/main/res/menu/bottom_navigation_menu_accounts.xml
View file

@ -8,14 +8,15 @@
android:id="@+id/contactslist"
android:icon="?attr/icon_group_unselected"
android:title="@string/contacts"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_accounts_selected"
android:title="@string/accounts"/>
<item
android:id="@+id/webxdc"
android:icon="?attr/icon_webxdcs"
android:title="@string/webxdcs"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_accounts_selected"
android:title="@string/accounts"/>
<!-- TODO: Later -->
<item
android:id="@+id/stories"

9
src/main/res/menu/bottom_navigation_menu_chat.xml
View file

@ -8,14 +8,15 @@
android:id="@+id/contactslist"
android:icon="?attr/icon_group_unselected"
android:title="@string/contacts"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<item
android:id="@+id/webxdc"
android:icon="?attr/icon_webxdcs"
android:title="@string/webxdcs"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<!-- TODO: Later -->
<item
android:id="@+id/stories"

9
src/main/res/menu/bottom_navigation_menu_contacts.xml
View file

@ -8,14 +8,15 @@
android:id="@+id/contactslist"
android:icon="?attr/icon_group_selected"
android:title="@string/contacts"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<item
android:id="@+id/webxdc"
android:icon="?attr/icon_webxdcs"
android:title="@string/webxdcs"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<!-- TODO: Later -->
<item
android:id="@+id/stories"

9
src/main/res/menu/bottom_navigation_menu_webxdcs.xml
View file

@ -8,14 +8,15 @@
android:id="@+id/contactslist"
android:icon="?attr/icon_group_unselected"
android:title="@string/contacts"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<item
android:id="@+id/webxdc"
android:icon="?attr/icon_webxdcs_selected"
android:title="@string/webxdcs"/>
<item
android:id="@+id/manageaccounts"
android:icon="?attr/icon_account"
android:title="@string/accounts"/>
<!-- TODO: Later -->
<item
android:id="@+id/stories"