ThmmyNoLife
/
mTHMMY
mirror of https://github.com/ThmmyNoLife/mTHMMY
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Navigation fixes

pull/61/merge
Ezerous 6 years ago
parent
b6ad92120b
commit
c5442218f0
No known key found for this signature in database GPG Key ID: 262B2954BBA319E3
4 changed files with 81 additions and 98 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      app/src/main/AndroidManifest.xml
  2. 28
      app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
  3. 2
      app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java
  4. 145
      app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java

4
app/src/main/AndroidManifest.xml
View File

@ -113,11 +113,12 @@
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
android:value=".activities.main.MainActivity" /> android:value=".activities.upload.UploadActivity" />
</activity> </activity>
<activity <activity
android:name=".activities.bookmarks.BookmarkActivity" android:name=".activities.bookmarks.BookmarkActivity"
android:parentActivityName=".activities.main.MainActivity" android:parentActivityName=".activities.main.MainActivity"
android:launchMode="singleTop"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"
@ -126,6 +127,7 @@
<activity <activity
android:name=".activities.settings.SettingsActivity" android:name=".activities.settings.SettingsActivity"
android:parentActivityName=".activities.main.MainActivity" android:parentActivityName=".activities.main.MainActivity"
android:launchMode="singleTop"
android:theme="@style/AppTheme.PreferenceTheme"> android:theme="@style/AppTheme.PreferenceTheme">
<meta-data <meta-data
android:name="android.support.PARENT_ACTIVITY" android:name="android.support.PARENT_ACTIVITY"

28
app/src/main/java/gr/thmmy/mthmmy/activities/LoginActivity.java
View File

