uploaded from mTHMMY";
private static final int REQUEST_CODE_CHOOSE_FILE = 8;
+ private static final int REQUEST_CODE_CAMERA = 4;
private static ArrayList
uploadRootCategories = new ArrayList<>();
- //private String currentUploadCategory = "";
private ParseUploadPageTask parseUploadPageTask;
+ private ArrayList bundleCategory;
private String categorySelected = "-1";
private String uploaderProfileIndex = "1";
private Uri fileUri;
+ private String fileIcon;
//UI elements
private MaterialProgressBar progressBar;
@@ -55,6 +67,8 @@ public class UploadActivity extends BaseActivity {
private AppCompatSpinnerWithoutDefault rootCategorySpinner;
private EditText uploadTitle;
private EditText uploadDescription;
+ private AppCompatButton titleDescriptionBuilderButton;
+ private AppCompatButton selectFileButton;
//private static AppCompatButton titleDescriptionBuilderButton;
@Override
@@ -62,13 +76,22 @@ public class UploadActivity extends BaseActivity {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_upload);
- /*Bundle extras = getIntent().getExtras();
+ Bundle extras = getIntent().getExtras();
if (extras != null) {
- //TODO auto fill category from bundle
- currentUploadCategory = extras.getString(BUNDLE_UPLOAD_CATEGORY);
- if (currentUploadCategory != null && !Objects.equals(currentUploadCategory, "")) {
+ String tmpUploadCategoryNav = extras.getString(BUNDLE_UPLOAD_CATEGORY);
+ //something like "THMMY.gr > Downloads > Βασικός Κύκλος > 3ο εξάμηνο > Ηλεκτρικά Κυκλώματα ΙΙ"
+ if (tmpUploadCategoryNav != null && !tmpUploadCategoryNav.equals("")) {
+ String[] tmpSplitUploadCategoryNav = tmpUploadCategoryNav.split(">");
+
+ for (int i = 0; i < tmpSplitUploadCategoryNav.length; ++i) {
+ tmpSplitUploadCategoryNav[i] = tmpSplitUploadCategoryNav[i].trim();
+ }
+
+ if (tmpSplitUploadCategoryNav.length > 2) {
+ bundleCategory = new ArrayList<>(Arrays.asList(tmpSplitUploadCategoryNav).subList(2, tmpSplitUploadCategoryNav.length));
+ }
}
- }*/
+ }
//Initialize toolbar
toolbar = findViewById(R.id.toolbar);
@@ -89,64 +112,91 @@ public class UploadActivity extends BaseActivity {
rootCategorySpinner = findViewById(R.id.upload_spinner_category_root);
rootCategorySpinner.setOnItemSelectedListener(new CustomOnItemSelectedListener(uploadRootCategories));
- /*titleDescriptionBuilderButton = findViewById(R.id.upload_title_description_builder);
- titleDescriptionBuilderButton.setEnabled(false);
+ titleDescriptionBuilderButton = findViewById(R.id.upload_title_description_builder);
titleDescriptionBuilderButton.setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View v) {
- //TODO some dialog?
+ public void onClick(View view) {
+ if (categorySelected.equals("-1")) {
+ Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show();
+ return;
+ }
+ //TODO else
}
- });*/
+ });
+ titleDescriptionBuilderButton.setEnabled(false);
uploadTitle = findViewById(R.id.upload_title);
uploadDescription = findViewById(R.id.upload_description);
- findViewById(R.id.upload_select_file_button).setOnClickListener(new View.OnClickListener() {
+ selectFileButton = findViewById(R.id.upload_select_file_button);
+ selectFileButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- String[] mimeTypes = {"image/jpeg", "text/html", "image/png", "image/jpg", "image/gif",
- "application/pdf", "application/rar", "application/x-tar", "application/zip",
- "application/msword", "image/vnd.djvu", "application/gz", "application/tar.gz"};
-
- Intent intent = new Intent(Intent.ACTION_GET_CONTENT)
- //.setType("*/*")
- .setType("image/jpeg")
- .putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
-
- startActivityForResult(intent, REQUEST_CODE_CHOOSE_FILE);
+ final CharSequence[] options = {"Take photo", "Choose file",
+ "Cancel"};
+ AlertDialog.Builder builder = new AlertDialog.Builder(UploadActivity.this);
+ builder.setTitle("Upload file");
+ builder.setItems(options, new DialogInterface.OnClickListener() {
+ @Override
+ public void onClick(DialogInterface dialog, int item) {
+ if (options[item].equals("Take photo")) {
+ Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
+ startActivityForResult(intent, REQUEST_CODE_CAMERA);
+ } else if (options[item].equals("Choose file")) {
+ String[] mimeTypes = {"image/jpeg", "text/html", "image/png", "image/jpg", "image/gif",
+ "application/pdf", "application/rar", "application/x-tar", "application/zip",
+ "application/msword", "image/vnd.djvu", "application/gz", "application/tar.gz"};
+
+ Intent intent = new Intent(Intent.ACTION_GET_CONTENT)
+ //.setType("*/*")
+ .setType("image/jpeg")
+ .putExtra(Intent.EXTRA_MIME_TYPES, mimeTypes);
+
+ startActivityForResult(intent, REQUEST_CODE_CHOOSE_FILE);
+ } else if (options[item].equals("Cancel")) {
+ dialog.dismiss();
+ }
+ }
+ });
+ builder.show();
}
});
findViewById(R.id.upload_upload_button).setOnClickListener(new View.OnClickListener() {
@Override
- public void onClick(View v) {
+ public void onClick(View view) {
String uploadTitleText = uploadTitle.getText().toString();
String uploadDescriptionText = uploadDescription.getText().toString();
if (uploadTitleText.equals("")) {
uploadTitle.setError("Required");
}
- if (uploadDescriptionText.equals("")) {
- uploadDescription.setError("Required");
+ if (fileUri == null) {
+ selectFileButton.setError("Required");
+ }
+ if (categorySelected.equals("-1")) {
+ Toast.makeText(view.getContext(), "Please choose category first", Toast.LENGTH_SHORT).show();
}
- /*if (categorySelected.equals("-1")){
- //TODO set error
- //rootCategorySpinner
- }*/
- if (categorySelected.equals("-1") || uploadTitleText.equals("") ||
- fileUri == null || uploadDescriptionText.equals("")) {
+ if (categorySelected.equals("-1") || uploadTitleText.equals("") || fileUri == null) {
return;
}
+ String tmpDescriptionText = uploadDescriptionText;
+
+ SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(view.getContext());
+ if (sharedPrefs.getBoolean(UPLOADING_APP_SIGNATURE_ENABLE_KEY, true)) {
+ tmpDescriptionText += uploadedFrommThmmyPromptHtml;
+ }
+
try {
- String uploadId = new MultipartUploadRequest(v.getContext(), uploadIndexUrl)
+ new MultipartUploadRequest(view.getContext(), uploadIndexUrl)
.setUtf8Charset()
.addParameter("tp-dluploadtitle", uploadTitleText)
.addParameter("tp-dluploadcat", categorySelected)
- .addParameter("tp-dluploadtext", uploadDescriptionText)
+ .addParameter("tp-dluploadtext", tmpDescriptionText)
.addFileToUpload(fileUri.toString(), "tp-dluploadfile")
- .addParameter("tp_dluploadicon", "blank.gif") //TODO auto-select this
+ .addParameter("tp_dluploadicon", fileIcon)
.addParameter("tp-uploaduser", uploaderProfileIndex)
.setNotificationConfig(new UploadNotificationConfig())
.setMaxRetries(2).startUpload();
@@ -156,7 +206,6 @@ public class UploadActivity extends BaseActivity {
}
});
-
if (uploadRootCategories.isEmpty()) {
parseUploadPageTask = new ParseUploadPageTask();
parseUploadPageTask.execute(uploadIndexUrl);
@@ -166,11 +215,28 @@ public class UploadActivity extends BaseActivity {
tmpSpinnerArray[i] = uploadRootCategories.get(i).getCategoryTitle();
}
- ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(
- BaseApplication.getInstance().getApplicationContext(),
+ ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(BaseApplication.getInstance().getApplicationContext(),
android.R.layout.simple_spinner_dropdown_item, tmpSpinnerArray);
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
rootCategorySpinner.setAdapter(spinnerArrayAdapter);
+
+ //Sets bundle selection
+ if (bundleCategory != null) {
+ int bundleSelectionIndex = -1, currentIndex = 0;
+ for (UploadCategory category : uploadRootCategories) {
+ if (category.getCategoryTitle().contains(bundleCategory.get(0))) { //TODO fix .contains, always false
+ bundleSelectionIndex = currentIndex;
+ break;
+ }
+ ++currentIndex;
+ }
+
+ if (bundleSelectionIndex != -1) {
+ rootCategorySpinner.setSelection(bundleSelectionIndex, true);
+ }
+ }
+
+ titleDescriptionBuilderButton.setEnabled(true);
}
}
@@ -199,19 +265,65 @@ public class UploadActivity extends BaseActivity {
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == REQUEST_CODE_CHOOSE_FILE && data != null) {
- //TODO upload the correct file
- //Check this https://stackoverflow.com/questions/5568874/how-to-extract-the-file-name-from-uri-returned-from-intent-action-get-content/25005243
fileUri = data.getData();
+ if (fileUri != null) {
+ String filename = filenameFromUri(fileUri);
+ selectFileButton.setText(filename);
+
+ filename = filename.toLowerCase();
+ if (filename.endsWith(".jpg")) {
+ fileIcon = "jpg_image.gif";
+ } else if (filename.endsWith(".gif")) {
+ fileIcon = "gif_image.gif";
+ } else if (filename.endsWith(".png")) {
+ fileIcon = "png_image.gif";
+ } else if (filename.endsWith(".html") || filename.endsWith(".htm")) {
+ fileIcon = "html_file.gif";
+ } else if (filename.endsWith(".pdf") || filename.endsWith(".doc") ||
+ filename.endsWith("djvu")) {
+ fileIcon = "text_file.gif";
+ } else if (filename.endsWith(".zip") || filename.endsWith(".rar") ||
+ filename.endsWith(".tar") || filename.endsWith(".tar.gz") ||
+ filename.endsWith(".gz")) {
+ fileIcon = "archive.gif";
+ } else {
+ fileIcon = "blank.gif";
+ }
+ }
+ } else if (requestCode == REQUEST_CODE_CAMERA && data != null) {
+ //TODO
} else {
super.onActivityResult(requestCode, resultCode, data);
}
}
+ @NonNull
+ private String filenameFromUri(Uri uri) {
+ String filename = null;
+ if (uri.getScheme().equals("content")) {
+ try (Cursor cursor = getContentResolver().query(uri, null, null, null, null)) {
+ if (cursor != null && cursor.moveToFirst()) {
+ filename = cursor.getString(cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME));
+ }
+ }
+ }
+ if (filename == null) {
+ filename = uri.getPath();
+ int cut = filename.lastIndexOf('/');
+ if (cut != -1) {
+ filename = filename.substring(cut + 1);
+ }
+ }
+
+ return filename;
+ }
+
private class CustomOnItemSelectedListener implements AdapterView.OnItemSelectedListener {
private ArrayList parentCategories, childCategories;
+ // Suppresses default constructor
+ @SuppressWarnings("unused")
private CustomOnItemSelectedListener() {
- //Disable default constructor
}
CustomOnItemSelectedListener(ArrayList parentCategories) {
@@ -220,7 +332,7 @@ public class UploadActivity extends BaseActivity {
@Override
public void onItemSelected(AdapterView parent, View view, int position, long id) {
- //Removes old, unneeded sub categories spinner(s)
+ //Removes old, unneeded sub-category spinner(s)
int viewIndex = categoriesSpinners.indexOfChild((AppCompatSpinnerWithoutDefault) view.getParent());
if (viewIndex + 1 != categoriesSpinners.getChildCount()) { //Makes sure this is not the last child
@@ -229,7 +341,7 @@ public class UploadActivity extends BaseActivity {
categorySelected = parentCategories.get(position).getValue();
- //Adds new sub categories spinner
+ //Adds new sub-category spinner
if (parentCategories.get(position).hasSubCategories()) {
childCategories = parentCategories.get(position).getSubCategories();
@@ -243,12 +355,27 @@ public class UploadActivity extends BaseActivity {
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
AppCompatSpinnerWithoutDefault subSpinner = new AppCompatSpinnerWithoutDefault(categoriesSpinners.getContext());
- subSpinner.setPromptId(R.string.upload_spinners_prompt);
+ subSpinner.setPromptId(R.string.upload_spinners_hint);
subSpinner.setPopupBackgroundResource(R.color.primary);
subSpinner.setAdapter(spinnerArrayAdapter);
subSpinner.setOnItemSelectedListener(new CustomOnItemSelectedListener(childCategories));
-
categoriesSpinners.addView(subSpinner);
+
+ //Sets bundle selection
+ if (bundleCategory != null && viewIndex < bundleCategory.size()) {
+ int bundleSelectionIndex = -1, currentIndex = 0;
+ for (UploadCategory category : parentCategories) {
+ if (category.getCategoryTitle().contains(bundleCategory.get(viewIndex))) {
+ bundleSelectionIndex = currentIndex;
+ break;
+ }
+ ++currentIndex;
+ }
+
+ if (bundleSelectionIndex != -1) {
+ subSpinner.setSelection(bundleSelectionIndex, true);
+ }
+ }
}
}
@@ -320,13 +447,28 @@ public class UploadActivity extends BaseActivity {
tmpSpinnerArray[i] = uploadRootCategories.get(i).getCategoryTitle();
}
- ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(
- BaseApplication.getInstance().getApplicationContext(),
+ ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(BaseApplication.getInstance().getApplicationContext(),
android.R.layout.simple_spinner_dropdown_item, tmpSpinnerArray);
spinnerArrayAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
rootCategorySpinner.setAdapter(spinnerArrayAdapter);
- //titleDescriptionBuilderButton.setEnabled(true);
+ //Sets bundle selection
+ if (bundleCategory != null) {
+ int bundleSelectionIndex = -1, currentIndex = 0;
+ for (UploadCategory category : uploadRootCategories) {
+ if (category.getCategoryTitle().contains(bundleCategory.get(0))) { //TODO fix .contains, always false
+ bundleSelectionIndex = currentIndex;
+ break;
+ }
+ ++currentIndex;
+ }
+
+ if (bundleSelectionIndex != -1) {
+ rootCategorySpinner.setSelection(bundleSelectionIndex, true);
+ }
+ }
+
+ titleDescriptionBuilderButton.setEnabled(true);
progressBar.setVisibility(ProgressBar.GONE);
}
}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
index 836efc31..8958de5e 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/downloads/DownloadsActivity.java
@@ -8,6 +8,7 @@ import android.support.design.widget.FloatingActionButton;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
+import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
@@ -48,6 +49,7 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
public static final String BUNDLE_DOWNLOADS_TITLE = "DOWNLOADS_TITLE";
private static final String downloadsIndexUrl = "https://www.thmmy.gr/smf/index.php?action=tpmod;dl;";
private String downloadsUrl;
+ private String downloadsNav;
private String downloadsTitle;
private final ArrayList parsedDownloads = new ArrayList<>();
@@ -143,8 +145,8 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
case R.id.menu_upload:
Intent intent = new Intent(DownloadsActivity.this, UploadActivity.class);
Bundle extras = new Bundle();
- /*extras.putString(BUNDLE_UPLOAD_CATEGORY, "");
- intent.putExtras(extras);*/
+ extras.putString(BUNDLE_UPLOAD_CATEGORY, downloadsNav);
+ intent.putExtras(extras);
startActivity(intent);
return true;
default:
@@ -211,8 +213,11 @@ public class DownloadsActivity extends BaseActivity implements DownloadsAdapter.
@Override
protected void parse(Document downloadPage) throws ParseException {
try {
+ Element downloadsNavElement = downloadPage.select("div.nav").first();
+ downloadsNav = downloadsNavElement.text();
+
if (downloadsTitle == null || Objects.equals(downloadsTitle, ""))
- downloadsTitle = downloadPage.select("div.nav>b>a.nav").last().text();
+ downloadsTitle = downloadsNavElement.select("b>a.nav").last().text();
//Removes loading item
if (isLoadingMore) {
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
index 3e6f86cb..59d686a6 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/main/MainActivity.java
@@ -84,7 +84,11 @@ public class MainActivity extends BaseActivity implements RecentFragment.RecentF
tabLayout.setupWithViewPager(viewPager);
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- tabLayout.getTabAt(Integer.parseInt(sharedPrefs.getString(DEFAULT_HOME_TAB, "0"))).select();
+ int preferredTab = Integer.parseInt(sharedPrefs.getString(DEFAULT_HOME_TAB, "0"));
+ if (preferredTab != 3 || sessionManager.isLoggedIn()) {
+ tabLayout.getTabAt(preferredTab).select();
+ }
+
setMainActivity(this);
}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java
index b57d2c0d..0f44a511 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsActivity.java
@@ -11,9 +11,10 @@ public class SettingsActivity extends BaseActivity {
public static final String DEFAULT_HOME_TAB = "pref_app_main_default_tab_key";
public static final String NOTIFICATION_LED_KEY = "pref_notification_led_enable_key";
public static final String NOTIFICATION_VIBRATION_KEY = "pref_notification_vibration_enable_key";
- public static final String APP_SIGNATURE_ENABLE_KEY = "pref_posting_app_signature_enable_key";
+ public static final String POSTING_APP_SIGNATURE_ENABLE_KEY = "pref_posting_app_signature_enable_key";
+ public static final String UPLOADING_APP_SIGNATURE_ENABLE_KEY = "pref_uploading_app_signature_enable_key";
- private Fragment preferenceFragment;
+ private SettingsFragment preferenceFragment;
@Override
protected void onCreate(Bundle savedInstanceState) {
@@ -42,6 +43,8 @@ public class SettingsActivity extends BaseActivity {
protected void onResume() {
drawer.setSelection(SETTINGS_ID);
super.onResume();
- ((SettingsFragment) preferenceFragment).updateUserLoginState(sessionManager.isLoggedIn());
+ if (preferenceFragment != null) {
+ preferenceFragment.updateUserLoginState(sessionManager.isLoggedIn());
+ }
}
}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java b/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java
index c0cf9c3b..19a47dd1 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/settings/SettingsFragment.java
@@ -22,10 +22,12 @@ public class SettingsFragment extends PreferenceFragmentCompat {
public static final String ARG_IS_LOGGED_IN = "selectedRingtoneKey";
//Preferences xml keys
- private static final String POSTING_CATEGORY = "pref_category_posting_key";
private static final String DEFAULT_HOME_TAB = "pref_app_main_default_tab_key";
- private static final String POSTING_APP_SIGNATURE_ENABLE = "pref_posting_app_signature_enable_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_APP_SIGNATURE_ENABLE = "pref_posting_app_signature_enable_key";
+ private static final String UPLOADING_CATEGORY = "pref_category_uploading_key";
+ private static final String UPLOADING_APP_SIGNATURE_ENABLE = "pref_uploading_app_signature_enable_key";
//SharedPreferences keys
private static final int REQUEST_CODE_ALERT_RINGTONE = 2;
@@ -79,6 +81,9 @@ public class SettingsFragment extends PreferenceFragmentCompat {
findPreference(POSTING_CATEGORY).setVisible(isLoggedIn);
findPreference(POSTING_APP_SIGNATURE_ENABLE).setVisible(isLoggedIn);
+ findPreference(UPLOADING_CATEGORY).setVisible(isLoggedIn);
+ findPreference(UPLOADING_APP_SIGNATURE_ENABLE).setVisible(isLoggedIn);
+
if (!isLoggedIn && defaultHomeTabEntries.contains("Unread")) {
defaultHomeTabEntries.remove("Unread");
defaultHomeTabValues.remove("2");
@@ -148,6 +153,12 @@ public class SettingsFragment extends PreferenceFragmentCompat {
public void updateUserLoginState(boolean isLoggedIn) {
this.isLoggedIn = isLoggedIn;
+ findPreference(POSTING_CATEGORY).setVisible(isLoggedIn);
+ findPreference(POSTING_APP_SIGNATURE_ENABLE).setVisible(isLoggedIn);
+
+ findPreference(UPLOADING_CATEGORY).setVisible(isLoggedIn);
+ findPreference(UPLOADING_APP_SIGNATURE_ENABLE).setVisible(isLoggedIn);
+
if (!isLoggedIn && defaultHomeTabEntries.contains("Unread")) {
defaultHomeTabEntries.remove("Unread");
defaultHomeTabValues.remove("2");
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
index f5747998..041c26a6 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicActivity.java
@@ -222,7 +222,7 @@ public class TopicActivity extends BaseActivity {
if (sessionManager.isLoggedIn()) {
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- includeAppSignaturePreference = sharedPrefs.getBoolean(SettingsActivity.APP_SIGNATURE_ENABLE_KEY, true);
+ includeAppSignaturePreference = sharedPrefs.getBoolean(SettingsActivity.POSTING_APP_SIGNATURE_ENABLE_KEY, true);
}
thisPageBookmark = new Bookmark(topicTitle, ThmmyPage.getTopicId(topicPageUrl), true);
@@ -316,7 +316,7 @@ public class TopicActivity extends BaseActivity {
topicMenuBookmarkClick();
return true;
case R.id.menu_info:
- AlertDialog.Builder builder = new AlertDialog.Builder(this);
+ AlertDialog.Builder builder = new AlertDialog.Builder(this, R.style.AppCompatAlertDialogStyleAccent);
LayoutInflater inflater = this.getLayoutInflater();
LinearLayout infoDialog = (LinearLayout) inflater.inflate(R.layout.dialog_topic_info
, null);
@@ -368,7 +368,7 @@ public class TopicActivity extends BaseActivity {
if (sessionManager.isLoggedIn()) {
SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(this);
- includeAppSignaturePreference = sharedPrefs.getBoolean(SettingsActivity.APP_SIGNATURE_ENABLE_KEY, true);
+ includeAppSignaturePreference = sharedPrefs.getBoolean(SettingsActivity.POSTING_APP_SIGNATURE_ENABLE_KEY, true);
}
}
@@ -559,7 +559,6 @@ public class TopicActivity extends BaseActivity {
topicTask = new TopicTask();
topicTask.execute(pagesUrls.get(pageRequested)); //Attempt data parsing
-
}
}
diff --git a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
index 27002423..faad57b6 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/base/BaseActivity.java
@@ -16,6 +16,7 @@ import android.support.design.widget.BottomSheetDialog;
import android.support.v4.content.ContextCompat;
import android.support.v4.content.FileProvider;
import android.support.v7.app.AppCompatActivity;
+import android.support.v7.preference.PreferenceManager;
import android.support.v7.widget.Toolbar;
import android.view.MenuItem;
import android.view.View;
@@ -63,7 +64,9 @@ import static gr.thmmy.mthmmy.activities.downloads.DownloadsActivity.BUNDLE_DOWN
import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_THUMBNAIL_URL;
import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_URL;
import static gr.thmmy.mthmmy.activities.profile.ProfileActivity.BUNDLE_PROFILE_USERNAME;
+import static gr.thmmy.mthmmy.activities.settings.SettingsActivity.DEFAULT_HOME_TAB;
import static gr.thmmy.mthmmy.services.DownloadHelper.SAVE_DIR;
+import static gr.thmmy.mthmmy.session.SessionManager.SUCCESS;
import static gr.thmmy.mthmmy.utils.FileUtils.getMimeType;
public abstract class BaseActivity extends AppCompatActivity {
@@ -469,6 +472,14 @@ public abstract class BaseActivity extends AppCompatActivity {
}
protected void onPostExecute(Integer result) {
+ if (result == SUCCESS) {
+ SharedPreferences sharedPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+ if (sharedPrefs.getString(DEFAULT_HOME_TAB, "0").equals("2")) {
+ SharedPreferences.Editor editor = sharedPrefs.edit();
+ editor.putString(DEFAULT_HOME_TAB, "0").apply();
+ }
+ }
+
updateDrawer();
if (mainActivity != null)
mainActivity.updateTabs();
@@ -645,7 +656,7 @@ public abstract class BaseActivity extends AppCompatActivity {
return true;
}
- //Display popup gor user to grant permission
+ //Display popup for user to grant permission
private void requestPerms() { //Runtime permissions request for devices with API >= 23
if (Build.VERSION.SDK_INT > Build.VERSION_CODES.LOLLIPOP_MR1) {
String[] PERMISSIONS_STORAGE = {
diff --git a/app/src/main/res/layout/activity_upload.xml b/app/src/main/res/layout/activity_upload.xml
index 58bd56ce..43e17fad 100644
--- a/app/src/main/res/layout/activity_upload.xml
+++ b/app/src/main/res/layout/activity_upload.xml
@@ -65,7 +65,7 @@
android:layout_marginBottom="6dp"
android:layout_marginTop="6dp"
android:popupBackground="@color/primary"
- android:prompt="@string/upload_spinners_prompt" />
+ android:prompt="@string/upload_spinners_hint" />
-
-
-
-
-
+
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6863be1d..628b2a36 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -17,7 +17,6 @@
- @style/AppCompatAlertDialogStyle
- true
- - @style/PopupMenuStyle
-
+
+
+
+