toolbar menu fix, removed message activity
This commit is contained in:
parent
320dded2dd
commit
ca3d0e7c34
|
@ -95,11 +95,6 @@
|
|||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme" />
|
||||
|
||||
<activity
|
||||
android:name=".ui.activities.MessageActivity"
|
||||
android:screenOrientation="portrait"
|
||||
android:theme="@style/AppTheme" />
|
||||
|
||||
<activity
|
||||
android:name=".ui.activities.VideoViewer"
|
||||
android:screenOrientation="portrait"
|
||||
|
|
|
@ -14,7 +14,6 @@ import org.nuclearfog.twidda.backend.api.ConnectionManager;
|
|||
import org.nuclearfog.twidda.model.User;
|
||||
import org.nuclearfog.twidda.model.UserList;
|
||||
import org.nuclearfog.twidda.ui.activities.MainActivity;
|
||||
import org.nuclearfog.twidda.ui.activities.MessageActivity;
|
||||
import org.nuclearfog.twidda.ui.activities.ProfileActivity;
|
||||
import org.nuclearfog.twidda.ui.activities.SearchActivity;
|
||||
import org.nuclearfog.twidda.ui.activities.StatusActivity;
|
||||
|
@ -79,7 +78,8 @@ public class LinkLoader extends AsyncTask<Uri, Void, LinkLoader.DataHolder> {
|
|||
// open directmessage page
|
||||
// e.g. twitter.com/messages
|
||||
else if (pathSeg.get(0).equals("messages")) {
|
||||
return new DataHolder(data, MessageActivity.class);
|
||||
data.putInt(MainActivity.KEY_TAB_PAGE, 3);
|
||||
return new DataHolder(data, MainActivity.class);
|
||||
}
|
||||
// open twitter search
|
||||
// e.g. twitter.com/search?q={search string}
|
||||
|
|
|
@ -68,6 +68,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
|
|||
private Dialog loadingCircle;
|
||||
private TabLayout tabLayout;
|
||||
private ViewPager pager;
|
||||
private Toolbar toolbar;
|
||||
private ViewGroup root;
|
||||
|
||||
|
||||
|
@ -81,7 +82,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
|
|||
protected void onCreate(@Nullable Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
setContentView(R.layout.page_main);
|
||||
Toolbar toolbar = findViewById(R.id.home_toolbar);
|
||||
toolbar = findViewById(R.id.home_toolbar);
|
||||
pager = findViewById(R.id.home_pager);
|
||||
tabLayout = findViewById(R.id.home_tab);
|
||||
root = findViewById(R.id.main_layout);
|
||||
|
@ -93,6 +94,7 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
|
|||
pager.setOffscreenPageLimit(3);
|
||||
pager.setAdapter(adapter);
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
AppStyles.setOverflowIcon(toolbar, settings.getIconColor());
|
||||
|
||||
toolbar.setTitle("");
|
||||
setSupportActionBar(toolbar);
|
||||
|
@ -141,25 +143,17 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
|
|||
// check if account changed
|
||||
else if (returnCode == LoginActivity.RETURN_LOGIN_SUCCESSFUL) {
|
||||
adapter.setupForHomePage();
|
||||
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
}
|
||||
break;
|
||||
|
||||
case REQUEST_ACCOUNT_CHANGE:
|
||||
// check if account or theme changed
|
||||
if (returnCode == AccountActivity.RETURN_ACCOUNT_CHANGED
|
||||
|| returnCode == AccountActivity.RETURN_SETTINGS_CHANGED) {
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
|
||||
if (returnCode == AccountActivity.RETURN_ACCOUNT_CHANGED || returnCode == AccountActivity.RETURN_SETTINGS_CHANGED) {
|
||||
adapter.notifySettingsChanged();
|
||||
}
|
||||
break;
|
||||
|
||||
case REQUEST_APP_SETTINGS:
|
||||
// set new theme
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
|
||||
// check if an account was removed
|
||||
if (returnCode == SettingsActivity.RETURN_APP_LOGOUT) {
|
||||
// clear old login fragments
|
||||
|
@ -172,6 +166,9 @@ public class MainActivity extends AppCompatActivity implements OnTabSelectedList
|
|||
}
|
||||
break;
|
||||
}
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
AppStyles.setTabIcons(tabLayout, settings, R.array.home_tab_icons);
|
||||
AppStyles.setOverflowIcon(toolbar, settings.getIconColor());
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -1,71 +0,0 @@
|
|||
package org.nuclearfog.twidda.ui.activities;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Bundle;
|
||||
import android.view.Menu;
|
||||
import android.view.MenuItem;
|
||||
import android.view.ViewGroup;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.appcompat.app.AppCompatActivity;
|
||||
import androidx.appcompat.widget.Toolbar;
|
||||
import androidx.fragment.app.FragmentTransaction;
|
||||
|
||||
import org.nuclearfog.twidda.R;
|
||||
import org.nuclearfog.twidda.backend.utils.AppStyles;
|
||||
import org.nuclearfog.twidda.database.GlobalSettings;
|
||||
import org.nuclearfog.twidda.ui.fragments.MessageFragment;
|
||||
|
||||
/**
|
||||
* Activity for the direct message page of the current user
|
||||
*
|
||||
* @author nuclearfog
|
||||
*/
|
||||
public class MessageActivity extends AppCompatActivity {
|
||||
|
||||
private GlobalSettings settings;
|
||||
|
||||
@Override
|
||||
protected void attachBaseContext(Context newBase) {
|
||||
super.attachBaseContext(AppStyles.setFontScale(newBase));
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onCreate(@Nullable Bundle b) {
|
||||
super.onCreate(b);
|
||||
setContentView(R.layout.page_fragment);
|
||||
ViewGroup root = findViewById(R.id.fragment_root);
|
||||
Toolbar tool = findViewById(R.id.fragment_toolbar);
|
||||
|
||||
FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
|
||||
fragmentTransaction.replace(R.id.fragment_container, new MessageFragment());
|
||||
fragmentTransaction.commit();
|
||||
|
||||
tool.setTitle(R.string.directmessage);
|
||||
setSupportActionBar(tool);
|
||||
|
||||
settings = GlobalSettings.getInstance(this);
|
||||
AppStyles.setTheme(root, settings.getBackgroundColor());
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onCreateOptionsMenu(@NonNull Menu m) {
|
||||
getMenuInflater().inflate(R.menu.message, m);
|
||||
AppStyles.setMenuIconColor(m, settings.getIconColor());
|
||||
return super.onCreateOptionsMenu(m);
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public boolean onOptionsItemSelected(@NonNull MenuItem item) {
|
||||
if (item.getItemId() == R.id.menu_message) {
|
||||
Intent sendDm = new Intent(this, MessageEditor.class);
|
||||
startActivity(sendDm);
|
||||
}
|
||||
return super.onOptionsItemSelected(item);
|
||||
}
|
||||
}
|
|
@ -299,7 +299,6 @@ public class ProfileActivity extends AppCompatActivity implements OnClickListene
|
|||
listItem.setVisible(true);
|
||||
}
|
||||
if (user.isCurrentUser()) {
|
||||
MenuItem dmIcon = m.findItem(R.id.profile_message);
|
||||
MenuItem setting = m.findItem(R.id.profile_settings);
|
||||
MenuItem userExcl = m.findItem(R.id.profile_block_mute);
|
||||
MenuItem requestItem = m.findItem(R.id.profile_requests);
|
||||
|
|
|
@ -10,14 +10,14 @@
|
|||
app:showAsAction="always|collapseActionView" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_post"
|
||||
android:icon="@drawable/post"
|
||||
android:title="@string/menu_tweet"
|
||||
android:id="@+id/menu_profile"
|
||||
android:title="@string/menu_open_home_profile"
|
||||
android:icon="@drawable/user"
|
||||
app:showAsAction="ifRoom" />
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_profile"
|
||||
android:title="@string/menu_open_home_profile"
|
||||
android:id="@+id/menu_post"
|
||||
android:title="@string/menu_tweet"
|
||||
app:showAsAction="withText" />
|
||||
|
||||
<item
|
||||
|
|
|
@ -1,11 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto">
|
||||
|
||||
<item
|
||||
android:id="@+id/menu_message"
|
||||
android:icon="@drawable/message"
|
||||
android:title="@string/menu_write_message"
|
||||
app:showAsAction="always" />
|
||||
|
||||
</menu>
|
|
@ -35,7 +35,6 @@
|
|||
<string name="menu_unmute_user">Stummschaltung aufheben</string>
|
||||
<string name="info_user_muted">stummgeschaltet!</string>
|
||||
<string name="info_user_unmuted">Stummschaltung aufgehoben!</string>
|
||||
<string name="directmessage">Direktnachrichten</string>
|
||||
<string name="username">Username</string>
|
||||
<string name="dm_message">Nachricht</string>
|
||||
<string name="info_dm_send">Direktnachricht gesendet!</string>
|
||||
|
@ -144,7 +143,7 @@
|
|||
<string name="menu_tweet">Status posten</string>
|
||||
<string name="menu_open_home_profile">Profil</string>
|
||||
<string name="menu_open_twitter_search">Twitter suche</string>
|
||||
<string name="menu_open_settings">Einstellungen öffnen</string>
|
||||
<string name="menu_open_settings">Einstellungen</string>
|
||||
<string name="menu_create_list">erstelle Nutzerliste</string>
|
||||
<string name="menu_write_message">Direktnachricht</string>
|
||||
<string name="time_now">jetzt</string>
|
||||
|
@ -185,7 +184,7 @@
|
|||
<string name="dialog_link_close">Linkvorschau schließen</string>
|
||||
<string name="settings_toggle_link_preview">Linkvorschau aktivieren</string>
|
||||
<string name="confirm_remove_account">Account aus der Liste entfernen?</string>
|
||||
<string name="menu_select_account">Account auswählen</string>
|
||||
<string name="menu_select_account">Logins</string>
|
||||
<string name="menu_add_account">Account hinzufügen</string>
|
||||
<string name="settings_rt_icon_color">Repost</string>
|
||||
<string name="settings_follow_req_color">Anfrage Icon</string>
|
||||
|
|
|
@ -23,7 +23,6 @@
|
|||
<string name="confirm_delete_tweet">删除推文?</string>
|
||||
<string name="confirm_delete_database">清除应用数据?</string>
|
||||
<string name="tweet_sent_from">"来自:"</string>
|
||||
<string name="directmessage">私信</string>
|
||||
<string name="username">用户名</string>
|
||||
<string name="dm_message">消息内容</string>
|
||||
<string name="confirm_cancel_message">取消发送消息?</string>
|
||||
|
|
|
@ -137,7 +137,7 @@
|
|||
<string name="menu_hint_mute_user">enter @name to mute</string>
|
||||
<string name="menu_hint_block_user">enter @name to block</string>
|
||||
<string name="menu_refresh_exclude">refresh exclude list</string>
|
||||
<string name="menu_select_account">select account</string>
|
||||
<string name="menu_select_account">Logins</string>
|
||||
<string name="menu_add_account">add account</string>
|
||||
<string name="menu_tweet_copy_text">Text</string>
|
||||
<string name="menu_media_link">Media link</string>
|
||||
|
@ -187,7 +187,6 @@
|
|||
<string name="confirm_delete_tweet">delete status?</string>
|
||||
<string name="confirm_delete_database">clear app data?</string>
|
||||
<string name="tweet_sent_from">"sent from: "</string>
|
||||
<string name="directmessage">Directmessage</string>
|
||||
<string name="directmessage_media_button">media attachment</string>
|
||||
<string name="username">Username</string>
|
||||
<string name="dm_message">Message</string>
|
||||
|
|
Loading…
Reference in New Issue