diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a0755a94..577f2f80 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -95,11 +95,6 @@ android:screenOrientation="portrait" android:theme="@style/AppTheme" /> - - { // 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} diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java index cde879e0..d7850ade 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/MainActivity.java @@ -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()); } diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MessageActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/MessageActivity.java deleted file mode 100644 index 1e6f1bad..00000000 --- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/MessageActivity.java +++ /dev/null @@ -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); - } -} \ No newline at end of file diff --git a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java index 5aed8c52..5ae98685 100644 --- a/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java +++ b/app/src/main/java/org/nuclearfog/twidda/ui/activities/ProfileActivity.java @@ -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); diff --git a/app/src/main/res/menu/home.xml b/app/src/main/res/menu/home.xml index 110e39f9..5cc19204 100644 --- a/app/src/main/res/menu/home.xml +++ b/app/src/main/res/menu/home.xml @@ -10,14 +10,14 @@ app:showAsAction="always|collapseActionView" /> - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index 6283b273..11ee4e30 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -35,7 +35,6 @@ Stummschaltung aufheben stummgeschaltet! Stummschaltung aufgehoben! - Direktnachrichten Username Nachricht Direktnachricht gesendet! @@ -144,7 +143,7 @@ Status posten Profil Twitter suche - Einstellungen öffnen + Einstellungen erstelle Nutzerliste Direktnachricht jetzt @@ -185,7 +184,7 @@ Linkvorschau schließen Linkvorschau aktivieren Account aus der Liste entfernen? - Account auswählen + Logins Account hinzufügen Repost Anfrage Icon diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 7ae73d17..cf365add 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -23,7 +23,6 @@ 删除推文？ 清除应用数据？ "来自：" - 私信 用户名 消息内容 取消发送消息？ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cdf17216..3009b2aa 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -137,7 +137,7 @@ enter @name to mute enter @name to block refresh exclude list - select account + Logins add account Text Media link @@ -187,7 +187,6 @@ delete status? clear app data? "sent from: " - Directmessage media attachment Username Message