@ -3,8 +3,10 @@ package gr.thmmy.mthmmy.activities;
import android.content.Intent; import android.content.Intent;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Bundle; import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.preference.PreferenceManager; import android.support.v7.preference.PreferenceManager;
import android.support.v7.widget.AppCompatButton; import android.support.v7.widget.AppCompatButton;
import android.view.ActionMode;
import android.view.View; import android.view.View;
import android.view.inputmethod.InputMethodManager; import android.view.inputmethod.InputMethodManager;
import android.widget.EditText; import android.widget.EditText;
@ -77,28 +79,26 @@ public class LoginActivity extends BaseActivity {
}); });
//Guest Button Action //Guest Button Action
btnGuest.setOnClickListener(new View.OnClickListener() { btnGuest.setOnClickListener(view -> {
//Session data update
public void onClick(View view) { sessionManager.guestLogin();
//Session data update
sessionManager.guestLogin(); //Go to main
Intent intent = new Intent(LoginActivity.this, MainActivity.class);
//Go to main startActivity(intent);
Intent intent = new Intent(LoginActivity.this, MainActivity.class); finish();
startActivity(intent); overridePendingTransition(R.anim.push_left_in, R.anim.push_left_out);
finish();
overridePendingTransition(R.anim.push_left_in, R.anim.push_left_out);
}
}); });
} }
@Override @Override
public void onBackPressed() { public void onBackPressed() {
// Disable going back to the MainActivity super.onBackPressed();
moveTaskToBack(true);
if (loginTask != null && loginTask.getStatus() == AsyncTask.Status.RUNNING) { if (loginTask != null && loginTask.getStatus() == AsyncTask.Status.RUNNING) {
loginTask.cancel(true); loginTask.cancel(true);
} }
if(!isTaskRoot())
overridePendingTransition(R.anim.push_left_in, R.anim.push_left_out);
} }
private void onLoginFailed() { private void onLoginFailed() {

2
app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java
View File

@ -32,8 +32,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements Shared
private static final String SELECTED_NOTIFICATIONS_SOUND = "pref_notifications_select_sound_key"; private static final String SELECTED_NOTIFICATIONS_SOUND = "pref_notifications_select_sound_key";
private static final String POSTING_CATEGORY = "pref_category_posting_key"; private static final String POSTING_CATEGORY = "pref_category_posting_key";
private static final String UPLOADING_CATEGORY = "pref_category_uploading_key"; private static final String UPLOADING_CATEGORY = "pref_category_uploading_key";
public static final String PRIVACY_CRASHLYTICS_ENABLE_KEY = "pref_privacy_crashlytics_enable_key";
public static final String PRIVACY_ANALYTICS_ENABLE_KEY = "pref_privacy_analytics_enable_key";
//SharedPreferences keys //SharedPreferences keys
private static final int REQUEST_CODE_ALERT_RINGTONE = 2; private static final int REQUEST_CODE_ALERT_RINGTONE = 2;

145
app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
View File

@ -35,8 +35,6 @@ import com.mikepenz.materialdrawer.Drawer;
import com.mikepenz.materialdrawer.DrawerBuilder; import com.mikepenz.materialdrawer.DrawerBuilder;
import com.mikepenz.materialdrawer.model.PrimaryDrawerItem; import com.mikepenz.materialdrawer.model.PrimaryDrawerItem;
import com.mikepenz.materialdrawer.model.ProfileDrawerItem; import com.mikepenz.materialdrawer.model.ProfileDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem;
import com.mikepenz.materialdrawer.model.interfaces.IProfile;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
@ -329,53 +327,53 @@ public abstract class BaseActivity extends AppCompatActivity {
.withDrawerWidthDp((int) BaseApplication.getInstance().getDpWidth() / 2) .withDrawerWidthDp((int) BaseApplication.getInstance().getDpWidth() / 2)
.withSliderBackgroundColor(ContextCompat.getColor(this, R.color.primary_light)) .withSliderBackgroundColor(ContextCompat.getColor(this, R.color.primary_light))
.withAccountHeader(accountHeader) .withAccountHeader(accountHeader)
.withOnDrawerItemClickListener(new Drawer.OnDrawerItemClickListener() { .withOnDrawerItemClickListener((view, position, drawerItem) -> {
@Override if (drawerItem.equals(HOME_ID)) {
public boolean onItemClick(View view, int position, IDrawerItem drawerItem) { if (!(BaseActivity.this instanceof MainActivity)) {
if (drawerItem.equals(HOME_ID)) { Intent intent = new Intent(BaseActivity.this, MainActivity.class);
if (!(BaseActivity.this instanceof MainActivity)) { startActivity(intent);
Intent intent = new Intent(BaseActivity.this, MainActivity.class); }
startActivity(intent); } else if (drawerItem.equals(DOWNLOADS_ID)) {
} if (!(BaseActivity.this instanceof DownloadsActivity)) {
} else if (drawerItem.equals(DOWNLOADS_ID)) { Intent intent = new Intent(BaseActivity.this, DownloadsActivity.class);
if (!(BaseActivity.this instanceof DownloadsActivity)) { Bundle extras = new Bundle();
Intent intent = new Intent(BaseActivity.this, DownloadsActivity.class); extras.putString(BUNDLE_DOWNLOADS_URL, "");
Bundle extras = new Bundle(); extras.putString(BUNDLE_DOWNLOADS_TITLE, null);
extras.putString(BUNDLE_DOWNLOADS_URL, ""); intent.putExtras(extras);
extras.putString(BUNDLE_DOWNLOADS_TITLE, null); startActivity(intent);
intent.putExtras(extras); }
startActivity(intent); } else if (drawerItem.equals(UPLOAD_ID)) {
} if (!(BaseActivity.this instanceof UploadActivity)) {
} else if (drawerItem.equals(UPLOAD_ID)) { Intent intent = new Intent(BaseActivity.this, UploadActivity.class);
if (!(BaseActivity.this instanceof UploadActivity)) { startActivity(intent);
Intent intent = new Intent(BaseActivity.this, UploadActivity.class); }
startActivity(intent); } else if (drawerItem.equals(BOOKMARKS_ID)) {
} if (!(BaseActivity.this instanceof BookmarkActivity)) {
} else if (drawerItem.equals(BOOKMARKS_ID)) { Intent intent = new Intent(BaseActivity.this, BookmarkActivity.class);
if (!(BaseActivity.this instanceof BookmarkActivity)) { intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
Intent intent = new Intent(BaseActivity.this, BookmarkActivity.class); startActivity(intent);
startActivity(intent); }
} } else if (drawerItem.equals(LOG_ID)) {
} else if (drawerItem.equals(LOG_ID)) { if (!sessionManager.isLoggedIn()) //When logged out or if user is guest
if (!sessionManager.isLoggedIn()) //When logged out or if user is guest startLoginActivity();
startLoginActivity(); else
else new LogoutTask().execute();
new LogoutTask().execute(); } else if (drawerItem.equals(ABOUT_ID)) {
} else if (drawerItem.equals(ABOUT_ID)) { if (!(BaseActivity.this instanceof AboutActivity)) {
if (!(BaseActivity.this instanceof AboutActivity)) { Intent intent = new Intent(BaseActivity.this, AboutActivity.class);
Intent intent = new Intent(BaseActivity.this, AboutActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
startActivity(intent); startActivity(intent);
} }
} else if (drawerItem.equals(SETTINGS_ID)) { } else if (drawerItem.equals(SETTINGS_ID)) {
if (!(BaseActivity.this instanceof SettingsActivity)) { if (!(BaseActivity.this instanceof SettingsActivity)) {
Intent intent = new Intent(BaseActivity.this, SettingsActivity.class); Intent intent = new Intent(BaseActivity.this, SettingsActivity.class);
startActivity(intent); intent.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT);
} startActivity(intent);
} }
drawer.closeDrawer();
return true;
} }
drawer.closeDrawer();
return true;
}); });
if (sessionManager.isLoggedIn()) if (sessionManager.isLoggedIn())
@ -388,12 +386,9 @@ public abstract class BaseActivity extends AppCompatActivity {
if (!(BaseActivity.this instanceof MainActivity)) if (!(BaseActivity.this instanceof MainActivity))
drawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(false); drawer.getActionBarDrawerToggle().setDrawerIndicatorEnabled(false);
drawer.setOnDrawerNavigationListener(new Drawer.OnDrawerNavigationListener() { drawer.setOnDrawerNavigationListener(clickedView -> {
@Override onBackPressed();
public boolean onNavigationClickListener(View clickedView) { return true;
onBackPressed();
return true;
}
}); });
} }
@ -696,36 +691,25 @@ public abstract class BaseActivity extends AppCompatActivity {
Button cancelButton = view.findViewById(R.id.cancel); Button cancelButton = view.findViewById(R.id.cancel);
Button openButton = view.findViewById(R.id.open); Button openButton = view.findViewById(R.id.open);
Button downloadButton = view.findViewById(R.id.download); Button downloadButton = view.findViewById(R.id.download);
cancelButton.setOnClickListener(new View.OnClickListener() { cancelButton.setOnClickListener(v -> dialog.dismiss());
@Override openButton.setOnClickListener(v -> {
public void onClick(View v) { dialog.dismiss();
dialog.dismiss(); try {
String fileName = thmmyFile.getFilename();
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
Uri fileUri = FileProvider.getUriForFile(getApplicationContext(), getPackageName() + ".provider", new File(SAVE_DIR, fileName));
intent.setDataAndType(fileUri, getMimeType(fileName));
BaseActivity.this.startActivity(intent);
} catch (Exception e) {
Timber.e(e, "Couldn't open downloaded file...");
Toast.makeText(getBaseContext(), "Couldn't open file...", Toast.LENGTH_SHORT).show();
} }
});
openButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
dialog.dismiss();
try {
String fileName = thmmyFile.getFilename();
Intent intent = new Intent(Intent.ACTION_VIEW);
intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_GRANT_READ_URI_PERMISSION);
Uri fileUri = FileProvider.getUriForFile(getApplicationContext(), getPackageName() + ".provider", new File(SAVE_DIR, fileName));
intent.setDataAndType(fileUri, getMimeType(fileName));
BaseActivity.this.startActivity(intent);
} catch (Exception e) {
Timber.e(e, "Couldn't open downloaded file...");
Toast.makeText(getBaseContext(), "Couldn't open file...", Toast.LENGTH_SHORT).show();
}
}
}); });
downloadButton.setOnClickListener(new View.OnClickListener() { downloadButton.setOnClickListener(v -> {
@Override dialog.dismiss();
public void onClick(View v) { DownloadHelper.enqueueDownload(thmmyFile);
dialog.dismiss();
DownloadHelper.enqueueDownload(thmmyFile);
}
}); });
dialog.show(); dialog.show();
} }
@ -738,7 +722,6 @@ public abstract class BaseActivity extends AppCompatActivity {
private void startLoginActivity(){ private void startLoginActivity(){
Intent intent = new Intent(BaseActivity.this, LoginActivity.class); Intent intent = new Intent(BaseActivity.this, LoginActivity.class);
startActivity(intent); startActivity(intent);
finish();
overridePendingTransition(R.anim.push_right_in, R.anim.push_right_out); overridePendingTransition(R.anim.push_right_in, R.anim.push_right_out);
} }
} }

Write Preview
Loading…
Cancel
Save