Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/news-android.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java95
-rw-r--r--News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java41
-rw-r--r--News-Android-App/src/main/play_store.pngbin0 -> 20408 bytes
-rw-r--r--News-Android-App/src/main/res/menu/news_detail.xml1
4 files changed, 52 insertions, 85 deletions
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
index be70ae67..86878af3 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java
@@ -21,12 +21,10 @@
package de.luhmer.owncloudnewsreader;
-import android.app.Activity;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.content.pm.ResolveInfo;
-import android.graphics.drawable.Animatable;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
@@ -38,8 +36,6 @@ import android.view.Menu;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
-import android.view.Window;
-import android.view.WindowManager;
import android.widget.ProgressBar;
import androidx.appcompat.widget.AppCompatImageButton;
@@ -111,6 +107,7 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
protected @Inject SharedPreferences mPrefs;
+ private boolean mShowFastActions;
//public static final String DATABASE_IDS_OF_ITEMS = "DATABASE_IDS_OF_ITEMS";
@Override
@@ -168,35 +165,21 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
setSupportActionBar(bottomAppBar);
}
*/
-
-
//getWindow().getDecorView().setSystemUiVisibility(View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR);
dbConn = new DatabaseConnectionOrm(this);
Intent intent = getIntent();
- //long subsciption_id = -1;
- //long folder_id = -1;
int item_id = 0;
-
-
- //if(intent.hasExtra(NewsReaderDetailActivity.SUBSCRIPTION_ID))
- // subsciption_id = intent.getExtras().getLong(NewsReaderDetailActivity.SUBSCRIPTION_ID);
- //if(intent.hasExtra(NewsReaderDetailActivity.FOLDER_ID))
- // folder_id = intent.getExtras().getLong(NewsReaderDetailActivity.FOLDER_ID);
- if(intent.hasExtra(NewsReaderListActivity.ITEM_ID))
+ if(intent.hasExtra(NewsReaderListActivity.ITEM_ID)) {
item_id = intent.getExtras().getInt(NewsReaderListActivity.ITEM_ID);
- if(intent.hasExtra(NewsReaderListActivity.TITEL))
- getSupportActionBar().setTitle(intent.getExtras().getString(NewsReaderListActivity.TITEL));
- //getActionBar().setTitle(intent.getExtras().getString(NewsReaderDetailActivity.TITEL));
+ }
+ if(intent.hasExtra(NewsReaderListActivity.TITLE)) {
+ getSupportActionBar().setTitle(intent.getExtras().getString(NewsReaderListActivity.TITLE));
+ }
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
- //if(intent.hasExtra(DATABASE_IDS_OF_ITEMS))
- // databaseItemIds = intent.getIntegerArrayListExtra(DATABASE_IDS_OF_ITEMS);
-
-
rssItems = dbConn.getCurrentRssItemView(-1);
//If the Activity gets started from the Widget, read the item id and get the selected index in the cursor.
@@ -235,13 +218,11 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
}
mViewPager.addOnPageChangeListener(onPageChangeListener);
- this.initFastActionBar();
+ // mBtnDisableIncognito.setOnClickListener(v -> {
+ // toggleIncognitoMode();
+ // });
- /*
- mBtnDisableIncognito.setOnClickListener(v -> {
- toggleIncognitoMode();
- });
- */
+ this.initFastActionBar();
}
@Override
@@ -258,27 +239,20 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
* author: emasty https://github.com/emasty
*/
private void initFastActionBar() {
- boolean showFastActions = mPrefs.getBoolean(SettingsActivity.CB_SHOW_FAST_ACTIONS, true);
+ mShowFastActions = mPrefs.getBoolean(SettingsActivity.CB_SHOW_FAST_ACTIONS, true);
- if (showFastActions) {
+ if (mShowFastActions) {
// Set click listener for buttons on action bar
fastActionOpenInBrowser.setOnClickListener(v -> this.openInBrowser(currentPosition));
- fastActionShare.setOnClickListener(v -> this.share(currentPosition));
- fastActionToggle.setOnClickListener(v -> this.toggleFastActionBar());
-
- RssItem rssItem = rssItems.get(currentPosition);
- boolean isStarred = rssItem.getStarred_temp();
- boolean isRead = rssItem.getRead_temp();
-
-
+ fastActionToggle.setOnClickListener(v -> this.toggleFastActionBar()); // toggle expand / collapse
fastActionStar.setOnClickListener(v -> NewsDetailActivity.this.toggleRssItemStarredState());
- fastActionStar.setImageResource(isStarred ? R.drawable.ic_action_star_dark : R.drawable.ic_action_star_border_dark);
-
-
fastActionRead.setOnClickListener(v -> NewsDetailActivity.this.markRead(currentPosition));
- fastActionRead.setImageResource(isRead ? R.drawable.ic_check_box_white : R.drawable.ic_check_box_outline_blank_white);
+ fastActionShare.setOnClickListener(v -> this.share(currentPosition));
fastActionDetailBar.setVisibility(View.VISIBLE);
+
+ // initially the bar should be opened in the expanded state
+ this.toggleFastActionBar();
} else {
fastActionDetailBar.setVisibility(View.INVISIBLE);
}
@@ -319,17 +293,6 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
}
}
- public static void setWindowFlag(Activity activity, final int bits, boolean on) {
- Window win = activity.getWindow();
- WindowManager.LayoutParams winParams = win.getAttributes();
- if (on) {
- winParams.flags |= bits;
- } else {
- winParams.flags &= ~bits;
- }
- win.setAttributes(winParams);
- }
-
@Override
protected void onDestroy() {
super.onDestroy();
@@ -342,13 +305,9 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
pageChanged(pos);
}
- @Override
- public void onPageScrolled(int arg0, float arg1, int arg2) {
- }
+ @Override public void onPageScrolled(int arg0, float arg1, int arg2) { }
- @Override
- public void onPageScrollStateChanged(int arg0) {
- }
+ @Override public void onPageScrollStateChanged(int arg0) { }
};
public static SORT_DIRECTION getSortDirectionFromSettings(SharedPreferences prefs) {
@@ -502,22 +461,32 @@ public class NewsDetailActivity extends PodcastFragmentActivity {
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.news_detail, menu);
+ MenuItem menuItem_OpenInBrowser = menu.findItem(R.id.action_openInBrowser);
+ MenuItem menuItem_ShareItem = menu.findItem(R.id.action_ShareItem);
+
menuItem_Starred = menu.findItem(R.id.action_starred);
menuItem_Read = menu.findItem(R.id.action_read);
menuItem_PlayPodcast = menu.findItem(R.id.action_playPodcast);
+ if(mShowFastActions) {
+ menuItem_Starred.setVisible(false);
+ menuItem_Read.setVisible(false);
+ menuItem_OpenInBrowser.setVisible(false);
+ menuItem_ShareItem.setVisible(false);
+ }
+
Set<String> selections = mPrefs.getStringSet("sp_news_detail_actionbar_icons", new HashSet<>());
String[] selected = selections.toArray(new String[] {});
for(String selection : selected) {
switch(selection) {
case "open_in_browser":
- menu.findItem(R.id.action_openInBrowser).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ menuItem_OpenInBrowser.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
break;
case "share":
- menu.findItem(R.id.action_ShareItem).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ menuItem_ShareItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
break;
case "podcast":
- menu.findItem(R.id.action_playPodcast).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+ menuItem_PlayPodcast.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
break;
//case "tts":
// menu.findItem(R.id.action_tts).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
index 4a625ed5..69b0802d 100644
--- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
+++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java
@@ -42,6 +42,23 @@ import android.view.View;
import android.widget.SearchView;
import android.widget.Toast;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.app.AlertDialog;
+import androidx.appcompat.widget.Toolbar;
+import androidx.core.app.ActivityCompat;
+import androidx.core.view.GravityCompat;
+import androidx.customview.widget.ViewDragHelper;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceManager;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
import com.google.android.material.snackbar.Snackbar;
import com.nextcloud.android.sso.AccountImporter;
import com.nextcloud.android.sso.api.NextcloudAPI;
@@ -68,22 +85,6 @@ import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
import javax.inject.Named;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-import androidx.appcompat.app.ActionBarDrawerToggle;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.widget.Toolbar;
-import androidx.core.app.ActivityCompat;
-import androidx.core.view.GravityCompat;
-import androidx.customview.widget.ViewDragHelper;
-import androidx.drawerlayout.widget.DrawerLayout;
-import androidx.fragment.app.DialogFragment;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.preference.PreferenceManager;
-import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
import butterknife.BindView;
import butterknife.ButterKnife;
import de.luhmer.owncloudnewsreader.ListView.SubscriptionExpandableListAdapter;
@@ -135,14 +136,11 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
private static final String TAG = NewsReaderListActivity.class.getCanonicalName();
- public static final String FOLDER_ID = "FOLDER_ID";
- public static final String FEED_ID = "FEED_ID";
public static final String ITEM_ID = "ITEM_ID";
- public static final String TITEL = "TITEL";
+ public static final String TITLE = "TITLE";
public static HashSet<Long> stayUnreadItems = new HashSet<>();
- private static MenuItem menuItemUpdater;
private static MenuItem menuItemDownloadMoreItems;
protected @BindView(R.id.toolbar) Toolbar toolbar;
@@ -703,7 +701,6 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
// Inflate the menu; this adds items to the action bar if it is present.
getMenuInflater().inflate(R.menu.news_reader, menu);
- menuItemUpdater = menu.findItem(R.id.menu_update);
menuItemDownloadMoreItems = menu.findItem(R.id.menu_downloadMoreItems);
menuItemDownloadMoreItems.setEnabled(false);
@@ -1062,7 +1059,7 @@ public class NewsReaderListActivity extends PodcastFragmentActivity implements
Intent intentNewsDetailAct = new Intent(this, NewsDetailActivity.class);
intentNewsDetailAct.putExtra(NewsReaderListActivity.ITEM_ID, position);
- intentNewsDetailAct.putExtra(NewsReaderListActivity.TITEL, getNewsReaderDetailFragment().getTitel());
+ intentNewsDetailAct.putExtra(NewsReaderListActivity.TITLE, getNewsReaderDetailFragment().getTitel());
startActivityForResult(intentNewsDetailAct, Activity.RESULT_CANCELED);
}
}
diff --git a/News-Android-App/src/main/play_store.png b/News-Android-App/src/main/play_store.png
new file mode 100644
index 00000000..a304b1b8
--- /dev/null
+++ b/News-Android-App/src/main/play_store.png
Binary files differ
diff --git a/News-Android-App/src/main/res/menu/news_detail.xml b/News-Android-App/src/main/res/menu/news_detail.xml
index 1b023ec4..6073f6ee 100644
--- a/News-Android-App/src/main/res/menu/news_detail.xml
+++ b/News-Android-App/src/main/res/menu/news_detail.xml
@@ -57,6 +57,7 @@
android:id="@+id/action_incognito_mode"
app:showAsAction="ifRoom"
android:icon="@drawable/incognito"
+ app:iconTint="@android:color/white"
android:title="Incognito Mode"/>
</menu> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-06 16:15:02 +0300