add file history shortcut to file menu

This commit is contained in:
k0shk0sh 2019-12-27 21:05:16 +01:00
parent 463e19c4bf
commit dc537bc294
6 changed files with 34 additions and 27 deletions

View File

@ -14,22 +14,6 @@
}
},
"oauth_client": [
{
"client_id": "535903042804-ubkic52fte5tpoe62q6k1m4h0pbcjp9c.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.fastaccess.github.debug",
"certificate_hash": "42b1ddc5872bd156a90e2aebc94ee149a30f0ef3"
}
},
{
"client_id": "535903042804-asaj9vcag2pbb0c170p5ll53ovpab02q.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.fastaccess.github.debug",
"certificate_hash": "c12fc4581dd11d64717548d8480ba537fc835893"
}
},
{
"client_id": "535903042804-14481m7poceb7ojv5roddqm28pg4ch5n.apps.googleusercontent.com",
"client_type": 3

View File

@ -317,10 +317,6 @@
</intent-filter>
</service>
<meta-data
android:name="io.fabric.ApiKey"
android:value="6ed82b6e0756853d7d782a3f547f84f9ecba217e" />
<meta-data
android:name="com.google.firebase.messaging.default_notification_icon"
android:resource="@drawable/ic_notification" />

View File

@ -3,11 +3,18 @@ package com.fastaccess.ui.modules.main;
import android.content.Intent;
import android.graphics.Typeface;
import android.os.Bundle;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.fastaccess.BuildConfig;
import com.fastaccess.helper.Logger;
import com.google.android.gms.tasks.OnSuccessListener;
import com.google.android.material.floatingactionbutton.FloatingActionButton;
import androidx.fragment.app.FragmentManager;
import androidx.core.view.GravityCompat;
import android.view.Menu;
import android.view.MenuItem;
import android.widget.Toast;
@ -29,6 +36,8 @@ import com.fastaccess.ui.modules.notification.NotificationActivity;
import com.fastaccess.ui.modules.search.SearchActivity;
import com.fastaccess.ui.modules.settings.SlackBottomSheetDialog;
import com.fastaccess.ui.modules.user.UserPagerActivity;
import com.google.firebase.iid.FirebaseInstanceId;
import com.google.firebase.iid.InstanceIdResult;
import butterknife.BindView;
import butterknife.OnClick;
@ -72,6 +81,13 @@ public class MainActivity extends BaseActivity<MainMvp.View, MainPresenter> impl
new SlackBottomSheetDialog().show(getSupportFragmentManager(), SlackBottomSheetDialog.TAG);
}
}
if (BuildConfig.DEBUG) {
FirebaseInstanceId.getInstance().getInstanceId().addOnSuccessListener(o -> {
Logger.e(o.getId(), o.getToken());
});
}
getPresenter().setEnterprise(PrefGetter.isEnterprise());
selectHome(false);
hideShowShadow(navType == MainMvp.FEEDS);

View File

@ -115,6 +115,7 @@ public class RepoFilesFragment extends BaseFragment<RepoFilesMvp.View, RepoFiles
boolean canOpen = canOpen(item);
popup.getMenu().findItem(R.id.editFile).setVisible(isOwner && item.getType() == FilesType.file && canOpen);
popup.getMenu().findItem(R.id.deleteFile).setVisible(isOwner && item.getType() == FilesType.file);
popup.getMenu().findItem(R.id.history).setVisible(true);
popup.setOnMenuItemClickListener(item1 -> {
switch (item1.getItemId()) {
case R.id.share:
@ -147,6 +148,9 @@ public class RepoFilesFragment extends BaseFragment<RepoFilesMvp.View, RepoFiles
PremiumActivity.Companion.startActivity(getContext());
}
break;
case R.id.history:
getPresenter().onItemLongClick(position, v, item);
break;
}
return true;
});
@ -178,7 +182,7 @@ public class RepoFilesFragment extends BaseFragment<RepoFilesMvp.View, RepoFiles
adapter = new RepoFilesAdapter(getPresenter().getFiles());
adapter.setListener(getPresenter());
recycler.setAdapter(adapter);
fastScroller.attachRecyclerView(recycler);
fastScroller.setVisibility(View.GONE);
}
@Override public void showProgress(@StringRes int resId) {

View File

@ -1,38 +1,44 @@
<?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">
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/editFile"
android:icon="@drawable/ic_edit"
android:title="@string/edit"
android:visible="false"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/deleteFile"
android:icon="@drawable/ic_trash"
android:title="@string/delete"
android:visible="false"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/download"
android:icon="@drawable/ic_download"
android:title="@string/download"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/share"
android:icon="@drawable/ic_share"
android:title="@string/share"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/copy"
android:icon="@drawable/ic_copy"
android:title="@string/copy"
app:showAsAction="ifRoom"/>
app:showAsAction="ifRoom" />
<item
android:id="@+id/history"
android:icon="@drawable/ic_time"
android:title="@string/file_history"
android:visible="false" />
</menu>

View File

@ -604,4 +604,5 @@
<string name="commit_file_required">No file changes</string>
<string name="send_feedback">Send feedback</string>
<string name="private_wiki_error_msg">Unfortunately we cannot access private repos wiki</string>
<string name="file_history">File History</string>
</resources>