- * This is guaranteed to only be called when a position changes and the - * current item of the pager has already been updated to the given position - *

- * Sub-classes may override this method - * - * @param position - */ - protected void setCurrentItem(final int position) { - // Intentionally left blank - } - - private void updateCurrentItem(final int newPosition) { - if (newPosition > -1 && newPosition < adapter.getCount()) { - pager.setItem(newPosition); - setCurrentItem(newPosition); - } - } - - private void createPager() { - adapter = createAdapter(); - invalidateOptionsMenu(); - pager.setAdapter(adapter); - } - - public void updateTabs() { - slidingTabsLayout.setupWithViewPager(pager); - } - - /** - * Configure tabs and pager - */ - protected void configureTabPager() { - if (adapter == null) { - createPager(); - updateTabs(); - } - } - - @Override - protected void onPostCreate(@Nullable Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - - pager.addOnPageChangeListener(this); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - pager.removeOnPageChangeListener(this); - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/TabPagerActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/TabPagerActivity.kt new file mode 100644 index 000000000..bc4d8b0b6 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/TabPagerActivity.kt @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui + +import android.os.Bundle +import android.view.View +import android.widget.TabHost.OnTabChangeListener +import android.widget.TabHost.TabContentFactory +import androidx.annotation.Nullable +import androidx.viewpager.widget.PagerAdapter +import kotlinx.android.synthetic.main.pager_with_tabs.* + +/** + * Activity with tabbed pages + * + * @param + */ +abstract class TabPagerActivity : + PagerActivity(), + OnTabChangeListener, + TabContentFactory + where V : PagerAdapter, V : FragmentProvider { + + /** + * Pager adapter + */ + protected var adapter: V? = null + + override fun onTabChanged(tabId: String) {} + + override fun createTabContent(tag: String): View { + val view = View(application) + view.visibility = View.GONE + return view + } + + /** + * Create pager adapter + * + * @return pager adapter + */ + protected abstract fun createAdapter(): V + + /** + * Get title for position + * + * @param position + * @return title + */ + protected open fun getTitle(position: Int): String { + return adapter!!.getPageTitle(position).toString() + } + + /** + * Get icon for position + * + * @param position + * @return icon + */ + protected open fun getIcon(position: Int): String? { + return null + } + + /** + * Set tab and pager as gone or visible + * + * @param gone + * @return this activity + */ + protected fun setGone(gone: Boolean): TabPagerActivity { + if (gone) { + sliding_tabs_layout.visibility = View.GONE + vp_pages.visibility = View.GONE + } else { + sliding_tabs_layout.visibility = View.VISIBLE + vp_pages.visibility = View.VISIBLE + } + return this + } + + /** + * Set current item to new position + * + * + * This is guaranteed to only be called when a position changes and the + * current item of the pager has already been updated to the given position + * + * + * Sub-classes may override this method + * + * @param position + */ + protected open fun setCurrentItem(position: Int) { + // Intentionally left blank + } + + private fun updateCurrentItem(newPosition: Int) { + if (newPosition > -1 && newPosition < adapter!!.count) { + vp_pages.setItem(newPosition) + setCurrentItem(newPosition) + } + } + + private fun createPager() { + adapter = createAdapter() + invalidateOptionsMenu() + vp_pages.adapter = adapter + } + + private fun updateTabs() { + sliding_tabs_layout.setupWithViewPager(vp_pages) + } + + /** + * Configure tabs and pager + */ + protected fun configureTabPager() { + if (adapter == null) { + createPager() + updateTabs() + } + } + + override fun onPostCreate(@Nullable savedInstanceState: Bundle?) { + super.onPostCreate(savedInstanceState) + + vp_pages.addOnPageChangeListener(this) + } + + override fun onDestroy() { + super.onDestroy() + vp_pages.removeOnPageChangeListener(this) + } + + override fun getProvider(): FragmentProvider? { + return adapter + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.java b/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.java deleted file mode 100644 index be073855f..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.java +++ /dev/null @@ -1,174 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package com.github.pockethub.android.ui; - -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; -import com.google.android.material.tabs.TabLayout; -import androidx.viewpager.widget.PagerAdapter; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -import com.github.pockethub.android.R; - -import butterknife.BindView; - -import static android.widget.TabHost.OnTabChangeListener; -import static android.widget.TabHost.TabContentFactory; - -public abstract class TabPagerFragment - extends PagerFragment implements OnTabChangeListener, TabContentFactory { - - - /** - * View pager - */ - @BindView(R.id.vp_pages) - protected ViewPager pager; - - /** - * Tab host - */ - @BindView(R.id.sliding_tabs_layout) - protected TabLayout slidingTabsLayout; - - /** - * Pager adapter - */ - protected V adapter; - - @Override - public void onTabChanged(String tabId) { - } - - @Override - public View createTabContent(String tag) { - View view = new View(getActivity().getApplication()); - view.setVisibility(View.GONE); - return view; - } - - /** - * Create pager adapter - * - * @return pager adapter - */ - protected abstract V createAdapter(); - - /** - * Get title for position - * - * @param position - * @return title - */ - protected String getTitle(final int position) { - return adapter.getPageTitle(position).toString(); - } - - /** - * Get icon for position - * - * @param position - * @return icon - */ - protected String getIcon(final int position) { - return null; - } - - /** - * Set tab and pager as gone or visible - * - * @param gone - * @return this activity - */ - protected TabPagerFragment setGone(boolean gone) { - if (gone) { - slidingTabsLayout.setVisibility(View.GONE); - pager.setVisibility(View.GONE); - } else { - slidingTabsLayout.setVisibility(View.VISIBLE); - pager.setVisibility(View.VISIBLE); - } - return this; - } - - /** - * Set current item to new position - *

- * This is guaranteed to only be called when a position changes and the - * current item of the pager has already been updated to the given position - *

- * Sub-classes may override this method - * - * @param position - */ - protected void setCurrentItem(final int position) { - // Intentionally left blank - } - - /** - * Get content view to be used when {@link #onCreate(Bundle)} is called - * - * @return layout resource id - */ - protected int getContentView() { - return R.layout.pager_with_tabs; - } - - private void createPager() { - adapter = createAdapter(); - getActivity().supportInvalidateOptionsMenu(); - pager.setAdapter(adapter); - slidingTabsLayout.setupWithViewPager(pager); - } - - /** - * Configure tabs and pager - */ - protected void configureTabPager() { - createPager(); - } - - @Override - public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, - @Nullable Bundle savedInstanceState) { - return inflater.inflate(getContentView(), null); - } - - @Override - public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - setHasOptionsMenu(true); - view.findViewById(R.id.toolbar).setVisibility(View.GONE); - - pager.addOnPageChangeListener(this); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - pager.removeOnPageChangeListener(this); - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } - -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.kt new file mode 100644 index 000000000..c3e61009b --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/TabPagerFragment.kt @@ -0,0 +1,156 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.github.pockethub.android.ui + +import android.os.Bundle +import androidx.viewpager.widget.PagerAdapter +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +import com.github.pockethub.android.R + +import android.widget.TabHost.OnTabChangeListener +import android.widget.TabHost.TabContentFactory +import kotlinx.android.synthetic.main.pager_with_tabs.* + +abstract class TabPagerFragment : + PagerFragment(), + OnTabChangeListener, + TabContentFactory + where V : PagerAdapter, V : FragmentProvider { + + /** + * Pager adapter + */ + protected lateinit var adapter: V + + /** + * Get content view to be used when [.onCreate] is called + * + * @return layout resource id + */ + protected val contentView: Int + get() = R.layout.pager_with_tabs + + override fun onTabChanged(tabId: String) {} + + override fun createTabContent(tag: String): View { + val view = View(activity!!.application) + view.visibility = View.GONE + return view + } + + /** + * Create pager adapter + * + * @return pager adapter + */ + protected abstract fun createAdapter(): V + + /** + * Get title for position + * + * @param position + * @return title + */ + protected fun getTitle(position: Int): String { + return adapter.getPageTitle(position).toString() + } + + /** + * Get icon for position + * + * @param position + * @return icon + */ + protected open fun getIcon(position: Int): String? { + return null + } + + /** + * Set tab and pager as gone or visible + * + * @param gone + * @return this activity + */ + protected fun setGone(gone: Boolean): TabPagerFragment { + if (gone) { + sliding_tabs_layout.visibility = View.GONE + vp_pages.visibility = View.GONE + } else { + sliding_tabs_layout.visibility = View.VISIBLE + vp_pages.visibility = View.VISIBLE + } + return this + } + + /** + * Set current item to new position + * + * + * This is guaranteed to only be called when a position changes and the + * current item of the pager has already been updated to the given position + * + * + * Sub-classes may override this method + * + * @param position + */ + protected fun setCurrentItem(position: Int) { + // Intentionally left blank + } + + private fun createPager() { + adapter = createAdapter() + activity!!.invalidateOptionsMenu() + vp_pages.adapter = adapter + sliding_tabs_layout.setupWithViewPager(vp_pages) + } + + /** + * Configure tabs and pager + */ + protected fun configureTabPager() { + createPager() + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + return inflater.inflate(contentView, null) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + setHasOptionsMenu(true) + view.findViewById(R.id.toolbar).visibility = View.GONE + + vp_pages.addOnPageChangeListener(this) + } + + override fun onDestroyView() { + super.onDestroyView() + vp_pages.removeOnPageChangeListener(this) + } + + override fun getProvider(): FragmentProvider { + return adapter + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/base/BaseFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/base/BaseFragment.kt index 1cb10d5c6..863e94211 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/base/BaseFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/base/BaseFragment.kt @@ -16,19 +16,11 @@ package com.github.pockethub.android.ui.base -import android.os.Bundle import android.os.Parcelable -import android.view.View -import butterknife.ButterKnife import dagger.android.support.DaggerFragment abstract class BaseFragment : DaggerFragment() { - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - ButterKnife.bind(this, view) - } - /** * Get parcelable extra from activity's intent */ diff --git a/app/src/main/java/com/github/pockethub/android/ui/code/RepositoryCodeFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/code/RepositoryCodeFragment.kt index 3d372ccf3..a168fe32e 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/code/RepositoryCodeFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/code/RepositoryCodeFragment.kt @@ -24,14 +24,10 @@ import android.view.MenuInflater import android.view.MenuItem import android.view.View import android.view.ViewGroup -import android.widget.ProgressBar -import android.widget.TextView import androidx.core.text.bold import androidx.core.text.buildSpannedString import androidx.core.text.color import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import butterknife.BindView import com.github.pockethub.android.Intents.EXTRA_REPOSITORY import com.github.pockethub.android.R import com.github.pockethub.android.RequestCodes.REF_UPDATE @@ -60,6 +56,8 @@ import com.xwray.groupie.Section import com.xwray.groupie.ViewHolder import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_repo_code.* +import kotlinx.android.synthetic.main.ref_footer.* import java.util.LinkedList /** @@ -67,21 +65,6 @@ import java.util.LinkedList */ class RepositoryCodeFragment : BaseFragment(), OnItemClickListener, DialogResultListener { - @BindView(R.id.list) - lateinit var recyclerView: RecyclerView - - @BindView(R.id.pb_loading) - lateinit var progressView: ProgressBar - - @BindView(R.id.tv_branch_icon) - lateinit var branchIconView: TextView - - @BindView(R.id.tv_branch) - lateinit var branchView: TextView - - @BindView(R.id.rl_branch) - lateinit var branchFooterView: View - private val adapter = GroupAdapter() private val mainSection = Section() @@ -134,13 +117,13 @@ class RepositoryCodeFragment : BaseFragment(), OnItemClickListener, DialogResult private fun showLoading(loading: Boolean) { if (loading) { - progressView.visibility = View.VISIBLE - recyclerView.visibility = View.GONE - branchFooterView.visibility = View.GONE + pb_loading.visibility = View.VISIBLE + list.visibility = View.GONE + rl_branch.visibility = View.GONE } else { - progressView.visibility = View.GONE - recyclerView.visibility = View.VISIBLE - branchFooterView.visibility = View.VISIBLE + pb_loading.visibility = View.GONE + list.visibility = View.VISIBLE + rl_branch.visibility = View.VISIBLE } } @@ -215,10 +198,10 @@ class RepositoryCodeFragment : BaseFragment(), OnItemClickListener, DialogResult override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) - recyclerView.layoutManager = LinearLayoutManager(activity) - recyclerView.adapter = adapter + list.layoutManager = LinearLayoutManager(activity) + list.adapter = adapter - branchFooterView.setOnClickListener { _ -> switchBranches() } + rl_branch.setOnClickListener { _ -> switchBranches() } mainSection.setHeader(PathHeaderItem("")) } @@ -243,11 +226,11 @@ class RepositoryCodeFragment : BaseFragment(), OnItemClickListener, DialogResult showLoading(false) - branchView.text = tree!!.branch + tv_branch.text = tree!!.branch if (RefUtils.isTag(tree.reference)) { - branchIconView.setText(R.string.icon_tag) + tv_branch_icon.setText(R.string.icon_tag) } else { - branchIconView.setText(R.string.icon_fork) + tv_branch_icon.setText(R.string.icon_fork) } if (folder.entry != null) { @@ -322,10 +305,10 @@ class RepositoryCodeFragment : BaseFragment(), OnItemClickListener, DialogResult if (item is BlobItem) { val entry = item.file startActivity(BranchFileViewActivity.createIntent( - repository, + repository!!, tree!!.branch, - entry.entry.path(), - entry.entry.sha() + entry.entry.path()!!, + entry.entry.sha()!! )) } else if (item is FolderItem) { val folder = item.folder diff --git a/app/src/main/java/com/github/pockethub/android/ui/comment/CreateCommentActivity.java b/app/src/main/java/com/github/pockethub/android/ui/comment/CreateCommentActivity.java index 9ba2399db..e28c193a0 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/comment/CreateCommentActivity.java +++ b/app/src/main/java/com/github/pockethub/android/ui/comment/CreateCommentActivity.java @@ -60,7 +60,7 @@ protected void onPostCreate(@Nullable Bundle savedInstanceState) { @Override public void onPageSelected(int position) { super.onPageSelected(position); - adapter.setCurrentItem(position); + getAdapter().setCurrentItem(position); } @Override @@ -68,8 +68,8 @@ public void invalidateOptionsMenu() { super.invalidateOptionsMenu(); if (applyItem != null) { - applyItem.setEnabled(adapter != null - && !TextUtils.isEmpty(adapter.getCommentText())); + applyItem.setEnabled(getAdapter() != null + && !TextUtils.isEmpty(getAdapter().getCommentText())); } } @@ -77,7 +77,7 @@ public void invalidateOptionsMenu() { protected void setCurrentItem(int position) { super.setCurrentItem(position); - adapter.setCurrentItem(position); + getAdapter().setCurrentItem(position); } /** @@ -113,7 +113,7 @@ public boolean onOptionsItemSelected(MenuItem item) { finish(); return true; case R.id.m_apply: - createComment(adapter.getCommentText()); + createComment(getAdapter().getCommentText()); return true; default: return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.java b/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.java deleted file mode 100644 index b3211aa1b..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.java +++ /dev/null @@ -1,181 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.comment; - -import android.Manifest; -import android.app.Activity; -import android.content.Intent; -import android.content.pm.PackageManager; -import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.floatingactionbutton.FloatingActionButton; -import androidx.fragment.app.Fragment; -import androidx.core.content.ContextCompat; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.EditText; - -import com.github.pockethub.android.R; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.rx.RxProgress; -import com.github.pockethub.android.ui.TextWatcherAdapter; - -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.util.ImageBinPoster; -import com.github.pockethub.android.util.PermissionsUtils; -import com.github.pockethub.android.util.ToastUtils; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -/** - * Fragment to display raw comment text - */ -public class RawCommentFragment extends BaseFragment { - - private static final int REQUEST_CODE_SELECT_PHOTO = 0; - private static final int READ_PERMISSION_REQUEST = 1; - - @BindView(R.id.et_comment) - protected EditText commentText; - - @BindView(R.id.fab_add_image) - protected FloatingActionButton addImageFab; - - /** - * Text to populate comment window. - */ - private String initComment; - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - - addImageFab.setOnClickListener(v -> { - Fragment fragment = RawCommentFragment.this; - String permission = Manifest.permission.READ_EXTERNAL_STORAGE; - - if (ContextCompat.checkSelfPermission(getActivity(), permission) - != PackageManager.PERMISSION_GRANTED) { - PermissionsUtils.askForPermission(fragment, READ_PERMISSION_REQUEST, - permission, R.string.read_permission_title, - R.string.read_permission_content); - } else { - startImagePicker(); - } - }); - - commentText.addTextChangedListener(new TextWatcherAdapter() { - - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { - Activity activity = getActivity(); - if (activity != null) { - activity.invalidateOptionsMenu(); - } - } - }); - commentText.setOnTouchListener((v, event) -> { - commentText.requestFocusFromTouch(); - return false; - }); - - setText(initComment); - } - - @Override - public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) { - super.onRequestPermissionsResult(requestCode, permissions, grantResults); - if (requestCode == READ_PERMISSION_REQUEST) { - - boolean result = true; - for (int i = 0; i < permissions.length; i++) { - if (grantResults[i] != PackageManager.PERMISSION_GRANTED) { - result = false; - } - } - - if (result) { - startImagePicker(); - } - } - } - - private void startImagePicker() { - Intent photoPickerIntent = new Intent(Intent.ACTION_GET_CONTENT); - photoPickerIntent.setType("image/*"); - startActivityForResult(photoPickerIntent, REQUEST_CODE_SELECT_PHOTO); - } - - @Override - public void onActivityResult(final int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - - if (requestCode == REQUEST_CODE_SELECT_PHOTO && resultCode == Activity.RESULT_OK) { - ImageBinPoster.post(getActivity(), data.getData()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .compose(RxProgress.bindToLifecycle(getActivity(), R.string.loading)) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - if (response.isSuccessful()) { - insertImage(ImageBinPoster.getUrl(response.body().string())); - } else { - showImageError(); - } - }, throwable -> showImageError()); - } - } - - private void showImageError() { - ToastUtils.show(getActivity(), R.string.error_image_upload); - } - - private void insertImage(final String url) { - getActivity().runOnUiThread(() -> commentText.append("![](" + url + ")")); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_comment_create, container, false); - } - - /** - * Get comment text - * - * @return text - */ - public String getText() { - return commentText.getText().toString(); - } - - /** - * Set comment text - * - * @return text - */ - public void setText(String comment) { - if (commentText != null) { - commentText.setText(comment); - commentText.selectAll(); - } else { - initComment = comment; - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.kt new file mode 100644 index 000000000..ebb8a387e --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/comment/RawCommentFragment.kt @@ -0,0 +1,166 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.comment + +import android.Manifest +import android.app.Activity +import android.content.Intent +import android.content.pm.PackageManager +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import androidx.core.content.ContextCompat +import com.github.pockethub.android.R +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.rx.RxProgress +import com.github.pockethub.android.ui.TextWatcherAdapter +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.util.ImageBinPoster +import com.github.pockethub.android.util.PermissionsUtils +import com.github.pockethub.android.util.ToastUtils +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_comment_create.* + +/** + * Fragment to display raw comment text + */ +class RawCommentFragment : BaseFragment() { + + /** + * Text to populate comment window. + */ + private var initComment: String? = null + + /** + * Get comment text + * + * @return text + */ + /** + * Set comment text + * + * @return text + */ + var text: String? + get() = et_comment.text.toString() + set(comment) = if (et_comment != null) { + et_comment!!.setText(comment) + et_comment!!.selectAll() + } else { + initComment = comment + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + fab_add_image!!.setOnClickListener { v -> + val fragment = this@RawCommentFragment + val permission = Manifest.permission.READ_EXTERNAL_STORAGE + + if (ContextCompat.checkSelfPermission(activity!!, permission) != PackageManager.PERMISSION_GRANTED) { + PermissionsUtils.askForPermission( + fragment, + READ_PERMISSION_REQUEST, + permission, + R.string.read_permission_title, + R.string.read_permission_content + ) + } else { + startImagePicker() + } + } + + et_comment.addTextChangedListener(object : TextWatcherAdapter() { + + override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) { + val activity = activity + activity?.invalidateOptionsMenu() + } + }) + et_comment.setOnTouchListener { v, event -> + et_comment.requestFocusFromTouch() + false + } + + text = initComment + } + + override fun onRequestPermissionsResult(requestCode: Int, permissions: Array, grantResults: IntArray) { + super.onRequestPermissionsResult(requestCode, permissions, grantResults) + if (requestCode == READ_PERMISSION_REQUEST) { + + var result = true + for (i in permissions.indices) { + if (grantResults[i] != PackageManager.PERMISSION_GRANTED) { + result = false + } + } + + if (result) { + startImagePicker() + } + } + } + + private fun startImagePicker() { + val photoPickerIntent = Intent(Intent.ACTION_GET_CONTENT) + photoPickerIntent.type = "image/*" + startActivityForResult(photoPickerIntent, REQUEST_CODE_SELECT_PHOTO) + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == REQUEST_CODE_SELECT_PHOTO && resultCode == Activity.RESULT_OK) { + ImageBinPoster.post(activity!!, data!!.data!!) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .compose(RxProgress.bindToLifecycle(activity, R.string.loading)) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + if (response.isSuccessful) { + insertImage(ImageBinPoster.getUrl(response.body()!!.string())) + } else { + showImageError() + } + }, { throwable -> showImageError() }) + } + } + + private fun showImageError() { + ToastUtils.show(activity, R.string.error_image_upload) + } + + private fun insertImage(url: String?) { + activity!!.runOnUiThread { et_comment.append("![]($url)") } + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_comment_create, container, false) + } + + companion object { + + private val REQUEST_CODE_SELECT_PHOTO = 0 + private val READ_PERMISSION_REQUEST = 1 + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.java b/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.java deleted file mode 100644 index d2b813901..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.java +++ /dev/null @@ -1,107 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.comment; - -import android.content.Context; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.inputmethod.InputMethodManager; -import android.widget.ProgressBar; - -import com.github.pockethub.android.R; -import com.github.pockethub.android.ui.MarkdownLoader; -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.ui.view.LinkTextView; -import com.github.pockethub.android.util.HttpImageGetter; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.model.Repository; - -import javax.inject.Inject; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -/** - * Fragment to display rendered comment fragment - */ -public class RenderedCommentFragment extends BaseFragment { - - private static final String ARG_TEXT = "text"; - - private static final String ARG_REPO = "repo"; - - @BindView(R.id.pb_loading) - protected ProgressBar progress; - - @BindView(R.id.tv_comment_body) - protected LinkTextView bodyText; - - @Inject - protected HttpImageGetter imageGetter; - - /** - * Set text to render - * - * @param raw - * @param repo - */ - public void setText(final String raw, final Repository repo) { - loadMarkdown(raw, repo); - hideSoftKeyboard(); - showLoading(true); - } - - private void hideSoftKeyboard() { - Context context = getContext(); - if (context != null) { - InputMethodManager imm = - (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE); - - if (imm != null) { - imm.hideSoftInputFromWindow(bodyText.getWindowToken(), 0); - } - } - } - - private void showLoading(final boolean loading) { - if (loading) { - progress.setVisibility(View.VISIBLE); - bodyText.setVisibility(View.GONE); - } else { - progress.setVisibility(View.GONE); - bodyText.setVisibility(View.VISIBLE); - } - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_comment_preview, null); - } - - private void loadMarkdown(String raw, Repository repo) { - MarkdownLoader.load(getActivity(), raw, repo, imageGetter, true) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(rendered -> { - bodyText.setText(rendered); - showLoading(false); - } , e -> ToastUtils.show(getActivity(), R.string.error_rendering_markdown)); - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.kt new file mode 100644 index 000000000..5d9257e3f --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/comment/RenderedCommentFragment.kt @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.comment + +import android.content.Context +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup +import android.view.inputmethod.InputMethodManager + +import com.github.pockethub.android.R +import com.github.pockethub.android.ui.MarkdownLoader +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.util.HttpImageGetter +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.model.Repository + +import javax.inject.Inject + +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_comment_preview.* + +/** + * Fragment to display rendered comment fragment + */ +class RenderedCommentFragment : BaseFragment() { + + @Inject + lateinit var imageGetter: HttpImageGetter + + /** + * Set text to render + * + * @param raw + * @param repo + */ + fun setText(raw: String, repo: Repository) { + loadMarkdown(raw, repo) + hideSoftKeyboard() + showLoading(true) + } + + private fun hideSoftKeyboard() { + val context = context + if (context != null) { + val imm = context.getSystemService(Context.INPUT_METHOD_SERVICE) as InputMethodManager + imm.hideSoftInputFromWindow(tv_comment_body.windowToken, 0) + } + } + + private fun showLoading(loading: Boolean) { + if (loading) { + pb_loading.visibility = View.VISIBLE + tv_comment_body.visibility = View.GONE + } else { + pb_loading.visibility = View.GONE + tv_comment_body.visibility = View.VISIBLE + } + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_comment_preview, null) + } + + private fun loadMarkdown(raw: String, repo: Repository) { + MarkdownLoader.load(activity, raw, repo, imageGetter, true) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ rendered -> + tv_comment_body!!.text = rendered + showLoading(false) + }, { e -> ToastUtils.show(activity, R.string.error_rendering_markdown) }) + } + + companion object { + + private val ARG_TEXT = "text" + + private val ARG_REPO = "repo" + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.java b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.java deleted file mode 100644 index 28823f1e4..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.java +++ /dev/null @@ -1,268 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.commit; - -import android.app.Activity; -import android.content.Context; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.*; -import android.widget.ProgressBar; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindView; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.commit.CommitUtils; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.ui.item.TextItem; -import com.github.pockethub.android.ui.item.commit.CommitFileHeaderItem; -import com.github.pockethub.android.ui.item.commit.CommitFileLineItem; -import com.github.pockethub.android.ui.item.commit.CommitItem; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Commit; -import com.meisolsson.githubsdk.model.CommitCompare; -import com.meisolsson.githubsdk.model.GitHubFile; -import com.meisolsson.githubsdk.model.Repository; -import com.meisolsson.githubsdk.service.repositories.RepositoryCommitService; -import com.xwray.groupie.GroupAdapter; -import com.xwray.groupie.Item; -import com.xwray.groupie.OnItemClickListener; -import com.xwray.groupie.Section; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import javax.inject.Inject; -import java.text.MessageFormat; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import static com.github.pockethub.android.Intents.*; - -/** - * Fragment to display a list of commits being compared - */ -public class CommitCompareListFragment extends BaseFragment implements OnItemClickListener { - - @BindView(R.id.list) - protected RecyclerView list; - - @BindView(R.id.pb_loading) - protected ProgressBar progress; - - private DiffStyler diffStyler; - - private Repository repository; - - private String base; - - private String head; - - @Inject - protected AvatarLoader avatars; - - private GroupAdapter adapter = new GroupAdapter(); - - private Section mainSection = new Section(); - - private Section commitsSection = new Section(); - - private Section filesSection = new Section(); - - private CommitCompare compare; - - @Override - public void onAttach(Context context) { - super.onAttach(context); - - Activity activity = (Activity) context; - repository = activity.getIntent().getParcelableExtra(EXTRA_REPOSITORY); - base = getStringExtra(EXTRA_BASE).substring(0, 7); - head = getStringExtra(EXTRA_HEAD).substring(0, 7); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - mainSection.add(commitsSection); - mainSection.add(filesSection); - adapter.add(mainSection); - - adapter.setOnItemClickListener(this); - - diffStyler = new DiffStyler(getResources()); - compareCommits(); - } - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - list.setLayoutManager(new LinearLayoutManager(getActivity())); - list.setAdapter(adapter); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_commit_diff_list, container, false); - } - - @Override - public void onCreateOptionsMenu(final Menu optionsMenu, - final MenuInflater inflater) { - inflater.inflate(R.menu.fragment_refresh, optionsMenu); - } - - @Override - public boolean onOptionsItemSelected(final MenuItem item) { - if (!isAdded()) { - return false; - } - - switch (item.getItemId()) { - case R.id.m_refresh: - compareCommits(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - private void compareCommits() { - ServiceGenerator.createService(getActivity(), RepositoryCommitService.class) - .compareCommits(repository.owner().login(), repository.name(), base, head) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - CommitCompare compareCommit = response.body(); - List files = compareCommit.files(); - diffStyler.setFiles(files); - Collections.sort(files, new CommitFileComparator()); - updateList(compareCommit); - }, error -> ToastUtils.show(getActivity(), R.string.error_commits_load)); - } - - private void updateList(CommitCompare compare) { - if (!isAdded()) { - return; - } - - this.compare = compare; - - progress.setVisibility(View.GONE); - list.setVisibility(View.VISIBLE); - - List commits = compare.commits(); - if (!commits.isEmpty()) { - String comparingCommits = getString(R.string.comparing_commits); - String text = MessageFormat.format(comparingCommits, commits.size()); - commitsSection.setHeader( - new TextItem(R.layout.commit_details_header, R.id.tv_commit_summary, text) - ); - - List items = new ArrayList<>(); - for (Commit commit : commits) { - items.add(new CommitItem(avatars, commit)); - } - - commitsSection.update(items); - } - - List files = compare.files(); - if (!files.isEmpty()) { - filesSection.setHeader( - new TextItem(R.layout.commit_compare_file_details_header, - R.id.tv_commit_file_summary, CommitUtils.formatStats(files)) - ); - filesSection.update(createFileSections(files)); - } - } - - private List

createFileSections(List files) { - List

sections = new ArrayList<>(); - - for (GitHubFile file : files) { - Section section = new Section(new CommitFileHeaderItem(getActivity(), file)); - List lines = diffStyler.get(file.filename()); - for (CharSequence line : lines) { - section.add(new CommitFileLineItem(diffStyler, line)); - } - - sections.add(section); - } - - return sections; - } - - private void openCommit(final Commit commit) { - if (compare != null) { - int commitPosition = 0; - List commits = compare.commits(); - for (Commit candidate : commits) { - if (commit == candidate) { - break; - } else { - commitPosition++; - } - } - if (commitPosition < commits.size()) { - String[] ids = new String[commits.size()]; - for (int i = 0; i < commits.size(); i++) { - ids[i] = commits.get(i).sha(); - } - startActivity(CommitViewActivity.createIntent(repository, commitPosition, ids)); - } - } else { - startActivity(CommitViewActivity.createIntent(repository, - commit.sha())); - } - } - - private void openFile(final GitHubFile file) { - if (!TextUtils.isEmpty(file.filename()) - && !TextUtils.isEmpty(file.sha())) { - startActivity(CommitFileViewActivity.createIntent(repository, head, file)); - } - } - - private void openLine(GroupAdapter adapter, int position) { - Object item; - while (--position >= 0) { - item = adapter.getItem(position); - if (item instanceof CommitFileHeaderItem) { - openFile(((CommitFileHeaderItem) item).getFile()); - return; - } - } - } - - @Override - public void onItemClick(@NonNull Item item, @NonNull View view) { - if (item instanceof CommitItem) { - openCommit(((CommitItem) item).getCommit()); - } else if (item instanceof CommitFileHeaderItem) { - openFile(((CommitFileHeaderItem) item).getFile()); - } else if (item instanceof CommitFileLineItem) { - int position = adapter.getAdapterPosition(item); - openLine(adapter, position); - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.kt new file mode 100644 index 000000000..9cfe7b5b5 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareListFragment.kt @@ -0,0 +1,260 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.commit + +import android.app.Activity +import android.content.Context +import android.os.Bundle +import android.text.TextUtils +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import androidx.annotation.NonNull +import androidx.recyclerview.widget.LinearLayoutManager +import com.github.pockethub.android.Intents.EXTRA_BASE +import com.github.pockethub.android.Intents.EXTRA_HEAD +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.R +import com.github.pockethub.android.core.commit.CommitUtils +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.ui.item.TextItem +import com.github.pockethub.android.ui.item.commit.CommitFileHeaderItem +import com.github.pockethub.android.ui.item.commit.CommitFileLineItem +import com.github.pockethub.android.ui.item.commit.CommitItem +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Commit +import com.meisolsson.githubsdk.model.CommitCompare +import com.meisolsson.githubsdk.model.GitHubFile +import com.meisolsson.githubsdk.model.Repository +import com.meisolsson.githubsdk.service.repositories.RepositoryCommitService +import com.xwray.groupie.GroupAdapter +import com.xwray.groupie.Item +import com.xwray.groupie.OnItemClickListener +import com.xwray.groupie.Section +import com.xwray.groupie.ViewHolder +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_commit_diff_list.* +import java.text.MessageFormat +import java.util.ArrayList +import java.util.Collections +import javax.inject.Inject + +/** + * Fragment to display a list of commits being compared + */ +class CommitCompareListFragment : BaseFragment(), OnItemClickListener { + + @Inject + lateinit var avatars: AvatarLoader + + private var diffStyler: DiffStyler? = null + + private var repository: Repository? = null + + private var base: String? = null + + private var head: String? = null + + private val adapter = GroupAdapter() + + private val mainSection = Section() + + private val commitsSection = Section() + + private val filesSection = Section() + + private var compare: CommitCompare? = null + + override fun onAttach(context: Context?) { + super.onAttach(context) + + val activity = context as Activity? + repository = activity!!.intent.getParcelableExtra(EXTRA_REPOSITORY) + base = getStringExtra(EXTRA_BASE)!!.substring(0, 7) + head = getStringExtra(EXTRA_HEAD)!!.substring(0, 7) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + mainSection.add(commitsSection) + mainSection.add(filesSection) + adapter.add(mainSection) + + adapter.setOnItemClickListener(this) + + diffStyler = DiffStyler(resources) + compareCommits() + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + list.layoutManager = LinearLayoutManager(activity) + list.adapter = adapter + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_commit_diff_list, container, false) + } + + override fun onCreateOptionsMenu(optionsMenu: Menu?, + inflater: MenuInflater?) { + inflater!!.inflate(R.menu.fragment_refresh, optionsMenu) + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + if (!isAdded) { + return false + } + + return when (item!!.itemId) { + R.id.m_refresh -> { + compareCommits() + true + } + else -> super.onOptionsItemSelected(item) + } + } + + private fun compareCommits() { + ServiceGenerator.createService(activity, RepositoryCommitService::class.java) + .compareCommits(repository!!.owner()!!.login(), repository!!.name(), base, head) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + val compareCommit = response.body() + val files = compareCommit.files() + diffStyler!!.setFiles(files) + Collections.sort(files, CommitFileComparator()) + updateList(compareCommit) + }, { error -> ToastUtils.show(activity, R.string.error_commits_load) }) + } + + private fun updateList(compare: CommitCompare) { + if (!isAdded) { + return + } + + this.compare = compare + + pb_loading.visibility = View.GONE + list.visibility = View.VISIBLE + + val commits = compare.commits() + if (!commits.isEmpty()) { + val comparingCommits = getString(R.string.comparing_commits) + val text = MessageFormat.format(comparingCommits, commits.size) + commitsSection.setHeader( + TextItem(R.layout.commit_details_header, R.id.tv_commit_summary, text) + ) + + val items = ArrayList() + for (commit in commits) { + items.add(CommitItem(avatars!!, commit)) + } + + commitsSection.update(items) + } + + val files = compare.files() + if (!files.isEmpty()) { + filesSection.setHeader( + TextItem(R.layout.commit_compare_file_details_header, + R.id.tv_commit_file_summary, CommitUtils.formatStats(files)) + ) + filesSection.update(createFileSections(files)) + } + } + + private fun createFileSections(files: List): List

{ + val sections = ArrayList

() + + for (file in files) { + val section = Section(CommitFileHeaderItem(activity!!, file)) + val lines = diffStyler!!.get(file.filename()) + for (line in lines) { + section.add(CommitFileLineItem(diffStyler!!, line)) + } + + sections.add(section) + } + + return sections + } + + private fun openCommit(commit: Commit) { + if (compare != null) { + var commitPosition = 0 + val commits = compare!!.commits() + for (candidate in commits) { + if (commit === candidate) { + break + } else { + commitPosition++ + } + } + if (commitPosition < commits.size) { + val ids = arrayOfNulls(commits.size) as Array + for (i in commits.indices) { + ids[i] = commits[i].sha()!! + } + startActivity(CommitViewActivity.createIntent(repository!!, commitPosition, *ids)) + } + } else { + startActivity(CommitViewActivity.createIntent(repository!!, commit.sha()!!)) + } + } + + private fun openFile(file: GitHubFile) { + if (!TextUtils.isEmpty(file.filename()) && !TextUtils.isEmpty(file.sha())) { + startActivity(CommitFileViewActivity.createIntent(repository!!, head!!, file)) + } + } + + private fun openLine(adapter: GroupAdapter<*>, position: Int) { + var pos = position + var item: Any + while (--pos >= 0) { + item = adapter.getItem(pos) + if (item is CommitFileHeaderItem) { + openFile(item.file) + return + } + } + } + + override fun onItemClick(@NonNull item: Item<*>, @NonNull view: View) { + when (item) { + is CommitItem -> openCommit(item.commit) + is CommitFileHeaderItem -> openFile(item.file) + is CommitFileLineItem -> { + val position = adapter.getAdapterPosition(item) + openLine(adapter, position) + } + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareViewActivity.java index 47a502ba8..10b41f34f 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareViewActivity.java +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitCompareViewActivity.java @@ -96,7 +96,7 @@ public boolean onCreateOptionsMenu(Menu optionsMenu) { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - Intent intent = RepositoryViewActivity.createIntent(repository); + Intent intent = RepositoryViewActivity.Companion.createIntent(repository); intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); return true; diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.java b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.java deleted file mode 100644 index ee29ee9f8..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.java +++ /dev/null @@ -1,445 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.commit; - -import android.content.ClipData; -import android.content.ClipboardManager; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; - -import com.afollestad.materialdialogs.MaterialDialog; -import com.github.pockethub.android.core.commit.RefreshCommitTaskFactory; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.ui.item.LoadingItem; -import com.github.pockethub.android.ui.item.commit.CommitCommentItem; -import com.github.pockethub.android.ui.item.TextItem; -import com.github.pockethub.android.ui.item.commit.CommitFileHeaderItem; -import com.github.pockethub.android.ui.item.commit.CommitFileLineItem; -import com.github.pockethub.android.ui.item.commit.CommitHeaderItem; -import com.github.pockethub.android.ui.item.commit.CommitParentItem; -import com.meisolsson.githubsdk.model.Commit; -import com.meisolsson.githubsdk.model.GitHubFile; -import com.meisolsson.githubsdk.model.Repository; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.commit.CommitStore; -import com.github.pockethub.android.core.commit.CommitUtils; -import com.github.pockethub.android.core.commit.FullCommitFile; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.HttpImageGetter; -import com.github.pockethub.android.util.InfoUtils; -import com.github.pockethub.android.util.ShareUtils; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.model.git.GitComment; -import com.meisolsson.githubsdk.model.git.GitCommit; -import com.xwray.groupie.GroupAdapter; -import com.xwray.groupie.Item; -import com.xwray.groupie.OnItemClickListener; -import com.xwray.groupie.Section; - -import javax.inject.Inject; - -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static android.app.Activity.RESULT_OK; -import static com.github.pockethub.android.Intents.EXTRA_BASE; -import static com.github.pockethub.android.Intents.EXTRA_COMMENT; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORY; -import static com.github.pockethub.android.RequestCodes.COMMENT_CREATE; - -/** - * Fragment to display commit details with diff output - */ -public class CommitDiffListFragment extends BaseFragment implements OnItemClickListener { - - - @BindView(R.id.list) - protected RecyclerView list; - - @BindView(R.id.pb_loading) - protected ProgressBar progress; - - private DiffStyler diffStyler; - - private Repository repository; - - private String base; - - private Commit commit; - - private List comments; - - private List files; - - @Inject - protected AvatarLoader avatars; - - @Inject - protected CommitStore store; - - private GroupAdapter adapter = new GroupAdapter(); - - private Section mainSection = new Section(); - - private Section commitSection = new Section(); - - private Section filesSection = new Section(); - - private Section commentSection = new Section(); - - @Inject - protected RefreshCommitTaskFactory refreshCommitTaskFactory; - - @Inject - protected HttpImageGetter commentImageGetter; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bundle args = getArguments(); - base = args.getString(EXTRA_BASE); - repository = args.getParcelable(EXTRA_REPOSITORY); - - mainSection.add(commitSection); - mainSection.add(filesSection); - mainSection.add(commentSection); - - adapter.add(mainSection); - adapter.setOnItemClickListener(this); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - commit = store.getCommit(repository, base); - - if (files == null - || (commit != null && commit.commit().commentCount() > 0 && comments == null)) { - mainSection.setFooter(new LoadingItem(R.string.loading_files_and_comments)); - } - - if (commit != null && comments != null && files != null) { - updateList(commit, comments, files); - } else { - if (commit != null) { - updateHeader(commit); - } - refreshCommit(); - } - } - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - diffStyler = new DiffStyler(getResources()); - - list.setLayoutManager(new LinearLayoutManager(getActivity())); - list.setAdapter(adapter); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_commit_diff_list, container, false); - } - - private void addComment(final GitComment comment) { - if (comments != null && files != null) { - comments.add(comment); - GitCommit rawCommit = commit.commit(); - if (rawCommit != null) { - rawCommit = rawCommit.toBuilder() - .commentCount(rawCommit.commentCount() + 1) - .build(); - - commit = commit.toBuilder() - .commit(rawCommit) - .build(); - } - commentImageGetter.encode(comment, comment.bodyHtml()); - updateItems(comments, files); - } else { - refreshCommit(); - } - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (RESULT_OK == resultCode && COMMENT_CREATE == requestCode - && data != null) { - GitComment comment = data.getParcelableExtra(EXTRA_COMMENT); - addComment(comment); - return; - } - - super.onActivityResult(requestCode, resultCode, data); - } - - @Override - public void onCreateOptionsMenu(final Menu optionsMenu, final MenuInflater inflater) { - inflater.inflate(R.menu.fragment_commit_view, optionsMenu); - } - - @Override - public boolean onOptionsItemSelected(final MenuItem item) { - if (!isAdded()) { - return false; - } - - switch (item.getItemId()) { - case R.id.m_refresh: - refreshCommit(); - return true; - case R.id.m_copy_hash: - copyHashToClipboard(); - return true; - case R.id.m_comment: - startActivityForResult( - CreateCommentActivity.createIntent(repository, base), - COMMENT_CREATE); - return true; - case R.id.m_share: - shareCommit(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - private void copyHashToClipboard() { - ClipboardManager manager = (ClipboardManager) getActivity().getSystemService(Context.CLIPBOARD_SERVICE); - ClipData clip = ClipData.newPlainText("hash", commit.sha()); - manager.setPrimaryClip(clip); - Toast.makeText(getActivity(), R.string.toast_msg_copied, Toast.LENGTH_SHORT).show(); - } - - private void shareCommit() { - String id = InfoUtils.createRepoId(repository); - startActivity(ShareUtils.create( - "Commit " + CommitUtils.abbreviate(base) + " on " + id, - "https://github.com/" + id + "/commit/" + base)); - } - - private void refreshCommit() { - refreshCommitTaskFactory.create(getActivity(), repository, base) - .refresh() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(full -> { - List files = full.getCommit().files(); - diffStyler.setFiles(files); - if (files != null) { - Collections.sort(files, new CommitFileComparator()); - } - - updateList(full.getCommit(), full, full.getFiles()); - }, e -> { - ToastUtils.show(getActivity(), R.string.error_commit_load); - progress.setVisibility(View.GONE); - }); - } - - private void addCommitParents(Commit commit) { - List parents = commit.parents(); - if (parents == null || parents.isEmpty()) { - return; - } - - List items = new ArrayList<>(); - for (Commit parent : parents) { - items.add(new CommitParentItem(getActivity(), parent)); - } - commitSection.update(items); - } - - private void updateHeader(Commit commit) { - progress.setVisibility(View.GONE); - list.setVisibility(View.VISIBLE); - - mainSection.setHeader(new CommitHeaderItem(avatars, getActivity(), commit)); - addCommitParents(commit); - } - - private void updateList(Commit commit, List comments, List files) { - if (!isAdded()) { - return; - } - - this.commit = commit; - this.comments = comments; - this.files = files; - - updateHeader(commit); - mainSection.removeFooter(); - - filesSection.setHeader( - new TextItem(R.layout.commit_file_details_header, - R.id.tv_commit_file_summary, CommitUtils.formatStats(commit.files())) - ); - updateItems(comments, files); - } - - private void updateItems(List comments, List files) { - filesSection.update(createFileSections(files)); - - List items = new ArrayList<>(); - for (GitComment comment : comments) { - items.add(new CommitCommentItem(avatars, commentImageGetter, comment)); - } - commentSection.update(items); - } - - private List

createFileSections(List files) { - List

sections = new ArrayList<>(); - for (FullCommitFile file : files) { - Section section = new Section(new CommitFileHeaderItem(getActivity(), file.getFile())); - List lines = diffStyler.get(file.getFile().filename()); - int number = 0; - for (CharSequence line : lines) { - section.add(new CommitFileLineItem(diffStyler, line)); - for (GitComment comment : file.get(number)) { - section.add(new CommitCommentItem(avatars, commentImageGetter, comment, true)); - } - number++; - } - - sections.add(section); - } - - return sections; - } - - private void showFileOptions(CharSequence line, final int position, final GitHubFile file) { - - MaterialDialog.Builder builder = new MaterialDialog.Builder(getActivity()) - .title(CommitUtils.getName(file)); - - final MaterialDialog[] dialogHolder = new MaterialDialog[1]; - - View view = getActivity().getLayoutInflater().inflate( - R.layout.diff_line_dialog, null); - - TextView diff = (TextView) view.findViewById(R.id.tv_diff); - diff.setText(line); - diffStyler.updateColors(line, diff); - - ((TextView) view.findViewById(R.id.tv_commit)).setText(getString(R.string.commit_prefix) - + CommitUtils.abbreviate(commit)); - - view.findViewById(R.id.ll_view_area).setOnClickListener(v -> { - dialogHolder[0].dismiss(); - openFile(file); - }); - - view.findViewById(R.id.ll_comment_area).setOnClickListener(v -> { - dialogHolder[0].dismiss(); - startActivityForResult(CreateCommentActivity - .createIntent(repository, commit.sha(), - file.filename(), position), - COMMENT_CREATE); - }); - - builder.customView(view, false) - .negativeText(R.string.cancel) - .onNegative((dialog, which) -> dialog.dismiss()); - - MaterialDialog dialog = builder.build(); - dialogHolder[0] = dialog; - dialog.setCanceledOnTouchOutside(true); - dialog.show(); - } - - private void openFile(GitHubFile file) { - if (!TextUtils.isEmpty(file.filename()) - && !TextUtils.isEmpty(file.sha())) { - startActivity(CommitFileViewActivity.createIntent(repository, base, - file)); - } - } - - /** - * Select previous file by scanning backwards from the current position - * - * @param position - * @param item - * @param adapter - */ - private void selectPreviousFile(int position, Object item, GroupAdapter adapter) { - CharSequence line; - if (item instanceof CharSequence) { - line = (CharSequence) item; - } else { - line = null; - } - - int linePosition = 0; - while (--position >= 0) { - item = adapter.getItem(position); - - if (item instanceof CommitFileHeaderItem) { - if (line != null) { - showFileOptions(line, linePosition, ((CommitFileHeaderItem) item).getFile()); - } - break; - } else if (item instanceof CharSequence) { - if (line != null) { - linePosition++; - } else { - line = (CharSequence) item; - } - } - } - } - - @Override - public void onItemClick(@NonNull Item item, @NonNull View view) { - int position = adapter.getAdapterPosition(item); - - if (item instanceof CommitParentItem) { - String sha = ((CommitParentItem) item).getCommit().sha(); - startActivity(CommitViewActivity.createIntent(repository, sha)); - } else if (item instanceof CommitFileHeaderItem) { - openFile(((CommitFileHeaderItem) item).getFile()); - } else if (item instanceof CharSequence) { - selectPreviousFile(position, item, adapter); - } else if (item instanceof CommitCommentItem) { - if (!TextUtils.isEmpty(((CommitCommentItem) item).getComment().path())) { - selectPreviousFile(position, item, adapter); - } - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.kt new file mode 100644 index 000000000..65855d311 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitDiffListFragment.kt @@ -0,0 +1,422 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.commit + +import android.app.Activity.RESULT_OK +import android.content.ClipData +import android.content.ClipboardManager +import android.content.Context +import android.content.Intent +import android.os.Bundle +import android.text.TextUtils +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import android.widget.Toast +import androidx.annotation.NonNull +import androidx.recyclerview.widget.LinearLayoutManager +import com.afollestad.materialdialogs.MaterialDialog +import com.github.pockethub.android.Intents.EXTRA_BASE +import com.github.pockethub.android.Intents.EXTRA_COMMENT +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.R +import com.github.pockethub.android.RequestCodes.COMMENT_CREATE +import com.github.pockethub.android.core.commit.CommitStore +import com.github.pockethub.android.core.commit.CommitUtils +import com.github.pockethub.android.core.commit.FullCommitFile +import com.github.pockethub.android.core.commit.RefreshCommitTaskFactory +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.ui.item.LoadingItem +import com.github.pockethub.android.ui.item.TextItem +import com.github.pockethub.android.ui.item.commit.CommitCommentItem +import com.github.pockethub.android.ui.item.commit.CommitFileHeaderItem +import com.github.pockethub.android.ui.item.commit.CommitFileLineItem +import com.github.pockethub.android.ui.item.commit.CommitHeaderItem +import com.github.pockethub.android.ui.item.commit.CommitParentItem +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.HttpImageGetter +import com.github.pockethub.android.util.InfoUtils +import com.github.pockethub.android.util.ShareUtils +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.model.Commit +import com.meisolsson.githubsdk.model.GitHubFile +import com.meisolsson.githubsdk.model.Repository +import com.meisolsson.githubsdk.model.git.GitComment +import com.meisolsson.githubsdk.model.git.GitCommit +import com.xwray.groupie.GroupAdapter +import com.xwray.groupie.Item +import com.xwray.groupie.OnItemClickListener +import com.xwray.groupie.Section +import com.xwray.groupie.ViewHolder +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.diff_line_dialog.view.* +import kotlinx.android.synthetic.main.fragment_commit_diff_list.* +import java.util.ArrayList +import java.util.Collections +import javax.inject.Inject + +/** + * Fragment to display commit details with diff output + */ +class CommitDiffListFragment : BaseFragment(), OnItemClickListener { + + @Inject + lateinit var refreshCommitTaskFactory: RefreshCommitTaskFactory + + @Inject + lateinit var commentImageGetter: HttpImageGetter + + @Inject + lateinit var avatars: AvatarLoader + + @Inject + lateinit var store: CommitStore + + private var diffStyler: DiffStyler? = null + + private var repository: Repository? = null + + private var base: String? = null + + private var commit: Commit? = null + + private var comments: MutableList? = null + + private var files: List? = null + + private val adapter = GroupAdapter() + + private val mainSection = Section() + + private val commitSection = Section() + + private val filesSection = Section() + + private val commentSection = Section() + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + val args = arguments!! + base = args.getString(EXTRA_BASE) + repository = args.getParcelable(EXTRA_REPOSITORY) + + mainSection.add(commitSection) + mainSection.add(filesSection) + mainSection.add(commentSection) + + adapter.add(mainSection) + adapter.setOnItemClickListener(this) + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + commit = store.getCommit(repository, base) + + if (files == null || commit != null && commit!!.commit()!!.commentCount()!! > 0 && comments == null) { + mainSection.setFooter(LoadingItem(R.string.loading_files_and_comments)) + } + + if (commit != null && comments != null && files != null) { + updateList(commit!!, comments!!, files!!) + } else { + if (commit != null) { + updateHeader(commit!!) + } + refreshCommit() + } + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + diffStyler = DiffStyler(resources) + + list.layoutManager = LinearLayoutManager(activity) + list.adapter = adapter + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_commit_diff_list, container, false) + } + + private fun addComment(comment: GitComment) { + if (comments != null && files != null) { + comments!!.add(comment) + var rawCommit: GitCommit? = commit!!.commit() + if (rawCommit != null) { + rawCommit = rawCommit.toBuilder() + .commentCount(rawCommit.commentCount()!! + 1) + .build() + + commit = commit!!.toBuilder() + .commit(rawCommit) + .build() + } + commentImageGetter.encode(comment, comment.bodyHtml()) + updateItems(comments!!, files!!) + } else { + refreshCommit() + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (RESULT_OK == resultCode && COMMENT_CREATE == requestCode + && data != null) { + val comment = data.getParcelableExtra(EXTRA_COMMENT) + addComment(comment) + return + } + + super.onActivityResult(requestCode, resultCode, data) + } + + override fun onCreateOptionsMenu(optionsMenu: Menu?, inflater: MenuInflater?) { + inflater!!.inflate(R.menu.fragment_commit_view, optionsMenu) + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + if (!isAdded) { + return false + } + + when (item!!.itemId) { + R.id.m_refresh -> { + refreshCommit() + return true + } + R.id.m_copy_hash -> { + copyHashToClipboard() + return true + } + R.id.m_comment -> { + startActivityForResult( + CreateCommentActivity.createIntent(repository, base), + COMMENT_CREATE) + return true + } + R.id.m_share -> { + shareCommit() + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + private fun copyHashToClipboard() { + val manager = activity!!.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager + val clip = ClipData.newPlainText("hash", commit!!.sha()) + manager.primaryClip = clip + Toast.makeText(activity, R.string.toast_msg_copied, Toast.LENGTH_SHORT).show() + } + + private fun shareCommit() { + val id = InfoUtils.createRepoId(repository!!) + startActivity(ShareUtils.create( + "Commit " + CommitUtils.abbreviate(base) + " on " + id, + "https://github.com/$id/commit/$base") + ) + } + + private fun refreshCommit() { + refreshCommitTaskFactory.create(activity, repository, base) + .refresh() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ full -> + val files = full.commit.files() + diffStyler!!.setFiles(files) + if (files != null) { + Collections.sort(files, CommitFileComparator()) + } + + updateList(full.commit, full, full.files) + }, { e -> + ToastUtils.show(activity, R.string.error_commit_load) + pb_loading.visibility = View.GONE + }) + } + + private fun addCommitParents(commit: Commit) { + val parents = commit.parents() + if (parents == null || parents.isEmpty()) { + return + } + + val items = ArrayList() + for (parent in parents) { + items.add(CommitParentItem(activity!!, parent)) + } + commitSection.update(items) + } + + private fun updateHeader(commit: Commit) { + pb_loading.visibility = View.GONE + list.visibility = View.VISIBLE + + mainSection.setHeader(CommitHeaderItem(avatars, activity!!, commit)) + addCommitParents(commit) + } + + private fun updateList(commit: Commit, comments: MutableList, files: List) { + if (!isAdded) { + return + } + + this.commit = commit + this.comments = comments + this.files = files + + updateHeader(commit) + mainSection.removeFooter() + + filesSection.setHeader( + TextItem(R.layout.commit_file_details_header, + R.id.tv_commit_file_summary, CommitUtils.formatStats(commit.files())) + ) + updateItems(comments, files) + } + + private fun updateItems(comments: List, files: List) { + filesSection.update(createFileSections(files)) + + val items = ArrayList() + for (comment in comments) { + items.add(CommitCommentItem(avatars, commentImageGetter, comment)) + } + commentSection.update(items) + } + + private fun createFileSections(files: List): List

{ + val sections = ArrayList

() + for (file in files) { + val section = Section(CommitFileHeaderItem(activity!!, file.file)) + val lines = diffStyler!!.get(file.file.filename()) + for ((number, line) in lines.withIndex()) { + section.add(CommitFileLineItem(diffStyler!!, line)) + for (comment in file.get(number)) { + section.add(CommitCommentItem(avatars, commentImageGetter, comment, true)) + } + } + + sections.add(section) + } + + return sections + } + + private fun showFileOptions(line: CharSequence, position: Int, file: GitHubFile) { + + val builder = MaterialDialog.Builder(activity!!) + .title(CommitUtils.getName(file)!!) + + val dialogHolder = arrayOfNulls(1) + + val view = activity!!.layoutInflater.inflate(R.layout.diff_line_dialog, null) + + val diff = view.tv_diff + diff.text = line + diffStyler!!.updateColors(line, diff) + + view.tv_commit.text = getString(R.string.commit_prefix) + CommitUtils.abbreviate(commit)!! + + view.ll_view_area.setOnClickListener { v -> + dialogHolder[0]!!.dismiss() + openFile(file) + } + + view.ll_comment_area.setOnClickListener { v -> + dialogHolder[0]!!.dismiss() + startActivityForResult(CreateCommentActivity + .createIntent(repository, commit!!.sha(), + file.filename(), position), + COMMENT_CREATE) + } + + builder.customView(view, false) + .negativeText(R.string.cancel) + .onNegative { dialog, which -> dialog.dismiss() } + + val dialog = builder.build() + dialogHolder[0] = dialog + dialog.setCanceledOnTouchOutside(true) + dialog.show() + } + + private fun openFile(file: GitHubFile) { + if (!TextUtils.isEmpty(file.filename()) && !TextUtils.isEmpty(file.sha())) { + startActivity(CommitFileViewActivity.createIntent(repository!!, base!!, file)) + } + } + + /** + * Select previous file by scanning backwards from the current position + * + * @param position + * @param item + * @param adapter + */ + private fun selectPreviousFile(position: Int, item: Any, adapter: GroupAdapter<*>) { + var posItem: Item<*> + var pos = position + var line: CharSequence? + line = item as? CharSequence + + var linePosition = 0 + while (--pos >= 0) { + posItem = adapter.getItem(pos) + + if (posItem is CommitFileHeaderItem) { + if (line != null) { + showFileOptions(line, linePosition, posItem.file) + } + break + } else if (posItem is CharSequence) { + if (line != null) { + linePosition++ + } else { + line = posItem + } + } + } + } + + override fun onItemClick(@NonNull item: Item<*>, @NonNull view: View) { + val position = adapter.getAdapterPosition(item) + + if (item is CommitParentItem) { + val sha = item.commit.sha() + startActivity(CommitViewActivity.createIntent(repository!!, sha!!)) + } else if (item is CommitFileHeaderItem) { + openFile(item.file) + } else if (item is CharSequence) { + selectPreviousFile(position, item, adapter) + } else if (item is CommitCommentItem) { + if (!TextUtils.isEmpty(item.comment.path())) { + selectPreviousFile(position, item, adapter) + } + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.java deleted file mode 100644 index 7dea40bbe..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.java +++ /dev/null @@ -1,287 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.commit; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import android.text.TextUtils; -import android.util.Base64; -import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.webkit.WebView; -import android.widget.ProgressBar; - -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.GitHubFile; -import com.meisolsson.githubsdk.model.Repository; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.commit.CommitUtils; -import com.github.pockethub.android.ui.BaseActivity; -import com.github.pockethub.android.ui.MarkdownLoader; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.HttpImageGetter; -import com.github.pockethub.android.util.InfoUtils; -import com.github.pockethub.android.util.MarkdownUtils; -import com.github.pockethub.android.util.PreferenceUtils; -import com.github.pockethub.android.util.ShareUtils; -import com.github.pockethub.android.util.SourceEditor; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.model.git.GitBlob; -import com.meisolsson.githubsdk.service.git.GitService; -import javax.inject.Inject; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static com.github.pockethub.android.Intents.EXTRA_BASE; -import static com.github.pockethub.android.Intents.EXTRA_HEAD; -import static com.github.pockethub.android.Intents.EXTRA_PATH; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORY; -import static com.github.pockethub.android.util.PreferenceUtils.RENDER_MARKDOWN; -import static com.github.pockethub.android.util.PreferenceUtils.WRAP; - -/** - * Activity to display the contents of a file in a commit - */ -public class CommitFileViewActivity extends BaseActivity { - - private static final String TAG = "CommitFileViewActivity"; - - private static final String ARG_TEXT = "text"; - - private static final String ARG_REPO = "repo"; - - /** - * Create intent to show file in commit - * - * @param repository - * @param commit - * @param file - * @return intent - */ - public static Intent createIntent(Repository repository, String commit, GitHubFile file) { - Builder builder = new Builder("commit.file.VIEW"); - builder.repo(repository); - builder.add(EXTRA_HEAD, commit); - builder.add(EXTRA_PATH, file.filename()); - builder.add(EXTRA_BASE, file.sha()); - return builder.toIntent(); - } - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - @BindView(R.id.wv_code) - protected WebView codeView; - - private Repository repo; - - private String commit; - - private String sha; - - private String path; - - private String file; - - private boolean isMarkdownFile; - - private String renderedMarkdown; - - private GitBlob blob; - - private SourceEditor editor; - - private MenuItem markdownItem; - - @Inject - protected AvatarLoader avatars; - - @Inject - protected HttpImageGetter imageGetter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_commit_file_view); - - repo = getIntent().getParcelableExtra(EXTRA_REPOSITORY); - commit = getStringExtra(EXTRA_HEAD); - sha = getStringExtra(EXTRA_BASE); - path = getStringExtra(EXTRA_PATH); - - file = CommitUtils.getName(path); - isMarkdownFile = MarkdownUtils.isMarkdown(file); - - editor = new SourceEditor(codeView); - editor.setWrap(PreferenceUtils.getCodePreferences(this).getBoolean( - WRAP, false)); - - ActionBar actionBar = getSupportActionBar(); - int lastSlash = path.lastIndexOf('/'); - if (lastSlash != -1) { - actionBar.setTitle(path.substring(lastSlash + 1)); - } else { - actionBar.setTitle(path); - } - actionBar.setSubtitle(getString(R.string.commit_prefix) - + CommitUtils.abbreviate(commit)); - avatars.bind(actionBar, repo.owner()); - - loadContent(); - } - - @Override - public boolean onCreateOptionsMenu(final Menu optionsMenu) { - getMenuInflater().inflate(R.menu.activity_file_view, optionsMenu); - - MenuItem wrapItem = optionsMenu.findItem(R.id.m_wrap); - if (PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false)) { - wrapItem.setTitle(R.string.disable_wrapping); - } else { - wrapItem.setTitle(R.string.enable_wrapping); - } - - markdownItem = optionsMenu.findItem(R.id.m_render_markdown); - if (isMarkdownFile) { - markdownItem.setEnabled(blob != null); - markdownItem.setVisible(true); - if (PreferenceUtils.getCodePreferences(this).getBoolean( - RENDER_MARKDOWN, true)) { - markdownItem.setTitle(R.string.show_raw_markdown); - } else { - markdownItem.setTitle(R.string.render_markdown); - } - } - - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_wrap: - if (editor.getWrap()) { - item.setTitle(R.string.enable_wrapping); - } else { - item.setTitle(R.string.disable_wrapping); - } - editor.toggleWrap(); - PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) - .edit().putBoolean(WRAP, editor.getWrap())); - return true; - - case R.id.m_share: - shareFile(); - return true; - - case R.id.m_render_markdown: - if (editor.isMarkdown()) { - item.setTitle(R.string.render_markdown); - editor.toggleMarkdown(); - editor.setSource(file, blob); - } else { - item.setTitle(R.string.show_raw_markdown); - editor.toggleMarkdown(); - if (renderedMarkdown != null) { - editor.setSource(file, renderedMarkdown, false); - } else { - loadMarkdown(); - } - } - PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) - .edit().putBoolean(RENDER_MARKDOWN, editor.isMarkdown())); - return true; - - default: - return super.onOptionsItemSelected(item); - } - } - - private void shareFile() { - String id = InfoUtils.createRepoId(repo); - startActivity(ShareUtils.create( - path + " at " + CommitUtils.abbreviate(commit) + " on " + id, - "https://github.com/" + id + "/blob/" + commit + '/' + path)); - } - - private void loadMarkdown() { - loadingBar.setVisibility(View.VISIBLE); - codeView.setVisibility(View.GONE); - - String markdown = new String(Base64.decode(blob.content(), Base64.DEFAULT)); - - MarkdownLoader.load(this, markdown, repo, imageGetter, false) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(rendered -> { - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - - if (!TextUtils.isEmpty(rendered)) { - renderedMarkdown = rendered.toString(); - if (markdownItem != null) { - markdownItem.setEnabled(true); - } - editor.setMarkdown(true).setSource(file, renderedMarkdown, false); - } - } , e -> ToastUtils.show(this, R.string.error_rendering_markdown)); - } - - private void loadContent() { - ServiceGenerator.createService(this, GitService.class) - .getGitBlob(repo.owner().login(), repo.name(), sha) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - GitBlob gitBlob = response.body(); - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - - editor.setSource(path, gitBlob); - blob = gitBlob; - - if (markdownItem != null) { - markdownItem.setEnabled(true); - } - - if (isMarkdownFile - && PreferenceUtils.getCodePreferences(this).getBoolean( - RENDER_MARKDOWN, true)) { - loadMarkdown(); - } else { - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - editor.setSource(path, gitBlob); - } - }, error -> { - Log.e(TAG, "Loading commit file contents failed", error); - - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - ToastUtils.show(this, R.string.error_file_load); - }); - } - -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.kt new file mode 100644 index 000000000..c4174432e --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitFileViewActivity.kt @@ -0,0 +1,278 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.commit + +import android.content.Intent +import android.os.Bundle +import androidx.appcompat.app.ActionBar +import androidx.appcompat.widget.Toolbar +import android.text.TextUtils +import android.util.Base64 +import android.util.Log +import android.view.Menu +import android.view.MenuItem +import android.view.View +import android.webkit.WebView +import android.widget.ProgressBar + +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.GitHubFile +import com.meisolsson.githubsdk.model.Repository +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.R +import com.github.pockethub.android.core.commit.CommitUtils +import com.github.pockethub.android.ui.BaseActivity +import com.github.pockethub.android.ui.MarkdownLoader +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.HttpImageGetter +import com.github.pockethub.android.util.InfoUtils +import com.github.pockethub.android.util.MarkdownUtils +import com.github.pockethub.android.util.PreferenceUtils +import com.github.pockethub.android.util.ShareUtils +import com.github.pockethub.android.util.SourceEditor +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.model.git.GitBlob +import com.meisolsson.githubsdk.service.git.GitService +import javax.inject.Inject + +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers + +import com.github.pockethub.android.Intents.EXTRA_BASE +import com.github.pockethub.android.Intents.EXTRA_HEAD +import com.github.pockethub.android.Intents.EXTRA_PATH +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.util.PreferenceUtils.RENDER_MARKDOWN +import com.github.pockethub.android.util.PreferenceUtils.WRAP +import kotlinx.android.synthetic.main.activity_commit_file_view.* + +/** + * Activity to display the contents of a file in a commit + */ +class CommitFileViewActivity : BaseActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + @Inject + lateinit var imageGetter: HttpImageGetter + + private var repo: Repository? = null + + private var commit: String? = null + + private var sha: String? = null + + private var path: String? = null + + private var file: String? = null + + private var isMarkdownFile: Boolean = false + + private var renderedMarkdown: String? = null + + private var blob: GitBlob? = null + + private var markdownItem: MenuItem? = null + + private lateinit var editor: SourceEditor + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_commit_file_view) + + repo = intent.getParcelableExtra(EXTRA_REPOSITORY) + commit = getStringExtra(EXTRA_HEAD) + sha = getStringExtra(EXTRA_BASE) + path = getStringExtra(EXTRA_PATH) + + file = CommitUtils.getName(path) + isMarkdownFile = MarkdownUtils.isMarkdown(file) + editor = SourceEditor(wv_code) + editor.wrap = PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false) + + val actionBar = supportActionBar!! + val lastSlash = path!!.lastIndexOf('/') + if (lastSlash != -1) { + actionBar.title = path!!.substring(lastSlash + 1) + } else { + actionBar.title = path + } + actionBar.subtitle = getString(R.string.commit_prefix) + CommitUtils.abbreviate(commit)!! + avatars.bind(actionBar, repo!!.owner()!!) + + loadContent() + } + + override fun onCreateOptionsMenu(optionsMenu: Menu): Boolean { + menuInflater.inflate(R.menu.activity_file_view, optionsMenu) + + val wrapItem = optionsMenu.findItem(R.id.m_wrap) + if (PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false)) { + wrapItem.setTitle(R.string.disable_wrapping) + } else { + wrapItem.setTitle(R.string.enable_wrapping) + } + + markdownItem = optionsMenu.findItem(R.id.m_render_markdown) + if (isMarkdownFile) { + markdownItem!!.isEnabled = blob != null + markdownItem!!.isVisible = true + if (PreferenceUtils.getCodePreferences(this).getBoolean( + RENDER_MARKDOWN, true)) { + markdownItem!!.setTitle(R.string.show_raw_markdown) + } else { + markdownItem!!.setTitle(R.string.render_markdown) + } + } + + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.m_wrap -> { + if (editor.wrap) { + item.setTitle(R.string.enable_wrapping) + } else { + item.setTitle(R.string.disable_wrapping) + } + editor.toggleWrap() + PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) + .edit().putBoolean(WRAP, editor.wrap)) + return true + } + + R.id.m_share -> { + shareFile() + return true + } + + R.id.m_render_markdown -> { + if (editor.isMarkdown) { + item.setTitle(R.string.render_markdown) + editor.toggleMarkdown() + editor.setSource(file, blob) + } else { + item.setTitle(R.string.show_raw_markdown) + editor.toggleMarkdown() + if (renderedMarkdown != null) { + editor.setSource(file, renderedMarkdown, false) + } else { + loadMarkdown() + } + } + PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) + .edit().putBoolean(RENDER_MARKDOWN, editor.isMarkdown)) + return true + } + + else -> return super.onOptionsItemSelected(item) + } + } + + private fun shareFile() { + val id = InfoUtils.createRepoId(repo!!) + startActivity(ShareUtils.create( + path + " at " + CommitUtils.abbreviate(commit) + " on " + id, + "https://github.com/" + id + "/blob/" + commit + '/'.toString() + path)) + } + + private fun loadMarkdown() { + pb_loading.visibility = View.VISIBLE + wv_code.visibility = View.GONE + + val markdown = String(Base64.decode(blob!!.content(), Base64.DEFAULT)) + + MarkdownLoader.load(this, markdown, repo, imageGetter, false) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ rendered -> + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + + if (!TextUtils.isEmpty(rendered)) { + renderedMarkdown = rendered.toString() + if (markdownItem != null) { + markdownItem!!.isEnabled = true + } + editor!!.setMarkdown(true).setSource(file, renderedMarkdown, false) + } + }, { e -> ToastUtils.show(this, R.string.error_rendering_markdown) }) + } + + private fun loadContent() { + ServiceGenerator.createService(this, GitService::class.java) + .getGitBlob(repo!!.owner()!!.login(), repo!!.name(), sha) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + val gitBlob = response.body() + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + + editor.setSource(path, gitBlob) + blob = gitBlob + + if (markdownItem != null) { + markdownItem!!.isEnabled = true + } + + if (isMarkdownFile && PreferenceUtils.getCodePreferences(this).getBoolean( + RENDER_MARKDOWN, true)) { + loadMarkdown() + } else { + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + editor.setSource(path, gitBlob) + } + }, { error -> + Log.e(TAG, "Loading commit file contents failed", error) + + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + ToastUtils.show(this, R.string.error_file_load) + }) + } + + companion object { + + private val TAG = "CommitFileViewActivity" + + private val ARG_TEXT = "text" + + private val ARG_REPO = "repo" + + /** + * Create intent to show file in commit + * + * @param repository + * @param commit + * @param file + * @return intent + */ + fun createIntent(repository: Repository, commit: String, file: GitHubFile): Intent { + val builder = Builder("commit.file.VIEW") + builder.repo(repository) + builder.add(EXTRA_HEAD, commit) + builder.add(EXTRA_PATH, file.filename()) + builder.add(EXTRA_BASE, file.sha()) + return builder.toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitListFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitListFragment.kt index cb352ad30..7c4238bbc 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitListFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitListFragment.kt @@ -187,7 +187,7 @@ class CommitListFragment : BaseFragment(), DialogResultListener { if (item is CommitItem) { val position = itemListHandler.getItemPosition(item) startActivityForResult( - CommitViewActivity.createIntent(repo, position, itemListHandler.items), + CommitViewActivity.createIntent(repo!!, position, itemListHandler.items), COMMIT_VIEW ) } diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.java deleted file mode 100644 index ac2b74e0f..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.java +++ /dev/null @@ -1,168 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.commit; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import android.view.MenuItem; - -import com.github.pockethub.android.ui.item.commit.CommitItem; -import com.meisolsson.githubsdk.model.Commit; -import com.meisolsson.githubsdk.model.Repository; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.commit.CommitUtils; -import com.github.pockethub.android.ui.FragmentProvider; -import com.github.pockethub.android.ui.PagerActivity; -import com.github.pockethub.android.ui.ViewPager; -import com.github.pockethub.android.ui.repo.RepositoryViewActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.InfoUtils; -import com.xwray.groupie.Item; - -import javax.inject.Inject; - -import java.util.Collection; - -import butterknife.BindView; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_BASES; -import static com.github.pockethub.android.Intents.EXTRA_POSITION; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORY; - -/** - * Activity to display a commit - */ -public class CommitViewActivity extends PagerActivity { - - /** - * Create intent for this activity - * - * @param repository - * @param id - * @return intent - */ - public static Intent createIntent(final Repository repository, - final String id) { - return createIntent(repository, 0, id); - } - - /** - * Create intent for this activity - * - * @param repository - * @param position - * @param commits - * @return intent - */ - public static Intent createIntent(final Repository repository, - final int position, final Collection commits) { - String[] ids = new String[commits.size()]; - int index = 0; - for (Item item : commits) { - Commit commit = ((CommitItem) item).getCommit(); - ids[index++] = commit.sha(); - } - return createIntent(repository, position, ids); - } - - /** - * Create intent for this activity - * - * @param repository - * @param position - * @param ids - * @return intent - */ - public static Intent createIntent(final Repository repository, - final int position, final String... ids) { - Builder builder = new Builder("commits.VIEW"); - builder.add(EXTRA_POSITION, position); - builder.add(EXTRA_BASES, ids); - builder.repo(repository); - return builder.toIntent(); - } - - @BindView(R.id.vp_pages) - protected ViewPager pager; - - private Repository repository; - - private CharSequence[] ids; - - private int initialPosition; - - @Inject - protected AvatarLoader avatars; - - private CommitPagerAdapter adapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pager); - - repository = getIntent().getParcelableExtra(EXTRA_REPOSITORY); - ids = getCharSequenceArrayExtra(EXTRA_BASES); - initialPosition = getIntExtra(EXTRA_POSITION); - - adapter = new CommitPagerAdapter(this, repository, ids); - pager.setAdapter(adapter); - pager.addOnPageChangeListener(this); - pager.scheduleSetItem(initialPosition, this); - onPageSelected(initialPosition); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setSubtitle(InfoUtils.createRepoId(repository)); - avatars.bind(actionBar, repository.owner()); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - pager.removeOnPageChangeListener(this); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - Intent intent = RepositoryViewActivity.createIntent(repository); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onPageSelected(int position) { - super.onPageSelected(position); - - final String id = CommitUtils.abbreviate(ids[position].toString()); - getSupportActionBar().setTitle(getString(R.string.commit_prefix) + id); - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.kt new file mode 100644 index 000000000..b56deb4a1 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/commit/CommitViewActivity.kt @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.commit + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.view.MenuItem +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_BASES +import com.github.pockethub.android.Intents.EXTRA_POSITION +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.R +import com.github.pockethub.android.core.commit.CommitUtils +import com.github.pockethub.android.ui.FragmentProvider +import com.github.pockethub.android.ui.PagerActivity +import com.github.pockethub.android.ui.item.commit.CommitItem +import com.github.pockethub.android.ui.repo.RepositoryViewActivity +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.InfoUtils +import com.meisolsson.githubsdk.model.Repository +import com.xwray.groupie.Item +import kotlinx.android.synthetic.main.activity_pager.* +import javax.inject.Inject + +/** + * Activity to display a commit + */ +class CommitViewActivity : PagerActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + private var repository: Repository? = null + + private var ids: Array? = null + + private var initialPosition: Int = 0 + + private var adapter: CommitPagerAdapter? = null + + protected override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_pager) + + repository = intent.getParcelableExtra(EXTRA_REPOSITORY) + ids = getCharSequenceArrayExtra(EXTRA_BASES) + initialPosition = getIntExtra(EXTRA_POSITION) + + adapter = CommitPagerAdapter(this, repository, ids) + vp_pages.adapter = adapter + vp_pages.addOnPageChangeListener(this) + vp_pages.scheduleSetItem(initialPosition, this) + onPageSelected(initialPosition) + + val actionBar = supportActionBar!! + actionBar.setDisplayHomeAsUpEnabled(true) + actionBar.setSubtitle(InfoUtils.createRepoId(repository!!)) + avatars.bind(actionBar, repository!!.owner()!!) + } + + override fun onDestroy() { + super.onDestroy() + vp_pages.removeOnPageChangeListener(this) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + android.R.id.home -> { + val intent = RepositoryViewActivity.createIntent(repository!!) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + true + } + else -> super.onOptionsItemSelected(item) + } + } + + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + + val id = CommitUtils.abbreviate(ids!![position].toString()) + supportActionBar!!.title = getString(R.string.commit_prefix) + id!! + } + + override fun getProvider(): FragmentProvider? { + return adapter + } + + companion object { + + /** + * Create intent for this activity + * + * @param repository + * @param id + * @return intent + */ + fun createIntent(repository: Repository, + id: String): Intent { + return createIntent(repository, 0, id) + } + + /** + * Create intent for this activity + * + * @param repository + * @param position + * @param commits + * @return intent + */ + fun createIntent( + repository: Repository, + position: Int, + commits: Collection> + ): Intent { + val ids = arrayOfNulls(commits.size) as Array + for ((index, item) in commits.withIndex()) { + val commit = (item as CommitItem).commit + ids[index] = commit.sha()!! + } + return createIntent(repository, position, *ids) + } + + /** + * Create intent for this activity + * + * @param repository + * @param position + * @param ids + * @return intent + */ + fun createIntent(repository: Repository, position: Int, vararg ids: String): Intent { + val builder = Builder("commits.VIEW") + builder.add(EXTRA_POSITION, position) + builder.add(EXTRA_BASES, ids) + builder.repo(repository) + return builder.toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.java b/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.java deleted file mode 100644 index a2a0c94bc..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.java +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.gist; - -import android.os.Bundle; -import com.google.android.material.appbar.AppBarLayout; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import android.text.TextUtils; -import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.CheckBox; -import android.widget.EditText; - -import com.github.pockethub.android.R; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.rx.RxProgress; -import com.github.pockethub.android.ui.BaseActivity; -import com.github.pockethub.android.util.ShareUtils; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.GistFile; -import com.meisolsson.githubsdk.model.request.gist.CreateGist; -import com.meisolsson.githubsdk.service.gists.GistService; - -import java.util.HashMap; -import java.util.Map; - -import butterknife.BindView; -import butterknife.OnCheckedChanged; -import butterknife.OnFocusChange; -import butterknife.OnTextChanged; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -/** - * Activity to share a text selection as a public or private Gist - */ -public class CreateGistActivity extends BaseActivity { - - private static final String TAG = "CreateGistActivity"; - - @BindView(R.id.et_gist_description) - protected EditText descriptionText; - - @BindView(R.id.et_gist_name) - protected EditText nameText; - - @BindView(R.id.et_gist_content) - protected EditText contentText; - - @BindView(R.id.cb_public) - protected CheckBox publicCheckBox; - - @BindView(R.id.appbar) - protected AppBarLayout appBarLayout; - - private MenuItem menuItem; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_gist_create); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - - String text = ShareUtils.getBody(getIntent()); - if (!TextUtils.isEmpty(text)) { - contentText.setText(text); - } - - String subject = ShareUtils.getSubject(getIntent()); - if (!TextUtils.isEmpty(subject)) { - descriptionText.setText(subject); - } - - updateCreateMenu(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - super.onCreateOptionsMenu(menu); - getMenuInflater().inflate(R.menu.activity_create_gist, menu); - menuItem = menu.findItem(R.id.create_gist); - updateCreateMenu(); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.create_gist: - createGist(); - return true; - case android.R.id.home: - finish(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - // Fully expand the AppBar if something in it gets focus - @OnFocusChange({R.id.et_gist_description, R.id.et_gist_name, R.id.cb_public}) - protected void expandAppBarOnFocusChangeListener(View v, boolean hasFocus) { - if (hasFocus) { - appBarLayout.setExpanded(true); - } - } - - @OnCheckedChanged(R.id.cb_public) - @OnTextChanged(value = {R.id.et_gist_description, R.id.et_gist_name, R.id.cb_public}) - protected void expandAppBarOnChange() { - appBarLayout.setExpanded(true); - } - - @OnTextChanged(R.id.et_gist_content) - protected void onContentTextChange() { - updateCreateMenu(); - } - - private void updateCreateMenu() { - updateCreateMenu(contentText.getText()); - } - - private void updateCreateMenu(CharSequence text) { - if (menuItem != null) { - menuItem.setEnabled(!TextUtils.isEmpty(text)); - } - } - - private void createGist() { - final boolean isPublic = publicCheckBox.isChecked(); - - String enteredDescription = descriptionText.getText().toString().trim(); - final String description = enteredDescription.length() > 0 ? enteredDescription - : getString(R.string.gist_description_hint); - - String enteredName = nameText.getText().toString().trim(); - final String name = enteredName.length() > 0 ? enteredName - : getString(R.string.gist_file_name_hint); - - final String content = contentText.getText().toString(); - Map map = new HashMap<>(); - map.put(name, GistFile.builder().filename(name).content(content).build()); - - CreateGist createGist = CreateGist.builder() - .files(map) - .description(description) - .isPublic(isPublic) - .build(); - - ServiceGenerator.createService(this, GistService.class) - .createGist(createGist) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .compose(RxProgress.bindToLifecycle(this, R.string.creating_gist)) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - startActivity(GistsViewActivity.createIntent(response.body())); - setResult(RESULT_OK); - finish(); - }, e -> { - Log.d(TAG, "Exception creating Gist", e); - ToastUtils.show(this, e.getMessage()); - }); - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.kt new file mode 100644 index 000000000..1db596209 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/CreateGistActivity.kt @@ -0,0 +1,180 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.gist + +import android.os.Bundle +import android.text.TextUtils +import android.util.Log +import android.view.Menu +import android.view.MenuItem +import android.view.View +import android.view.View.OnFocusChangeListener +import com.github.pockethub.android.R +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.rx.RxProgress +import com.github.pockethub.android.ui.BaseActivity +import com.github.pockethub.android.ui.TextWatcherAdapter +import com.github.pockethub.android.util.ShareUtils +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.GistFile +import com.meisolsson.githubsdk.model.request.gist.CreateGist +import com.meisolsson.githubsdk.service.gists.GistService +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_gist_create.* +import java.util.HashMap + +/** + * Activity to share a text selection as a public or private Gist + */ +class CreateGistActivity : BaseActivity() { + + private var menuItem: MenuItem? = null + + private val expandAppBarOnFocusChangeListener = + OnFocusChangeListener { v: View, hasFocus: Boolean -> + if (hasFocus) { + appbar.setExpanded(true) + } + } + + private val expandAppBarOnChange = object : TextWatcherAdapter() { + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + appbar.setExpanded(true) + } + } + + private val onContentTextChange = object : TextWatcherAdapter() { + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + updateCreateMenu() + } + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_gist_create) + + supportActionBar!!.setDisplayHomeAsUpEnabled(true) + + val text = ShareUtils.getBody(intent) + if (!TextUtils.isEmpty(text)) { + et_gist_content.setText(text) + } + + val subject = ShareUtils.getSubject(intent) + if (!TextUtils.isEmpty(subject)) { + et_gist_description.setText(subject) + } + + et_gist_description.onFocusChangeListener = expandAppBarOnFocusChangeListener + et_gist_name.onFocusChangeListener = expandAppBarOnFocusChangeListener + cb_public.onFocusChangeListener = expandAppBarOnFocusChangeListener + + cb_public.setOnCheckedChangeListener { buttonView, isChecked -> appbar.setExpanded(true) } + + et_gist_description.addTextChangedListener(expandAppBarOnChange) + et_gist_name.addTextChangedListener(expandAppBarOnChange) + cb_public.addTextChangedListener(expandAppBarOnChange) + + et_gist_content.addTextChangedListener(onContentTextChange) + + updateCreateMenu() + } + + override fun onDestroy() { + super.onDestroy() + et_gist_description.removeTextChangedListener(expandAppBarOnChange) + et_gist_name.removeTextChangedListener(expandAppBarOnChange) + cb_public.removeTextChangedListener(expandAppBarOnChange) + + et_gist_content.removeTextChangedListener(onContentTextChange) + } + + override fun onCreateOptionsMenu(menu: Menu): Boolean { + super.onCreateOptionsMenu(menu) + menuInflater.inflate(R.menu.activity_create_gist, menu) + menuItem = menu.findItem(R.id.create_gist) + updateCreateMenu() + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + R.id.create_gist -> { + createGist() + true + } + android.R.id.home -> { + finish() + true + } + else -> super.onOptionsItemSelected(item) + } + } + + private fun updateCreateMenu(text: CharSequence = et_gist_content.text) { + if (menuItem != null) { + menuItem!!.isEnabled = !TextUtils.isEmpty(text) + } + } + + private fun createGist() { + val isPublic = cb_public.isChecked + + val enteredDescription = et_gist_description.text.toString().trim { it <= ' ' } + val description = if (enteredDescription.isNotEmpty()) + enteredDescription + else + getString(R.string.gist_description_hint) + + val enteredName = et_gist_name.text.toString().trim { it <= ' ' } + val name = if (enteredName.isNotEmpty()) + enteredName + else + getString(R.string.gist_file_name_hint) + + val content = et_gist_content.text.toString() + val map = HashMap() + map[name] = GistFile.builder().filename(name).content(content).build() + + val createGist = CreateGist.builder() + .files(map) + .description(description) + .isPublic(isPublic) + .build() + + ServiceGenerator.createService(this, GistService::class.java) + .createGist(createGist) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .compose(RxProgress.bindToLifecycle(this, R.string.creating_gist)) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + startActivity(GistsViewActivity.createIntent(response.body())) + setResult(RESULT_OK) + finish() + }, { e -> + Log.d(TAG, "Exception creating Gist", e) + ToastUtils.show(this, e.message) + }) + } + + companion object { + + private val TAG = "CreateGistActivity" + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.java b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.java deleted file mode 100644 index fc0bc5253..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.java +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.gist; - -import android.annotation.SuppressLint; -import android.content.Context; -import android.content.SharedPreferences; -import android.content.SharedPreferences.OnSharedPreferenceChangeListener; -import android.os.Bundle; -import androidx.annotation.NonNull; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.view.ViewGroup; -import android.webkit.WebView; - -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.gist.GistStore; -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.util.PreferenceUtils; -import com.github.pockethub.android.util.SourceEditor; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.model.Gist; -import com.meisolsson.githubsdk.model.GistFile; -import javax.inject.Inject; - -import java.io.IOException; -import java.util.Map; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static com.github.pockethub.android.Intents.EXTRA_GIST_FILE; -import static com.github.pockethub.android.Intents.EXTRA_GIST_ID; -import static com.github.pockethub.android.util.PreferenceUtils.WRAP; - -/** - * Fragment to display the content of a file in a Gist - */ -public class GistFileFragment extends BaseFragment implements - OnSharedPreferenceChangeListener { - - @BindView(R.id.wv_code) - protected WebView webView; - - private String gistId; - - private GistFile file; - - private Gist gist; - - @Inject - protected GistStore store; - - private SourceEditor editor; - - private SharedPreferences codePrefs; - - private MenuItem wrapItem; - - @Override - public void onAttach(Context context) { - super.onAttach(context); - - gistId = getStringExtra(EXTRA_GIST_ID); - } - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - file = (GistFile) getArguments().get(EXTRA_GIST_FILE); - gist = store.getGist(gistId); - if (gist == null) { - gist = Gist.builder().id(gistId).build(); - } - - codePrefs = PreferenceUtils.getCodePreferences(getActivity()); - codePrefs.registerOnSharedPreferenceChangeListener(this); - } - - @Override - public void onDestroy() { - super.onDestroy(); - - codePrefs.unregisterOnSharedPreferenceChangeListener(this); - } - - @Override - public void onDestroyView() { - super.onDestroyView(); - } - - @Override - public void onCreateOptionsMenu(Menu optionsMenu, MenuInflater inflater) { - inflater.inflate(R.menu.fragment_code_view, optionsMenu); - - wrapItem = optionsMenu.findItem(R.id.m_wrap); - updateWrapItem(); - } - - private void updateWrapItem() { - if (wrapItem != null) { - if (codePrefs.getBoolean(WRAP, false)) { - wrapItem.setTitle(R.string.disable_wrapping); - } else { - wrapItem.setTitle(R.string.enable_wrapping); - } - } - } - - @SuppressLint("CommitPrefEdits") - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_wrap: - if (editor.getWrap()) { - item.setTitle(R.string.enable_wrapping); - editor.setWrap(false); - } else { - item.setTitle(R.string.disable_wrapping); - editor.setWrap(true); - } - PreferenceUtils.save(codePrefs.edit().putBoolean(WRAP, - editor.getWrap())); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - private void loadSource() { - store.refreshGist(gistId) - .map(gist -> { - Map files = gist.files(); - if (files == null) { - throw new IOException(); - } - - GistFile loadedFile = files.get(file.filename()); - if (loadedFile == null) { - throw new IOException(); - } - - return loadedFile; - }) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(loadedFile -> { - file = loadedFile; - getArguments().putParcelable(EXTRA_GIST_FILE, file); - if (file.content() != null) { - showSource(); - } - }, e -> ToastUtils.show(getActivity(), R.string.error_gist_file_load)); - } - - private void showSource() { - editor.setSource(file.filename(), file.content(), false); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_gist_file_view, container, false); - } - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - editor = new SourceEditor(webView); - editor.setWrap(PreferenceUtils.getCodePreferences(getActivity()) - .getBoolean(WRAP, false)); - - if (file.content() != null) { - showSource(); - } else { - loadSource(); - } - } - - @Override - public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, - String key) { - if (WRAP.equals(key)) { - updateWrapItem(); - editor.setWrap(sharedPreferences.getBoolean(WRAP, false)); - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.kt new file mode 100644 index 000000000..cdc6f61c7 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFileFragment.kt @@ -0,0 +1,176 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.gist + +import android.annotation.SuppressLint +import android.content.Context +import android.content.SharedPreferences +import android.content.SharedPreferences.OnSharedPreferenceChangeListener +import android.os.Bundle +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.ViewGroup +import com.github.pockethub.android.Intents.EXTRA_GIST_FILE +import com.github.pockethub.android.Intents.EXTRA_GIST_ID +import com.github.pockethub.android.R +import com.github.pockethub.android.core.gist.GistStore +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.util.PreferenceUtils +import com.github.pockethub.android.util.PreferenceUtils.WRAP +import com.github.pockethub.android.util.SourceEditor +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.model.Gist +import com.meisolsson.githubsdk.model.GistFile +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_commit_file_view.* +import java.io.IOException +import javax.inject.Inject + +/** + * Fragment to display the content of a file in a Gist + */ +class GistFileFragment : BaseFragment(), OnSharedPreferenceChangeListener { + + @Inject + lateinit var store: GistStore + + private var gistId: String? = null + + private var file: GistFile? = null + + private var gist: Gist? = null + + private lateinit var editor: SourceEditor + + private var codePrefs: SharedPreferences? = null + + private var wrapItem: MenuItem? = null + + override fun onAttach(context: Context?) { + super.onAttach(context) + + gistId = getStringExtra(EXTRA_GIST_ID) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + file = arguments!!.get(EXTRA_GIST_FILE) as GistFile + gist = store.getGist(gistId) + if (gist == null) { + gist = Gist.builder().id(gistId).build() + } + + codePrefs = PreferenceUtils.getCodePreferences(activity) + codePrefs!!.registerOnSharedPreferenceChangeListener(this) + } + + override fun onDestroy() { + super.onDestroy() + codePrefs!!.unregisterOnSharedPreferenceChangeListener(this) + } + + override fun onCreateOptionsMenu(optionsMenu: Menu?, inflater: MenuInflater?) { + inflater!!.inflate(R.menu.fragment_code_view, optionsMenu) + + wrapItem = optionsMenu!!.findItem(R.id.m_wrap) + updateWrapItem() + } + + private fun updateWrapItem() { + if (wrapItem != null) { + if (codePrefs!!.getBoolean(WRAP, false)) { + wrapItem!!.setTitle(R.string.disable_wrapping) + } else { + wrapItem!!.setTitle(R.string.enable_wrapping) + } + } + } + + @SuppressLint("CommitPrefEdits") + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + return when (item!!.itemId) { + R.id.m_wrap -> { + if (editor.wrap) { + item.setTitle(R.string.enable_wrapping) + editor.wrap = false + } else { + item.setTitle(R.string.disable_wrapping) + editor.wrap = true + } + PreferenceUtils.save(codePrefs!!.edit().putBoolean(WRAP, + editor.wrap)) + true + } + else -> super.onOptionsItemSelected(item) + } + } + + private fun loadSource() { + store.refreshGist(gistId) + .map { gist -> + val files = gist.files() ?: throw IOException() + + val loadedFile = files[file!!.filename()] ?: throw IOException() + + loadedFile + } + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ loadedFile -> + file = loadedFile + arguments!!.putParcelable(EXTRA_GIST_FILE, file) + if (file!!.content() != null) { + showSource() + } + }, { e -> ToastUtils.show(activity, R.string.error_gist_file_load) }) + } + + private fun showSource() { + editor.setSource(file!!.filename(), file!!.content(), false) + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_gist_file_view, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + editor = SourceEditor(wv_code) + editor.wrap = PreferenceUtils.getCodePreferences(activity).getBoolean(WRAP, false) + + if (file!!.content() != null) { + showSource() + } else { + loadSource() + } + } + + override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences, key: String) { + if (WRAP == key) { + updateWrapItem() + editor.wrap = sharedPreferences.getBoolean(WRAP, false) + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.java deleted file mode 100644 index d4bc39b81..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.java +++ /dev/null @@ -1,170 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.gist; - -import android.content.Intent; -import android.os.Bundle; -import com.google.android.material.tabs.TabLayout; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; -import android.view.View; -import android.widget.ProgressBar; - -import com.github.pockethub.android.core.gist.RefreshGistTaskFactory; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.meisolsson.githubsdk.model.Gist; -import com.meisolsson.githubsdk.model.User; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.gist.GistStore; -import com.github.pockethub.android.ui.FragmentProvider; -import com.github.pockethub.android.ui.PagerActivity; -import com.github.pockethub.android.ui.ViewPager; -import com.github.pockethub.android.util.AvatarLoader; -import javax.inject.Inject; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_GIST_ID; -import static com.github.pockethub.android.Intents.EXTRA_POSITION; - -/** - * Activity to page through the content of all the files in a Gist - */ -public class GistFilesViewActivity extends PagerActivity { - - /** - * Create intent to show files with an initial selected file - * - * @param gist - * @param position - * @return intent - */ - public static Intent createIntent(Gist gist, int position) { - return new Builder("gist.files.VIEW").gist(gist.id()) - .add(EXTRA_POSITION, position).toIntent(); - } - - private String gistId; - - private int initialPosition; - - @BindView(R.id.vp_pages) - protected ViewPager pager; - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - @BindView(R.id.sliding_tabs_layout) - protected TabLayout tabs; - - private Gist gist; - - @Inject - protected GistStore store; - - @Inject - protected AvatarLoader avatars; - - @Inject - protected RefreshGistTaskFactory refreshGistTaskFactory; - - private GistFilesPagerAdapter adapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pager_with_title); - - gistId = getStringExtra(EXTRA_GIST_ID); - initialPosition = getIntExtra(EXTRA_POSITION); - - if (initialPosition < 0) { - initialPosition = 0; - } - - getSupportActionBar().setTitle(getString(R.string.gist_title) + gistId); - - gist = store.getGist(gistId); - if (gist != null) { - configurePager(); - } else { - loadingBar.setVisibility(View.VISIBLE); - pager.setVisibility(View.GONE); - tabs.setVisibility(View.GONE); - refreshGistTaskFactory.create(this, gistId) - .refresh() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(gist -> { - this.gist = gist.getGist(); - configurePager(); - }); - } - } - - private void configurePager() { - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - User author = gist.owner(); - if (author != null) { - actionBar.setSubtitle(author.login()); - avatars.bind(actionBar, author); - } else { - actionBar.setSubtitle(R.string.anonymous); - } - - loadingBar.setVisibility(View.GONE); - pager.setVisibility(View.VISIBLE); - tabs.setVisibility(View.VISIBLE); - - adapter = new GistFilesPagerAdapter(this, gist); - pager.setAdapter(adapter); - tabs.setupWithViewPager(pager); - - if (initialPosition < adapter.getCount()) { - pager.scheduleSetItem(initialPosition); - onPageSelected(initialPosition); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - if (gist != null) { - Intent intent = GistsViewActivity.createIntent(gist); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP - | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - } - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.kt new file mode 100644 index 000000000..a8bbba9d8 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFilesViewActivity.kt @@ -0,0 +1,151 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.gist + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.view.MenuItem +import android.view.View +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_GIST_ID +import com.github.pockethub.android.Intents.EXTRA_POSITION +import com.github.pockethub.android.R +import com.github.pockethub.android.core.gist.GistStore +import com.github.pockethub.android.core.gist.RefreshGistTaskFactory +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.FragmentProvider +import com.github.pockethub.android.ui.PagerActivity +import com.github.pockethub.android.util.AvatarLoader +import com.meisolsson.githubsdk.model.Gist +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_pager_with_title.* +import javax.inject.Inject + +/** + * Activity to page through the content of all the files in a Gist + */ +class GistFilesViewActivity : PagerActivity() { + + private var gistId: String? = null + + private var initialPosition: Int = 0 + + private var gist: Gist? = null + + @Inject + lateinit var store: GistStore + + @Inject + lateinit var avatars: AvatarLoader + + @Inject + lateinit var refreshGistTaskFactory: RefreshGistTaskFactory + + private var adapter: GistFilesPagerAdapter? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_pager_with_title) + + gistId = getStringExtra(EXTRA_GIST_ID) + initialPosition = getIntExtra(EXTRA_POSITION) + + if (initialPosition < 0) { + initialPosition = 0 + } + + supportActionBar!!.title = getString(R.string.gist_title) + gistId!! + + gist = store.getGist(gistId) + if (gist != null) { + configurePager() + } else { + pb_loading.visibility = View.VISIBLE + vp_pages.visibility = View.GONE + sliding_tabs_layout.visibility = View.GONE + refreshGistTaskFactory.create(this, gistId) + .refresh() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe { gist -> + this.gist = gist.gist + configurePager() + } + } + } + + private fun configurePager() { + val actionBar = supportActionBar!! + actionBar.setDisplayHomeAsUpEnabled(true) + val author = gist!!.owner() + if (author != null) { + actionBar.subtitle = author.login() + avatars.bind(actionBar, author) + } else { + actionBar.setSubtitle(R.string.anonymous) + } + + pb_loading.visibility = View.GONE + vp_pages.visibility = View.VISIBLE + sliding_tabs_layout.visibility = View.VISIBLE + + adapter = GistFilesPagerAdapter(this, gist) + vp_pages.adapter = adapter + sliding_tabs_layout.setupWithViewPager(vp_pages) + + if (initialPosition < adapter!!.count) { + vp_pages!!.scheduleSetItem(initialPosition) + onPageSelected(initialPosition) + } + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + android.R.id.home -> { + if (gist != null) { + val intent = GistsViewActivity.createIntent(gist!!) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + } + true + } + else -> super.onOptionsItemSelected(item) + } + } + + override fun getProvider(): FragmentProvider? { + return adapter + } + + companion object { + + /** + * Create intent to show files with an initial selected file + * + * @param gist + * @param position + * @return intent + */ + fun createIntent(gist: Gist, position: Int): Intent { + return Builder("gist.files.VIEW").gist(gist.id()) + .add(EXTRA_POSITION, position).toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.java b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.java deleted file mode 100644 index 0684b6dab..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.java +++ /dev/null @@ -1,434 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.gist; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Log; -import android.view.*; -import android.widget.ProgressBar; -import androidx.annotation.NonNull; -import androidx.fragment.app.FragmentActivity; -import androidx.recyclerview.widget.DividerItemDecoration; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; -import butterknife.BindView; -import com.github.pockethub.android.R; -import com.github.pockethub.android.accounts.AccountUtils; -import com.github.pockethub.android.core.OnLoadListener; -import com.github.pockethub.android.core.gist.GistStore; -import com.github.pockethub.android.core.gist.RefreshGistTaskFactory; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.rx.RxProgress; -import com.github.pockethub.android.ui.ConfirmDialogFragment; -import com.github.pockethub.android.ui.DialogResultListener; -import com.github.pockethub.android.ui.base.BaseFragment; -import com.github.pockethub.android.ui.comment.DeleteCommentListener; -import com.github.pockethub.android.ui.comment.EditCommentListener; -import com.github.pockethub.android.ui.item.GitHubCommentItem; -import com.github.pockethub.android.ui.item.LoadingItem; -import com.github.pockethub.android.ui.item.gist.GistFileItem; -import com.github.pockethub.android.ui.item.gist.GistHeaderItem; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.HttpImageGetter; -import com.github.pockethub.android.util.ShareUtils; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Gist; -import com.meisolsson.githubsdk.model.GistFile; -import com.meisolsson.githubsdk.model.GitHubComment; -import com.meisolsson.githubsdk.model.User; -import com.meisolsson.githubsdk.service.gists.GistCommentService; -import com.meisolsson.githubsdk.service.gists.GistService; -import com.xwray.groupie.GroupAdapter; -import com.xwray.groupie.Item; -import com.xwray.groupie.OnItemClickListener; -import com.xwray.groupie.Section; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import javax.inject.Inject; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; -import java.util.Map; - -import static android.app.Activity.RESULT_OK; -import static android.view.View.GONE; -import static android.view.View.VISIBLE; -import static com.github.pockethub.android.Intents.EXTRA_COMMENT; -import static com.github.pockethub.android.Intents.EXTRA_GIST_ID; -import static com.github.pockethub.android.RequestCodes.*; - -/** - * Activity to display an existing Gist - */ -public class GistFragment extends BaseFragment implements OnItemClickListener, DialogResultListener { - - private static final String TAG = "GistFragment"; - - private String gistId; - - private List comments; - - private Gist gist; - - @BindView(R.id.list) - protected RecyclerView list; - - @BindView(R.id.pb_loading) - protected ProgressBar progress; - - @Inject - protected GistStore store; - - @Inject - protected RefreshGistTaskFactory refreshGistTaskFactory; - - @Inject - protected HttpImageGetter imageGetter; - - private GroupAdapter adapter = new GroupAdapter(); - - private Section mainSection = new Section(); - - private Section filesSection = new Section(); - - private Section commentsSection = new Section(); - - private boolean starred; - - private boolean loadFinished; - - @Inject - protected AvatarLoader avatars; - - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - gistId = getArguments().getString(EXTRA_GIST_ID); - gist = store.getGist(gistId); - - mainSection.add(filesSection); - mainSection.add(commentsSection); - adapter.add(mainSection); - - adapter.setOnItemClickListener(this); - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - return inflater.inflate(R.layout.fragment_comment_list, container, false); - } - - @Override - public void onViewCreated(@NonNull View view, Bundle savedInstanceState) { - super.onViewCreated(view, savedInstanceState); - DividerItemDecoration itemDecoration = - new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL); - itemDecoration.setDrawable(getResources().getDrawable(R.drawable.list_divider_5dp)); - - list.setLayoutManager(new LinearLayoutManager(getActivity())); - list.addItemDecoration(itemDecoration); - list.setAdapter(adapter); - } - - @Override - public void onActivityCreated(Bundle savedInstanceState) { - super.onActivityCreated(savedInstanceState); - if (gist != null) { - updateHeader(gist); - updateFiles(gist); - } - - if (gist == null || (gist.comments() > 0 && comments == null)) { - mainSection.setFooter(new LoadingItem(R.string.loading_comments)); - } - - if (gist != null && comments != null) { - updateList(gist, comments); - } else { - refreshGist(); - } - } - - private boolean isOwner() { - if (gist == null) { - return false; - } - User user = gist.owner(); - if (user == null) { - return false; - } - String login = AccountUtils.getLogin(getActivity()); - return login != null && login.equals(user.login()); - } - - private void updateHeader(Gist gist) { - mainSection.setHeader(new GistHeaderItem(getActivity(), gist)); - progress.setVisibility(GONE); - list.setVisibility(VISIBLE); - } - - @Override - public void onCreateOptionsMenu(Menu options, MenuInflater inflater) { - inflater.inflate(R.menu.fragment_gist_view, options); - } - - @Override - public void onPrepareOptionsMenu(Menu menu) { - boolean owner = isOwner(); - if (!owner) { - menu.removeItem(R.id.m_delete); - MenuItem starItem = menu.findItem(R.id.m_star); - starItem.setEnabled(loadFinished && !owner); - if (starred) { - starItem.setTitle(R.string.unstar); - } else { - starItem.setTitle(R.string.star); - } - } else { - menu.removeItem(R.id.m_star); - } - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - if (gist == null) { - return super.onOptionsItemSelected(item); - } - - switch (item.getItemId()) { - case R.id.m_comment: - startActivityForResult(CreateCommentActivity.createIntent(gist), - COMMENT_CREATE); - return true; - case R.id.m_star: - if (starred) { - unstarGist(); - } else { - starGist(); - } - return true; - case R.id.m_refresh: - refreshGist(); - return true; - case R.id.m_share: - shareGist(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - private void starGist() { - ToastUtils.show(getActivity(), R.string.starring_gist); - ServiceGenerator.createService(getActivity(), GistService.class) - .starGist(gistId) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> starred = response.code() == 204, - e -> ToastUtils.show((Activity) getContext(), e.getMessage())); - } - - private void shareGist() { - StringBuilder subject = new StringBuilder("Gist "); - String id = gist.id(); - subject.append(id); - User user = gist.owner(); - if (user != null && !TextUtils.isEmpty(user.login())) { - subject.append(" by ").append(user.login()); - } - startActivity(ShareUtils.create(subject, "https://gist.github.com/" - + id)); - } - - private void unstarGist() { - ToastUtils.show(getActivity(), R.string.unstarring_gist); - ServiceGenerator.createService(getActivity(), GistService.class) - .unstarGist(gistId) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> starred = !(response.code() == 204), - e -> ToastUtils.show((Activity) getContext(), e.getMessage())); - } - - @Override - public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (RESULT_OK != resultCode || data == null) { - return; - } - - switch (requestCode) { - case COMMENT_CREATE: - GitHubComment comment = data - .getParcelableExtra(EXTRA_COMMENT); - if (comments != null) { - comments.add(comment); - gist = gist.toBuilder().comments(gist.comments() + 1).build(); - updateList(gist, comments); - } else { - refreshGist(); - } - return; - case COMMENT_EDIT: - comment = data.getParcelableExtra(EXTRA_COMMENT); - if (comments != null && comment != null) { - int position = Collections.binarySearch(comments, comment, (lhs, rhs) -> - lhs.id().compareTo(rhs.id())); - imageGetter.removeFromCache(comment.id()); - comments.set(position, comment); - updateList(gist, comments); - } else { - refreshGist(); - } - return; - } - - super.onActivityResult(requestCode, resultCode, data); - } - - private void updateFiles(Gist gist) { - final Activity activity = getActivity(); - if (activity == null) { - return; - } - - Map files = gist.files(); - if (files == null || files.isEmpty()) { - filesSection.update(Collections.emptyList()); - return; - } - - List fileItems = new ArrayList<>(); - for (GistFile file : files.values()) { - fileItems.add(new GistFileItem(file)); - } - filesSection.update(fileItems); - } - - private void updateList(Gist gist, List comments) { - List items = new ArrayList<>(); - String username = AccountUtils.getLogin(getActivity()); - boolean isOwner = isOwner(); - - for (GitHubComment comment : comments) { - items.add( - new GitHubCommentItem(avatars, imageGetter, editCommentListener, - deleteCommentListener, username, isOwner, comment) - ); - } - commentsSection.update(items); - mainSection.removeFooter(); - - updateHeader(gist); - updateFiles(gist); - } - - private void refreshGist() { - refreshGistTaskFactory.create(getActivity(), gistId) - .refresh() - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .filter(fullGist -> isAdded()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(fullGist -> { - FragmentActivity activity = getActivity(); - if (activity instanceof OnLoadListener) { - ((OnLoadListener) activity).loaded(fullGist.getGist()); - } - - starred = fullGist.getStarred(); - loadFinished = true; - gist = fullGist.getGist(); - comments = fullGist.getComments(); - updateList(fullGist.getGist(), fullGist.getComments()); - }, e -> ToastUtils.show(getActivity(), R.string.error_gist_load)); - } - - @Override - public void onItemClick(@NonNull Item item, @NonNull View view) { - if (item instanceof GistFileItem) { - int position = adapter.getAdapterPosition(item); - startActivity(GistFilesViewActivity.createIntent(gist, position - 1)); - } - } - - @Override - public void onDialogResult(int requestCode, int resultCode, Bundle arguments) { - if (RESULT_OK != resultCode) { - return; - } - - switch (requestCode) { - case COMMENT_DELETE: - final GitHubComment comment = arguments.getParcelable(EXTRA_COMMENT); - ServiceGenerator.createService(getActivity(), GistCommentService.class) - .deleteGistComment(gistId, comment.id()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .compose(RxProgress.bindToLifecycle(getActivity(), R.string.deleting_comment)) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - // Update comment list - if (comments != null) { - int position = Collections.binarySearch(comments, - comment, (lhs, rhs) -> lhs.id().compareTo(rhs.id())); - comments.remove(position); - updateList(gist, comments); - } else { - refreshGist(); - } - }, e -> { - Log.d(TAG, "Exception deleting comment on gist", e); - ToastUtils.show((Activity) getContext(), e.getMessage()); - }); - break; - } - } - - /** - * Edit existing comment - */ - final EditCommentListener editCommentListener = new EditCommentListener() { - @Override - public void onEditComment(GitHubComment comment) { - startActivityForResult( - EditCommentActivity.createIntent(gist, comment), - COMMENT_EDIT); - } - }; - - /** - * Delete existing comment - */ - final DeleteCommentListener deleteCommentListener = comment -> { - Bundle args = new Bundle(); - args.putParcelable(EXTRA_COMMENT, comment); - ConfirmDialogFragment.show( - getActivity(), - COMMENT_DELETE, - getActivity() - .getString(R.string.confirm_comment_delete_title), - getActivity().getString( - R.string.confirm_comment_delete_message), args); - }; -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.kt new file mode 100644 index 000000000..f4ad3b20d --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/GistFragment.kt @@ -0,0 +1,420 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.gist + +import android.app.Activity +import android.app.Activity.RESULT_OK +import android.content.Intent +import android.os.Bundle +import android.text.TextUtils +import android.util.Log +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuInflater +import android.view.MenuItem +import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE +import android.view.ViewGroup +import androidx.annotation.NonNull +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import com.github.pockethub.android.Intents.EXTRA_COMMENT +import com.github.pockethub.android.Intents.EXTRA_GIST_ID +import com.github.pockethub.android.R +import com.github.pockethub.android.RequestCodes.COMMENT_CREATE +import com.github.pockethub.android.RequestCodes.COMMENT_DELETE +import com.github.pockethub.android.RequestCodes.COMMENT_EDIT +import com.github.pockethub.android.accounts.AccountUtils +import com.github.pockethub.android.core.OnLoadListener +import com.github.pockethub.android.core.gist.GistStore +import com.github.pockethub.android.core.gist.RefreshGistTaskFactory +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.rx.RxProgress +import com.github.pockethub.android.ui.ConfirmDialogFragment +import com.github.pockethub.android.ui.DialogResultListener +import com.github.pockethub.android.ui.base.BaseFragment +import com.github.pockethub.android.ui.comment.DeleteCommentListener +import com.github.pockethub.android.ui.comment.EditCommentListener +import com.github.pockethub.android.ui.item.GitHubCommentItem +import com.github.pockethub.android.ui.item.LoadingItem +import com.github.pockethub.android.ui.item.gist.GistFileItem +import com.github.pockethub.android.ui.item.gist.GistHeaderItem +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.HttpImageGetter +import com.github.pockethub.android.util.ShareUtils +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Gist +import com.meisolsson.githubsdk.model.GitHubComment +import com.meisolsson.githubsdk.service.gists.GistCommentService +import com.meisolsson.githubsdk.service.gists.GistService +import com.xwray.groupie.GroupAdapter +import com.xwray.groupie.Item +import com.xwray.groupie.OnItemClickListener +import com.xwray.groupie.Section +import com.xwray.groupie.ViewHolder +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.fragment_comment_list.* +import java.util.ArrayList +import java.util.Collections +import javax.inject.Inject + +/** + * Activity to display an existing Gist + */ +class GistFragment : BaseFragment(), OnItemClickListener, DialogResultListener { + + @Inject + lateinit var store: GistStore + + @Inject + lateinit var refreshGistTaskFactory: RefreshGistTaskFactory + + @Inject + lateinit var imageGetter: HttpImageGetter + + @Inject + lateinit var avatars: AvatarLoader + + private var gistId: String? = null + + private var comments: MutableList? = null + + private var gist: Gist? = null + + private val adapter = GroupAdapter() + + private val mainSection = Section() + + private val filesSection = Section() + + private val commentsSection = Section() + + private var starred: Boolean = false + + private var loadFinished: Boolean = false + + private val isOwner: Boolean + get() { + if (gist == null) { + return false + } + val user = gist!!.owner() ?: return false + val login = AccountUtils.getLogin(activity) + return login != null && login == user.login() + } + + /** + * Edit existing comment + */ + private val editCommentListener: EditCommentListener = EditCommentListener { comment -> + startActivityForResult( + EditCommentActivity.createIntent(gist, comment), + COMMENT_EDIT) + } + + /** + * Delete existing comment + */ + private val deleteCommentListener = DeleteCommentListener { comment -> + val args = Bundle() + args.putParcelable(EXTRA_COMMENT, comment) + ConfirmDialogFragment.show( + activity, + COMMENT_DELETE, + activity!!.getString(R.string.confirm_comment_delete_title), + activity!!.getString(R.string.confirm_comment_delete_message), + args + ) + } + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + gistId = arguments!!.getString(EXTRA_GIST_ID) + gist = store.getGist(gistId) + + mainSection.add(filesSection) + mainSection.add(commentsSection) + adapter.add(mainSection) + + adapter.setOnItemClickListener(this) + } + + override fun onCreateView( + inflater: LayoutInflater, + container: ViewGroup?, + savedInstanceState: Bundle? + ): View { + return inflater.inflate(R.layout.fragment_comment_list, container, false) + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + val itemDecoration = DividerItemDecoration(activity, DividerItemDecoration.VERTICAL) + itemDecoration.setDrawable(resources.getDrawable(R.drawable.list_divider_5dp)) + + list.layoutManager = LinearLayoutManager(activity) + list.addItemDecoration(itemDecoration) + list.adapter = adapter + } + + override fun onActivityCreated(savedInstanceState: Bundle?) { + super.onActivityCreated(savedInstanceState) + if (gist != null) { + updateHeader(gist) + updateFiles(gist) + } + + if (gist == null || gist!!.comments()!! > 0 && comments == null) { + mainSection.setFooter(LoadingItem(R.string.loading_comments)) + } + + if (gist != null && comments != null) { + updateList(gist, comments!!) + } else { + refreshGist() + } + } + + private fun updateHeader(gist: Gist?) { + mainSection.setHeader(GistHeaderItem(activity!!, gist!!)) + pb_loading.visibility = GONE + list.visibility = VISIBLE + } + + override fun onCreateOptionsMenu(options: Menu?, inflater: MenuInflater?) { + inflater!!.inflate(R.menu.fragment_gist_view, options) + } + + override fun onPrepareOptionsMenu(menu: Menu?) { + val owner = isOwner + if (!owner) { + menu!!.removeItem(R.id.m_delete) + val starItem = menu.findItem(R.id.m_star) + starItem.isEnabled = loadFinished && !owner + if (starred) { + starItem.setTitle(R.string.unstar) + } else { + starItem.setTitle(R.string.star) + } + } else { + menu!!.removeItem(R.id.m_star) + } + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + if (gist == null) { + return super.onOptionsItemSelected(item) + } + + when (item!!.itemId) { + R.id.m_comment -> { + startActivityForResult(CreateCommentActivity.createIntent(gist), + COMMENT_CREATE) + return true + } + R.id.m_star -> { + if (starred) { + unstarGist() + } else { + starGist() + } + return true + } + R.id.m_refresh -> { + refreshGist() + return true + } + R.id.m_share -> { + shareGist() + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + private fun starGist() { + ToastUtils.show(activity, R.string.starring_gist) + ServiceGenerator.createService(activity, GistService::class.java) + .starGist(gistId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> starred = response.code() == 204 }, + { e -> ToastUtils.show(context as Activity, e.message) }) + } + + private fun shareGist() { + val subject = StringBuilder("Gist ") + val id = gist!!.id() + subject.append(id) + val user = gist!!.owner() + if (user != null && !TextUtils.isEmpty(user.login())) { + subject.append(" by ").append(user.login()) + } + startActivity(ShareUtils.create(subject, "https://gist.github.com/$id")) + } + + private fun unstarGist() { + ToastUtils.show(activity, R.string.unstarring_gist) + ServiceGenerator.createService(activity, GistService::class.java) + .unstarGist(gistId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> starred = response.code() != 204 }, + { e -> ToastUtils.show(context as Activity, e.message) }) + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (RESULT_OK != resultCode || data == null) { + return + } + + when (requestCode) { + COMMENT_CREATE -> { + val comment = data.getParcelableExtra(EXTRA_COMMENT) + if (comments != null) { + comments!!.add(comment) + gist = gist!!.toBuilder().comments(gist!!.comments()!! + 1).build() + updateList(gist, comments!!) + } else { + refreshGist() + } + return + } + COMMENT_EDIT -> { + val comment = data.getParcelableExtra(EXTRA_COMMENT) + if (comments != null && comment != null) { + val position = Collections.binarySearch(comments, comment) { + lhs, rhs -> lhs.id()!!.compareTo(rhs.id()!!) + } + imageGetter.removeFromCache(comment.id()) + comments!![position] = comment + updateList(gist, comments!!) + } else { + refreshGist() + } + return + } + } + + super.onActivityResult(requestCode, resultCode, data) + } + + private fun updateFiles(gist: Gist?) { + if (activity == null) { + return + } + + val files = gist!!.files() + if (files == null || files.isEmpty()) { + filesSection.update(emptyList()) + return + } + + val fileItems = ArrayList() + for (file in files.values) { + fileItems.add(GistFileItem(file)) + } + filesSection.update(fileItems) + } + + private fun updateList(gist: Gist?, comments: List) { + val items = ArrayList() + val username = AccountUtils.getLogin(activity) + val isOwner = isOwner + + for (comment in comments) { + items.add( + GitHubCommentItem(avatars, imageGetter, editCommentListener, + deleteCommentListener, username!!, isOwner, comment) + ) + } + commentsSection.update(items) + mainSection.removeFooter() + + updateHeader(gist) + updateFiles(gist) + } + + private fun refreshGist() { + refreshGistTaskFactory.create(activity, gistId) + .refresh() + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .filter { (gist1, starred1, comments1) -> isAdded } + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ fullGist -> + val activity = activity + if (activity is OnLoadListener<*>) { + (activity as OnLoadListener).loaded(fullGist.gist) + } + + starred = fullGist.starred + loadFinished = true + gist = fullGist.gist + comments = fullGist.comments.toMutableList() + updateList(fullGist.gist, fullGist.comments) + }, { e -> ToastUtils.show(activity, R.string.error_gist_load) }) + } + + override fun onItemClick(@NonNull item: Item<*>, @NonNull view: View) { + if (item is GistFileItem) { + val position = adapter.getAdapterPosition(item) + startActivity(GistFilesViewActivity.createIntent(gist!!, position - 1)) + } + } + + override fun onDialogResult(requestCode: Int, resultCode: Int, arguments: Bundle) { + if (RESULT_OK != resultCode) { + return + } + + when (requestCode) { + COMMENT_DELETE -> { + val comment = arguments.getParcelable(EXTRA_COMMENT) + ServiceGenerator.createService(activity, GistCommentService::class.java) + .deleteGistComment(gistId, comment.id()!!) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .compose(RxProgress.bindToLifecycle(activity, R.string.deleting_comment)) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + // Update comment list + if (comments != null) { + val position = Collections.binarySearch(comments, + comment) { lhs, rhs -> lhs.id()!!.compareTo(rhs.id()!!) } + comments!!.removeAt(position) + updateList(gist, comments!!) + } else { + refreshGist() + } + }, { e -> + Log.d(TAG, "Exception deleting comment on gist", e) + ToastUtils.show(context as Activity, e.message) + }) + } + } + } + + companion object { + + private val TAG = "GistFragment" + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistsPagerFragment.java b/app/src/main/java/com/github/pockethub/android/ui/gist/GistsPagerFragment.java index 8962fe16b..a74c34b96 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/GistsPagerFragment.java +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/GistsPagerFragment.java @@ -106,7 +106,7 @@ private void randomGist() { .compose(RxProgress.bindToLifecycle(getActivity(), R.string.random_gist)) .as(AutoDisposeUtils.bindToLifecycle(this)) .subscribe(gist -> getActivity().startActivityForResult( - GistsViewActivity.createIntent(gist), GIST_VIEW), e -> { + GistsViewActivity.Companion.createIntent(gist), GIST_VIEW), e -> { Log.d(TAG, "Exception opening random Gist", e); ToastUtils.show((Activity) getContext(), e.getMessage()); }); diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.java deleted file mode 100644 index b6db4c519..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.java +++ /dev/null @@ -1,247 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.gist; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import android.util.Log; -import android.view.MenuItem; - -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.OnLoadListener; -import com.github.pockethub.android.core.gist.GistStore; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.rx.RxProgress; -import com.github.pockethub.android.ui.ConfirmDialogFragment; -import com.github.pockethub.android.ui.FragmentProvider; -import com.github.pockethub.android.ui.MainActivity; -import com.github.pockethub.android.ui.PagerActivity; -import com.github.pockethub.android.ui.ViewPager; -import com.github.pockethub.android.ui.item.gist.GistItem; -import com.github.pockethub.android.ui.user.UriLauncherActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Gist; -import com.meisolsson.githubsdk.service.gists.GistService; -import com.xwray.groupie.Item; - -import javax.inject.Inject; - -import java.io.Serializable; -import java.util.List; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_GIST; -import static com.github.pockethub.android.Intents.EXTRA_GIST_ID; -import static com.github.pockethub.android.Intents.EXTRA_GIST_IDS; -import static com.github.pockethub.android.Intents.EXTRA_POSITION; - -/** - * Activity to display a collection of Gists in a pager - */ -public class GistsViewActivity extends PagerActivity implements OnLoadListener { - - private static final int REQUEST_CONFIRM_DELETE = 1; - private static final String TAG = "GistsViewActivity"; - - /** - * Create an intent to show a single gist - * - * @param gist - * @return intent - */ - public static Intent createIntent(Gist gist) { - return new Builder("gists.VIEW").gist(gist).add(EXTRA_POSITION, 0) - .toIntent(); - } - - /** - * Create an intent to show gists with an initial selected Gist - * - * @param items - * @param position - * @return intent - */ - public static Intent createIntent(List items, int position) { - String[] ids = new String[items.size()]; - int index = 0; - for (Item item : items) { - Gist gist = ((GistItem) item).getGist(); - ids[index++] = gist.id(); - } - return new Builder("gists.VIEW") - .add(EXTRA_GIST_IDS, (Serializable) ids) - .add(EXTRA_POSITION, position).toIntent(); - } - - @BindView(R.id.vp_pages) - protected ViewPager pager; - - private String[] gists; - - private Gist gist; - - private int initialPosition; - - @Inject - protected GistStore store; - - @Inject - protected AvatarLoader avatars; - - private GistsPagerAdapter adapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pager); - - gists = getStringArrayExtra(EXTRA_GIST_IDS); - gist = getParcelableExtra(EXTRA_GIST); - initialPosition = getIntExtra(EXTRA_POSITION); - - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - // Support opening this activity with a single Gist that may be present - // in the intent but not currently present in the store - if (gists == null && gist != null) { - if (gist.createdAt() != null) { - Gist stored = store.getGist(gist.id()); - if (stored == null) { - store.addGist(gist); - } - } - gists = new String[] { gist.id() }; - } - - adapter = new GistsPagerAdapter(this, gists); - pager.setAdapter(adapter); - pager.addOnPageChangeListener(this); - pager.scheduleSetItem(initialPosition, this); - onPageSelected(initialPosition); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - pager.removeOnPageChangeListener(this); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - finish(); - Intent intent = new Intent(this, MainActivity.class); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - return true; - case R.id.m_delete: - String gistId = gists[pager.getCurrentItem()]; - Bundle args = new Bundle(); - args.putString(EXTRA_GIST_ID, gistId); - ConfirmDialogFragment.show(this, REQUEST_CONFIRM_DELETE, - getString(R.string.confirm_gist_delete_title), - getString(R.string.confirm_gist_delete_message), args); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onDialogResult(int requestCode, int resultCode, Bundle arguments) { - if (REQUEST_CONFIRM_DELETE == requestCode && RESULT_OK == resultCode) { - final String gistId = arguments.getString(EXTRA_GIST_ID); - - ServiceGenerator.createService(this, GistService.class) - .deleteGist(gistId) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .compose(RxProgress.bindToLifecycle(this, R.string.deleting_gist)) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - setResult(RESULT_OK); - finish(); - }, e -> { - Log.d(TAG, "Exception deleting Gist", e); - ToastUtils.show(this, e.getMessage()); - }); - return; - } - - adapter.onDialogResult(pager.getCurrentItem(), requestCode, resultCode, - arguments); - - super.onDialogResult(requestCode, resultCode, arguments); - } - - @Override - public void onPageSelected(int position) { - super.onPageSelected(position); - - String gistId = gists[position]; - Gist gist = store.getGist(gistId); - updateActionBar(gist, gistId); - } - - @Override - public void startActivity(Intent intent) { - Intent converted = UriLauncherActivity.convert(intent); - if (converted != null) { - super.startActivity(converted); - } else { - super.startActivity(intent); - } - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } - - private void updateActionBar(Gist gist, String gistId) { - ActionBar actionBar = getSupportActionBar(); - if (gist == null) { - actionBar.setSubtitle(null); - actionBar.setLogo(null); - actionBar.setIcon(R.drawable.app_icon); - } else if (gist.owner() != null) { - avatars.bind(actionBar, gist.owner()); - actionBar.setSubtitle(gist.owner().login()); - } else { - actionBar.setSubtitle(R.string.anonymous); - actionBar.setLogo(null); - actionBar.setIcon(R.drawable.app_icon); - } - actionBar.setTitle(getString(R.string.gist_title) + gistId); - } - - @Override - public void loaded(Gist gist) { - if (gists[pager.getCurrentItem()].equals(gist.id())) { - updateActionBar(gist, gist.id()); - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.kt new file mode 100644 index 000000000..0137b6622 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/gist/GistsViewActivity.kt @@ -0,0 +1,234 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.gist + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.util.Log +import android.view.MenuItem +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_GIST +import com.github.pockethub.android.Intents.EXTRA_GIST_ID +import com.github.pockethub.android.Intents.EXTRA_GIST_IDS +import com.github.pockethub.android.Intents.EXTRA_POSITION +import com.github.pockethub.android.R +import com.github.pockethub.android.core.OnLoadListener +import com.github.pockethub.android.core.gist.GistStore +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.rx.RxProgress +import com.github.pockethub.android.ui.ConfirmDialogFragment +import com.github.pockethub.android.ui.FragmentProvider +import com.github.pockethub.android.ui.MainActivity +import com.github.pockethub.android.ui.PagerActivity +import com.github.pockethub.android.ui.item.gist.GistItem +import com.github.pockethub.android.ui.user.UriLauncherActivity +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Gist +import com.meisolsson.githubsdk.service.gists.GistService +import com.xwray.groupie.Item +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_pager.* +import java.io.Serializable +import javax.inject.Inject + +/** + * Activity to display a collection of Gists in a pager + */ +class GistsViewActivity : PagerActivity(), OnLoadListener { + + @Inject + lateinit var store: GistStore + + @Inject + lateinit var avatars: AvatarLoader + + private var gists: Array? = null + + private var gist: Gist? = null + + private var initialPosition: Int = 0 + + private var adapter: GistsPagerAdapter? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_pager) + + gists = getStringArrayExtra(EXTRA_GIST_IDS) + gist = getParcelableExtra(EXTRA_GIST) + initialPosition = getIntExtra(EXTRA_POSITION) + + supportActionBar!!.setDisplayHomeAsUpEnabled(true) + + // Support opening this activity with a single Gist that may be present + // in the intent but not currently present in the store + if (gists == null && gist != null) { + if (gist!!.createdAt() != null) { + val stored = store.getGist(gist!!.id()) + if (stored == null) { + store.addGist(gist) + } + } + gists = arrayOf(gist!!.id()!!) + } + + adapter = GistsPagerAdapter(this, gists) + vp_pages.adapter = adapter + vp_pages.addOnPageChangeListener(this) + vp_pages.scheduleSetItem(initialPosition, this) + onPageSelected(initialPosition) + } + + override fun onDestroy() { + super.onDestroy() + vp_pages.removeOnPageChangeListener(this) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + android.R.id.home -> { + finish() + val intent = Intent(this, MainActivity::class.java) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + return true + } + R.id.m_delete -> { + val gistId = gists!![vp_pages.currentItem] + val args = Bundle() + args.putString(EXTRA_GIST_ID, gistId) + ConfirmDialogFragment.show(this, REQUEST_CONFIRM_DELETE, + getString(R.string.confirm_gist_delete_title), + getString(R.string.confirm_gist_delete_message), args) + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + override fun onDialogResult(requestCode: Int, resultCode: Int, arguments: Bundle) { + if (REQUEST_CONFIRM_DELETE == requestCode && RESULT_OK == resultCode) { + val gistId = arguments.getString(EXTRA_GIST_ID) + + ServiceGenerator.createService(this, GistService::class.java) + .deleteGist(gistId) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .compose(RxProgress.bindToLifecycle(this, R.string.deleting_gist)) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + setResult(RESULT_OK) + finish() + }, { e -> + Log.d(TAG, "Exception deleting Gist", e) + ToastUtils.show(this, e.message) + }) + return + } + + adapter!!.onDialogResult(vp_pages.currentItem, requestCode, resultCode, arguments) + + super.onDialogResult(requestCode, resultCode, arguments) + } + + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + + val gistId = gists!![position] + val gist = store.getGist(gistId) + updateActionBar(gist, gistId) + } + + override fun startActivity(intent: Intent) { + val converted = UriLauncherActivity.convert(intent) + if (converted != null) { + super.startActivity(converted) + } else { + super.startActivity(intent) + } + } + + override fun getProvider(): FragmentProvider? { + return adapter + } + + private fun updateActionBar(gist: Gist?, gistId: String) { + val actionBar = supportActionBar!! + when { + gist == null -> { + actionBar.subtitle = null + actionBar.setLogo(null) + actionBar.setIcon(R.drawable.app_icon) + } + gist.owner() != null -> { + avatars.bind(actionBar, gist.owner()!!) + actionBar.subtitle = gist.owner()!!.login() + } + else -> { + actionBar.setSubtitle(R.string.anonymous) + actionBar.setLogo(null) + actionBar.setIcon(R.drawable.app_icon) + } + } + actionBar.title = getString(R.string.gist_title) + gistId + } + + override fun loaded(gist: Gist) { + if (gists!![vp_pages.currentItem] == gist.id()) { + updateActionBar(gist, gist.id()!!) + } + } + + companion object { + + private val REQUEST_CONFIRM_DELETE = 1 + private val TAG = "GistsViewActivity" + + /** + * Create an intent to show a single gist + * + * @param gist + * @return intent + */ + fun createIntent(gist: Gist): Intent { + return Builder("gists.VIEW").gist(gist).add(EXTRA_POSITION, 0) + .toIntent() + } + + /** + * Create an intent to show gists with an initial selected Gist + * + * @param items + * @param position + * @return intent + */ + fun createIntent(items: List>, position: Int): Intent { + val ids = arrayOfNulls(items.size) + for ((index, item) in items.withIndex()) { + val gist = (item as GistItem).gist + ids[index] = gist.id() + } + return Builder("gists.VIEW") + .add(EXTRA_GIST_IDS, ids as Serializable) + .add(EXTRA_POSITION, position).toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssueActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssueActivity.kt index 05446a18e..5671d111f 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssueActivity.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssueActivity.kt @@ -21,8 +21,6 @@ import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle import android.os.Parcelable -import com.google.android.material.floatingactionbutton.FloatingActionButton -import androidx.core.content.ContextCompat import android.text.TextUtils import android.util.Log import android.view.Menu @@ -30,24 +28,30 @@ import android.view.MenuItem import android.view.View import android.view.View.GONE import android.view.View.VISIBLE -import android.widget.EditText -import android.widget.ImageView import android.widget.LinearLayout.LayoutParams -import android.widget.TextView +import androidx.core.content.ContextCompat import androidx.core.text.bold import androidx.core.text.buildSpannedString -import butterknife.BindView -import butterknife.OnClick -import butterknife.OnTextChanged -import com.github.pockethub.android.Intents.* +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_ISSUE +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_NAME +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_OWNER +import com.github.pockethub.android.Intents.EXTRA_USER import com.github.pockethub.android.R -import com.github.pockethub.android.RequestCodes.* +import com.github.pockethub.android.RequestCodes.ISSUE_ASSIGNEE_UPDATE +import com.github.pockethub.android.RequestCodes.ISSUE_LABELS_UPDATE +import com.github.pockethub.android.RequestCodes.ISSUE_MILESTONE_UPDATE import com.github.pockethub.android.accounts.AccountUtils import com.github.pockethub.android.core.issue.IssueUtils import com.github.pockethub.android.rx.AutoDisposeUtils import com.github.pockethub.android.rx.RxProgress import com.github.pockethub.android.ui.BaseActivity -import com.github.pockethub.android.util.* +import com.github.pockethub.android.ui.TextWatcherAdapter +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.ImageBinPoster +import com.github.pockethub.android.util.InfoUtils +import com.github.pockethub.android.util.PermissionsUtils +import com.github.pockethub.android.util.ToastUtils import com.meisolsson.githubsdk.core.ServiceGenerator import com.meisolsson.githubsdk.model.Issue import com.meisolsson.githubsdk.model.Repository @@ -58,8 +62,10 @@ import com.meisolsson.githubsdk.service.repositories.RepositoryCollaboratorServi import io.reactivex.Single import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_issue_edit.* +import kotlinx.android.synthetic.main.milestone.* import retrofit2.Response -import java.util.* +import java.util.ArrayList import javax.inject.Inject /** @@ -67,33 +73,6 @@ import javax.inject.Inject */ class EditIssueActivity : BaseActivity() { - @BindView(R.id.et_issue_title) - lateinit var titleText: EditText - - @BindView(R.id.et_issue_body) - lateinit var bodyText: EditText - - @BindView(R.id.ll_milestone_graph) - lateinit var milestoneGraph: View - - @BindView(R.id.tv_milestone) - lateinit var milestoneText: TextView - - @BindView(R.id.v_closed) - lateinit var milestoneClosed: View - - @BindView(R.id.iv_assignee_avatar) - lateinit var assigneeAvatar: ImageView - - @BindView(R.id.tv_assignee_name) - lateinit var assigneeText: TextView - - @BindView(R.id.tv_labels) - lateinit var labelsText: TextView - - @BindView(R.id.fab_add_image) - lateinit var addImageFab: FloatingActionButton - @Inject lateinit var avatars: AvatarLoader @@ -109,6 +88,12 @@ class EditIssueActivity : BaseActivity() { private var labelsDialog: LabelsDialog? = null + private val titleTextWatcher = object : TextWatcherAdapter() { + override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) { + updateSaveMenu(s!!) + } + } + override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) setContentView(R.layout.activity_issue_edit) @@ -146,8 +131,16 @@ class EditIssueActivity : BaseActivity() { avatars.bind(actionBar, intent.getParcelableExtra(EXTRA_USER) as User) updateSaveMenu() - titleText.setText(issue!!.title()) - bodyText.setText(issue!!.body()) + et_issue_title.setText(issue!!.title()) + et_issue_body.setText(issue!!.body()) + + fab_add_image.setOnClickListener { onAddImageClicked() } + et_issue_title.addTextChangedListener(titleTextWatcher) + } + + override fun onDestroy() { + super.onDestroy() + et_issue_title.removeTextChangedListener(titleTextWatcher) } override fun onRequestPermissionsResult( @@ -225,12 +218,6 @@ class EditIssueActivity : BaseActivity() { } } - @OnTextChanged(R.id.et_issue_title) - fun onIssueTitleChange(text: CharSequence) { - updateSaveMenu(text) - } - - @OnClick(R.id.fab_add_image) fun onAddImageClicked() { val activity = this@EditIssueActivity val permission = Manifest.permission.READ_EXTERNAL_STORAGE @@ -255,7 +242,7 @@ class EditIssueActivity : BaseActivity() { } private fun insertImage(url: String?) { - runOnUiThread { bodyText.append("![]($url)") } + runOnUiThread { et_issue_body.append("![]($url)") } } private fun showMainContent() { @@ -304,19 +291,19 @@ class EditIssueActivity : BaseActivity() { private fun updateMilestone() { val milestone = issue!!.milestone() if (milestone != null) { - milestoneText.text = milestone.title() + tv_milestone.text = milestone.title() val closed = milestone.closedIssues()!!.toFloat() val total = closed + milestone.openIssues()!! if (total > 0) { - (milestoneClosed.layoutParams as LayoutParams).weight = closed / total - milestoneClosed.visibility = VISIBLE + (v_closed.layoutParams as LayoutParams).weight = closed / total + v_closed.visibility = VISIBLE } else { - milestoneClosed.visibility = GONE + v_closed.visibility = GONE } - milestoneGraph.visibility = VISIBLE + ll_milestone_graph.visibility = VISIBLE } else { - milestoneText.setText(R.string.none) - milestoneGraph.visibility = GONE + tv_milestone.setText(R.string.none) + ll_milestone_graph.visibility = GONE } } @@ -324,25 +311,25 @@ class EditIssueActivity : BaseActivity() { val assignee = issue!!.assignee() val login = assignee?.login() if (!TextUtils.isEmpty(login)) { - assigneeText.text = buildSpannedString { + tv_assignee_name.text = buildSpannedString { bold { append(login) } } - assigneeAvatar.visibility = VISIBLE - avatars.bind(assigneeAvatar, assignee) + iv_assignee_avatar.visibility = VISIBLE + avatars.bind(iv_assignee_avatar, assignee) } else { - assigneeAvatar.visibility = GONE - assigneeText.setText(R.string.unassigned) + iv_assignee_avatar.visibility = GONE + tv_assignee_name.setText(R.string.unassigned) } } private fun updateLabels() { val labels = issue!!.labels() if (labels != null && !labels.isEmpty()) { - LabelDrawableSpan.setText(labelsText, labels) + LabelDrawableSpan.setText(tv_labels, labels) } else { - labelsText.setText(R.string.none) + tv_labels.setText(R.string.none) } } @@ -352,7 +339,7 @@ class EditIssueActivity : BaseActivity() { outState!!.putParcelable(EXTRA_ISSUE, issue) } - private fun updateSaveMenu(text: CharSequence = titleText.text) { + private fun updateSaveMenu(text: CharSequence = et_issue_title.text) { if (saveItem != null) { saveItem!!.isEnabled = !TextUtils.isEmpty(text) } @@ -369,8 +356,8 @@ class EditIssueActivity : BaseActivity() { when (item.itemId) { R.id.m_apply -> { val request = IssueRequest.builder() - .body(bodyText.text.toString()) - .title(titleText.text.toString()) + .body(et_issue_body.text.toString()) + .title(et_issue_title.text.toString()) .state(issue!!.state()) if (issue!!.assignee() != null) { diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.java b/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.java deleted file mode 100644 index b00733163..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.java +++ /dev/null @@ -1,281 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.issue; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import android.view.Menu; -import android.view.MenuItem; -import android.widget.ImageView; -import android.widget.RadioGroup; -import android.widget.TextView; - -import com.meisolsson.githubsdk.model.Label; -import com.meisolsson.githubsdk.model.Milestone; -import com.meisolsson.githubsdk.model.Repository; -import com.meisolsson.githubsdk.model.User; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.issue.IssueFilter; -import com.github.pockethub.android.ui.BaseActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.InfoUtils; -import javax.inject.Inject; -import java.util.List; - -import butterknife.BindView; -import butterknife.OnClick; - -import static android.view.View.GONE; -import static com.github.pockethub.android.Intents.EXTRA_ISSUE_FILTER; - -/** - * Activity to create or edit an issues filter for a repository - */ -public class EditIssuesFilterActivity extends BaseActivity { - - /** - * Create intent for creating an issue filter for the given repository - * - * @param filter - * @return intent - */ - public static Intent createIntent(IssueFilter filter) { - return new Builder("repo.issues.filter.VIEW").add(EXTRA_ISSUE_FILTER, - filter).toIntent(); - } - - private static final int REQUEST_LABELS = 1; - - private static final int REQUEST_MILESTONE = 2; - - private static final int REQUEST_ASSIGNEE = 3; - - @BindView(R.id.tv_labels) - protected TextView labelsText; - - @BindView(R.id.tv_milestone) - protected TextView milestoneText; - - @BindView(R.id.tv_assignee) - protected TextView assigneeText; - - @BindView(R.id.iv_avatar) - protected ImageView avatarView; - - @Inject - protected AvatarLoader avatars; - - private LabelsDialog labelsDialog; - - private MilestoneDialog milestoneDialog; - - private AssigneeDialog assigneeDialog; - - private IssueFilter filter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_issues_filter_edit); - - if (savedInstanceState != null) { - filter = savedInstanceState.getParcelable(EXTRA_ISSUE_FILTER); - } - - if (filter == null) { - filter = getIntent().getParcelableExtra(EXTRA_ISSUE_FILTER); - } - - Repository repository = filter.getRepository(); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setTitle(R.string.filter_issues_title); - actionBar.setSubtitle(InfoUtils.createRepoId(repository)); - avatars.bind(actionBar, repository.owner()); - - updateAssignee(); - updateMilestone(); - updateLabels(); - - RadioGroup status = findViewById(R.id.issue_filter_status); - RadioGroup sortOrder = findViewById(R.id.issue_sort_order); - RadioGroup sortType = findViewById(R.id.issue_sort_type); - - status.setOnCheckedChangeListener(this::onStatusChanged); - sortOrder.setOnCheckedChangeListener(this::onSortOrderChanged); - sortType.setOnCheckedChangeListener(this::onSortTypeChanged); - - if (filter.isOpen()) { - status.check(R.id.rb_open); - } else { - status.check(R.id.rb_closed); - } - - - if (filter.getDirection().equals(IssueFilter.DIRECTION_ASCENDING)) { - sortOrder.check(R.id.rb_asc); - } else { - sortOrder.check(R.id.rb_desc); - } - - switch (filter.getSortType()) { - case IssueFilter.SORT_CREATED: - sortType.check(R.id.rb_created); - break; - case IssueFilter.SORT_UPDATED: - sortType.check(R.id.rb_updated); - break; - case IssueFilter.SORT_COMMENTS: - sortType.check(R.id.rb_comments); - break; - default: - break; - } - } - - @Override - public boolean onCreateOptionsMenu(Menu options) { - getMenuInflater().inflate(R.menu.activity_issue_filter, options); - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_apply: - Intent intent = new Intent(); - intent.putExtra(EXTRA_ISSUE_FILTER, filter); - setResult(RESULT_OK, intent); - finish(); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - protected void onSaveInstanceState(Bundle outState) { - super.onSaveInstanceState(outState); - - outState.putParcelable(EXTRA_ISSUE_FILTER, filter); - } - - @OnClick({R.id.tv_assignee, R.id.tv_assignee_label}) - protected void onAssigneeClicked() { - if (assigneeDialog == null) { - assigneeDialog = new AssigneeDialog(this, REQUEST_ASSIGNEE, filter.getRepository()); - } - assigneeDialog.show(filter.getAssignee()); - } - - @OnClick({R.id.tv_milestone, R.id.tv_milestone_label}) - protected void onMilestoneClicked() { - if (milestoneDialog == null) { - milestoneDialog = new MilestoneDialog(this, REQUEST_MILESTONE, filter.getRepository()); - } - milestoneDialog.show(filter.getMilestone()); - } - - @OnClick({R.id.tv_labels, R.id.tv_labels_label}) - protected void onLabelsClicked() { - if (labelsDialog == null) { - labelsDialog = new LabelsDialog(this, REQUEST_LABELS, filter.getRepository()); - } - labelsDialog.show(filter.getLabels()); - } - - private void onStatusChanged(RadioGroup radioGroup, int checkedId) { - filter.setOpen(checkedId == R.id.rb_open); - } - - private void onSortOrderChanged(RadioGroup radioGroup, int checkedId) { - if (checkedId == R.id.rb_asc) { - filter.setDirection(IssueFilter.DIRECTION_ASCENDING); - } else { - filter.setDirection(IssueFilter.DIRECTION_DESCENDING); - } - } - - private void onSortTypeChanged(RadioGroup radioGroup, int checkedId) { - switch (checkedId) { - case R.id.rb_created: - filter.setSortType(IssueFilter.SORT_CREATED); - break; - case R.id.rb_updated: - filter.setSortType(IssueFilter.SORT_UPDATED); - break; - case R.id.rb_comments: - filter.setSortType(IssueFilter.SORT_COMMENTS); - break; - default: - break; - } - } - - private void updateLabels() { - List selected = filter.getLabels(); - if (selected != null) { - LabelDrawableSpan.setText(labelsText, selected); - } else { - labelsText.setText(R.string.none); - } - } - - private void updateMilestone() { - Milestone selected = filter.getMilestone(); - if (selected != null) { - milestoneText.setText(selected.title()); - } else { - milestoneText.setText(R.string.none); - } - } - - private void updateAssignee() { - User selected = filter.getAssignee(); - if (selected != null) { - avatars.bind(avatarView, selected); - assigneeText.setText(selected.login()); - } else { - avatarView.setVisibility(GONE); - assigneeText.setText(R.string.assignee_anyone); - } - } - - @Override - public void onDialogResult(int requestCode, int resultCode, Bundle arguments) { - if (RESULT_OK != resultCode) { - return; - } - - switch (requestCode) { - case REQUEST_LABELS: - filter.setLabels(LabelsDialogFragment.getSelected(arguments)); - updateLabels(); - break; - case REQUEST_MILESTONE: - filter.setMilestone(MilestoneDialogFragment.getSelected(arguments)); - updateMilestone(); - break; - case REQUEST_ASSIGNEE: - filter.setAssignee(AssigneeDialogFragment.getSelected(arguments)); - updateAssignee(); - break; - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.kt new file mode 100644 index 000000000..13f336bd6 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/EditIssuesFilterActivity.kt @@ -0,0 +1,246 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.issue + +import android.content.Intent +import android.os.Bundle +import android.view.Menu +import android.view.MenuItem +import android.view.View.GONE +import android.widget.RadioGroup +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_ISSUE_FILTER +import com.github.pockethub.android.R +import com.github.pockethub.android.core.issue.IssueFilter +import com.github.pockethub.android.ui.BaseActivity +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.InfoUtils +import kotlinx.android.synthetic.main.activity_issues_filter_edit.* +import javax.inject.Inject + +/** + * Activity to create or edit an issues filter for a repository + */ +class EditIssuesFilterActivity : BaseActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + private var labelsDialog: LabelsDialog? = null + + private var milestoneDialog: MilestoneDialog? = null + + private var assigneeDialog: AssigneeDialog? = null + + private var filter: IssueFilter? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_issues_filter_edit) + + if (savedInstanceState != null) { + filter = savedInstanceState.getParcelable(EXTRA_ISSUE_FILTER) + } + + if (filter == null) { + filter = intent.getParcelableExtra(EXTRA_ISSUE_FILTER) + } + + val repository = filter!!.repository + + val actionBar = supportActionBar!! + actionBar.setTitle(R.string.filter_issues_title) + actionBar.subtitle = InfoUtils.createRepoId(repository) + avatars.bind(actionBar, repository.owner()!!) + + updateAssignee() + updateMilestone() + updateLabels() + + val status = findViewById(R.id.issue_filter_status) + val sortOrder = findViewById(R.id.issue_sort_order) + val sortType = findViewById(R.id.issue_sort_type) + + status.setOnCheckedChangeListener(this::onStatusChanged) + sortOrder.setOnCheckedChangeListener(this::onSortOrderChanged) + sortType.setOnCheckedChangeListener(this::onSortTypeChanged) + + tv_assignee.setOnClickListener { onAssigneeClicked() } + tv_assignee_label.setOnClickListener { onAssigneeClicked() } + + tv_milestone.setOnClickListener { onMilestoneClicked() } + tv_milestone_label.setOnClickListener { onMilestoneClicked() } + + tv_labels.setOnClickListener { onLabelsClicked() } + tv_labels_label.setOnClickListener { onLabelsClicked() } + + if (filter!!.isOpen) { + status.check(R.id.rb_open) + } else { + status.check(R.id.rb_closed) + } + + + if (filter!!.direction == IssueFilter.DIRECTION_ASCENDING) { + sortOrder.check(R.id.rb_asc) + } else { + sortOrder.check(R.id.rb_desc) + } + + when (filter!!.sortType) { + IssueFilter.SORT_CREATED -> sortType.check(R.id.rb_created) + IssueFilter.SORT_UPDATED -> sortType.check(R.id.rb_updated) + IssueFilter.SORT_COMMENTS -> sortType.check(R.id.rb_comments) + } + } + + override fun onCreateOptionsMenu(options: Menu): Boolean { + menuInflater.inflate(R.menu.activity_issue_filter, options) + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + return when (item.itemId) { + R.id.m_apply -> { + val intent = Intent() + intent.putExtra(EXTRA_ISSUE_FILTER, filter) + setResult(RESULT_OK, intent) + finish() + true + } + else -> super.onOptionsItemSelected(item) + } + } + + override fun onSaveInstanceState(outState: Bundle) { + super.onSaveInstanceState(outState) + + outState.putParcelable(EXTRA_ISSUE_FILTER, filter) + } + + fun onAssigneeClicked() { + if (assigneeDialog == null) { + assigneeDialog = AssigneeDialog(this, REQUEST_ASSIGNEE, filter!!.repository) + } + assigneeDialog!!.show(filter!!.assignee) + } + + fun onMilestoneClicked() { + if (milestoneDialog == null) { + milestoneDialog = MilestoneDialog(this, REQUEST_MILESTONE, filter!!.repository) + } + milestoneDialog!!.show(filter!!.milestone) + } + + fun onLabelsClicked() { + if (labelsDialog == null) { + labelsDialog = LabelsDialog(this, REQUEST_LABELS, filter!!.repository) + } + labelsDialog!!.show(filter!!.labels) + } + + private fun onStatusChanged(radioGroup: RadioGroup, checkedId: Int) { + filter!!.isOpen = checkedId == R.id.rb_open + } + + private fun onSortOrderChanged(radioGroup: RadioGroup, checkedId: Int) { + if (checkedId == R.id.rb_asc) { + filter!!.direction = IssueFilter.DIRECTION_ASCENDING + } else { + filter!!.direction = IssueFilter.DIRECTION_DESCENDING + } + } + + private fun onSortTypeChanged(radioGroup: RadioGroup, checkedId: Int) { + when (checkedId) { + R.id.rb_created -> filter!!.sortType = IssueFilter.SORT_CREATED + R.id.rb_updated -> filter!!.sortType = IssueFilter.SORT_UPDATED + R.id.rb_comments -> filter!!.sortType = IssueFilter.SORT_COMMENTS + else -> { + } + } + } + + private fun updateLabels() { + val selected = filter!!.labels + if (selected != null) { + LabelDrawableSpan.setText(tv_labels, selected) + } else { + tv_labels.setText(R.string.none) + } + } + + private fun updateMilestone() { + val selected = filter!!.milestone + if (selected != null) { + tv_milestone.text = selected.title() + } else { + tv_milestone.setText(R.string.none) + } + } + + private fun updateAssignee() { + val selected = filter!!.assignee + if (selected != null) { + avatars.bind(iv_avatar, selected) + tv_assignee.text = selected.login() + } else { + iv_avatar.visibility = GONE + tv_assignee.setText(R.string.assignee_anyone) + } + } + + override fun onDialogResult(requestCode: Int, resultCode: Int, arguments: Bundle) { + if (RESULT_OK != resultCode) { + return + } + + when (requestCode) { + REQUEST_LABELS -> { + filter!!.setLabels(LabelsDialogFragment.getSelected(arguments)) + updateLabels() + } + REQUEST_MILESTONE -> { + filter!!.milestone = MilestoneDialogFragment.getSelected(arguments) + updateMilestone() + } + REQUEST_ASSIGNEE -> { + filter!!.assignee = AssigneeDialogFragment.getSelected(arguments) + updateAssignee() + } + } + } + + companion object { + + /** + * Create intent for creating an issue filter for the given repository + * + * @param filter + * @return intent + */ + fun createIntent(filter: IssueFilter): Intent { + return Builder("repo.issues.filter.VIEW").add(EXTRA_ISSUE_FILTER, + filter).toIntent() + } + + private val REQUEST_LABELS = 1 + + private val REQUEST_MILESTONE = 2 + + private val REQUEST_ASSIGNEE = 3 + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/IssueFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/IssueFragment.kt index 55baf3417..f0b510606 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/IssueFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/IssueFragment.kt @@ -15,21 +15,37 @@ */ package com.github.pockethub.android.ui.issue +import android.app.Activity.RESULT_OK import android.content.Intent import android.os.Bundle -import androidx.recyclerview.widget.DividerItemDecoration -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView import android.util.Log import android.view.LayoutInflater import android.view.Menu import android.view.MenuInflater import android.view.MenuItem import android.view.View +import android.view.View.GONE +import android.view.View.VISIBLE import android.view.ViewGroup -import android.widget.ProgressBar - +import androidx.recyclerview.widget.DividerItemDecoration +import androidx.recyclerview.widget.LinearLayoutManager +import com.github.pockethub.android.Intents.EXTRA_CAN_WRITE_REPO +import com.github.pockethub.android.Intents.EXTRA_COMMENT +import com.github.pockethub.android.Intents.EXTRA_ISSUE +import com.github.pockethub.android.Intents.EXTRA_ISSUE_NUMBER +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_NAME +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_OWNER +import com.github.pockethub.android.Intents.EXTRA_USER import com.github.pockethub.android.R +import com.github.pockethub.android.RequestCodes.COMMENT_CREATE +import com.github.pockethub.android.RequestCodes.COMMENT_DELETE +import com.github.pockethub.android.RequestCodes.COMMENT_EDIT +import com.github.pockethub.android.RequestCodes.ISSUE_ASSIGNEE_UPDATE +import com.github.pockethub.android.RequestCodes.ISSUE_CLOSE +import com.github.pockethub.android.RequestCodes.ISSUE_EDIT +import com.github.pockethub.android.RequestCodes.ISSUE_LABELS_UPDATE +import com.github.pockethub.android.RequestCodes.ISSUE_MILESTONE_UPDATE +import com.github.pockethub.android.RequestCodes.ISSUE_REOPEN import com.github.pockethub.android.accounts.AccountUtils import com.github.pockethub.android.core.issue.IssueStore import com.github.pockethub.android.core.issue.IssueUtils @@ -64,36 +80,13 @@ import com.meisolsson.githubsdk.service.issues.IssueCommentService import com.xwray.groupie.GroupAdapter import com.xwray.groupie.Item import com.xwray.groupie.Section - -import java.util.ArrayList - -import javax.inject.Inject - -import butterknife.BindView +import com.xwray.groupie.ViewHolder import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.functions.Consumer import io.reactivex.schedulers.Schedulers - -import android.app.Activity.RESULT_OK -import android.view.View.GONE -import android.view.View.VISIBLE -import com.github.pockethub.android.Intents.EXTRA_CAN_WRITE_REPO -import com.github.pockethub.android.Intents.EXTRA_COMMENT -import com.github.pockethub.android.Intents.EXTRA_ISSUE -import com.github.pockethub.android.Intents.EXTRA_ISSUE_NUMBER -import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_NAME -import com.github.pockethub.android.Intents.EXTRA_REPOSITORY_OWNER -import com.github.pockethub.android.Intents.EXTRA_USER -import com.github.pockethub.android.RequestCodes.COMMENT_CREATE -import com.github.pockethub.android.RequestCodes.COMMENT_DELETE -import com.github.pockethub.android.RequestCodes.COMMENT_EDIT -import com.github.pockethub.android.RequestCodes.ISSUE_ASSIGNEE_UPDATE -import com.github.pockethub.android.RequestCodes.ISSUE_CLOSE -import com.github.pockethub.android.RequestCodes.ISSUE_EDIT -import com.github.pockethub.android.RequestCodes.ISSUE_LABELS_UPDATE -import com.github.pockethub.android.RequestCodes.ISSUE_MILESTONE_UPDATE -import com.github.pockethub.android.RequestCodes.ISSUE_REOPEN -import com.xwray.groupie.ViewHolder +import kotlinx.android.synthetic.main.fragment_comment_list.* +import java.util.ArrayList +import javax.inject.Inject /** * Fragment to display an issue @@ -126,12 +119,6 @@ class IssueFragment : BaseFragment(), IssueHeaderItem.OnIssueHeaderActionListene private var stateItem: MenuItem? = null - @BindView(R.id.list) - lateinit var list: RecyclerView - - @BindView(R.id.pb_loading) - lateinit var progress: ProgressBar - @Inject lateinit var avatars: AvatarLoader @@ -253,7 +240,7 @@ class IssueFragment : BaseFragment(), IssueHeaderItem.OnIssueHeaderActionListene mainSection.setHeader(IssueHeaderItem(avatars, bodyImageGetter, requireContext(), this, issue)) } - progress.visibility = GONE + pb_loading.visibility = GONE list.visibility = VISIBLE updateStateItem(issue) } @@ -273,7 +260,7 @@ class IssueFragment : BaseFragment(), IssueHeaderItem.OnIssueHeaderActionListene updateList(fullIssue.issue, items) }, { _ -> ToastUtils.show(activity, R.string.error_issue_load) - progress.visibility = GONE + pb_loading.visibility = GONE }) } diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/IssueSearchActivity.java b/app/src/main/java/com/github/pockethub/android/ui/issue/IssueSearchActivity.java index 5db78b889..68faac9b2 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/IssueSearchActivity.java +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/IssueSearchActivity.java @@ -81,7 +81,7 @@ public boolean onOptionsItemSelected(MenuItem item) { ToastUtils.show(this, R.string.search_history_cleared); return true; case android.R.id.home: - Intent intent = RepositoryViewActivity.createIntent(repository); + Intent intent = RepositoryViewActivity.Companion.createIntent(repository); intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); return true; diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesFragment.kt index d2d0ec580..945a8863e 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesFragment.kt @@ -142,9 +142,9 @@ class IssuesFragment : BaseFragment() { .filterIsInstance() .map { it.issue } - startActivityForResult(IssuesViewActivity.createIntent(issues, repository, position), ISSUE_VIEW) + startActivityForResult(IssuesViewActivity.createIntent(issues, repository!!, position), ISSUE_VIEW) } else if (item is IssueFilterHeaderItem) { - startActivityForResult(EditIssuesFilterActivity.createIntent(filter), ISSUE_FILTER_EDIT) + startActivityForResult(EditIssuesFilterActivity.createIntent(filter!!), ISSUE_FILTER_EDIT) } } @@ -175,7 +175,7 @@ class IssuesFragment : BaseFragment() { return true } R.id.m_filter -> { - startActivityForResult(EditIssuesFilterActivity.createIntent(filter), ISSUE_FILTER_EDIT) + startActivityForResult(EditIssuesFilterActivity.createIntent(filter!!), ISSUE_FILTER_EDIT) return true } R.id.m_bookmark -> { @@ -206,7 +206,10 @@ class IssuesFragment : BaseFragment() { if (requestCode == ISSUE_CREATE && resultCode == RESULT_OK) { val created = data!!.getParcelableExtra(EXTRA_ISSUE) pagedListFetcher.refresh() - startActivityForResult(IssuesViewActivity.createIntent(created, repository), ISSUE_VIEW) + startActivityForResult( + IssuesViewActivity.createIntent(created, repository!!), + ISSUE_VIEW + ) return } diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.java deleted file mode 100644 index 59d07d6c7..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.java +++ /dev/null @@ -1,337 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.issue; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.Toolbar; -import android.view.MenuItem; - -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Issue; -import com.meisolsson.githubsdk.model.Repository; -import com.meisolsson.githubsdk.model.User; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.issue.IssueStore; -import com.github.pockethub.android.core.issue.IssueUtils; -import com.github.pockethub.android.ui.FragmentProvider; -import com.github.pockethub.android.ui.PagerActivity; -import com.github.pockethub.android.ui.ViewPager; -import com.github.pockethub.android.ui.repo.RepositoryViewActivity; -import com.github.pockethub.android.ui.user.UriLauncherActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.InfoUtils; -import com.meisolsson.githubsdk.service.repositories.RepositoryService; -import javax.inject.Inject; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; - -import butterknife.BindView; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_ISSUE_NUMBERS; -import static com.github.pockethub.android.Intents.EXTRA_POSITION; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORIES; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORY; - -/** - * Activity to display a collection of issues or pull requests in a pager - */ -public class IssuesViewActivity extends PagerActivity { - - private static final String EXTRA_PULL_REQUESTS = "pullRequests"; - - /** - * Create an intent to show a single issue - * - * @param issue - * @return intent - */ - public static Intent createIntent(final Issue issue) { - return createIntent(Collections.singletonList(issue), 0); - } - - /** - * Create an intent to show issue - * - * @param issue - * @param repository - * @return intent - */ - public static Intent createIntent(final Issue issue, - final Repository repository) { - return createIntent(Collections.singletonList(issue), repository, 0); - } - - /** - * Create an intent to show issues with an initial selected issue - * - * @param issues - * @param repository - * @param position - * @return intent - */ - public static Intent createIntent(final Collection issues, - final Repository repository, final int position) { - int[] numbers = new int[issues.size()]; - boolean[] pullRequests = new boolean[issues.size()]; - int index = 0; - for (Issue issue : issues) { - numbers[index] = issue.number(); - pullRequests[index] = IssueUtils.isPullRequest(issue); - index++; - } - return new Builder("issues.VIEW").add(EXTRA_ISSUE_NUMBERS, numbers) - .add(EXTRA_REPOSITORY, repository) - .add(EXTRA_POSITION, position) - .add(EXTRA_PULL_REQUESTS, pullRequests).toIntent(); - } - - /** - * Create an intent to show issues with an initial selected issue - * - * @param issues - * @param position - * @return intent - */ - public static Intent createIntent(Collection issues, - int position) { - final int count = issues.size(); - int[] numbers = new int[count]; - boolean[] pullRequests = new boolean[count]; - ArrayList repos = new ArrayList<>(count); - int index = 0; - for (Issue issue : issues) { - numbers[index] = issue.number(); - pullRequests[index] = IssueUtils.isPullRequest(issue); - index++; - - Repository repoId = null; - Repository issueRepo = issue.repository(); - if (issueRepo != null) { - User owner = issueRepo.owner(); - if (owner != null) { - repoId = InfoUtils.createRepoFromData(owner.login(), issueRepo.name()); - } - } - if (repoId == null) { - repoId = InfoUtils.createRepoFromUrl(issue.htmlUrl()); - } - repos.add(repoId); - } - - Builder builder = new Builder("issues.VIEW"); - builder.add(EXTRA_ISSUE_NUMBERS, numbers); - builder.add(EXTRA_REPOSITORIES, repos); - builder.add(EXTRA_POSITION, position); - builder.add(EXTRA_PULL_REQUESTS, pullRequests); - return builder.toIntent(); - } - - @BindView(R.id.vp_pages) - protected ViewPager pager; - - private int[] issueNumbers; - - private boolean[] pullRequests; - - private ArrayList repoIds; - - private Repository repo; - - @Inject - protected AvatarLoader avatars; - - @Inject - protected IssueStore store; - - private User user; - - private boolean canWrite; - - private IssuesPagerAdapter adapter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_pager); - - issueNumbers = getIntArrayExtra(EXTRA_ISSUE_NUMBERS); - pullRequests = getBooleanArrayExtra(EXTRA_PULL_REQUESTS); - repoIds = getIntent().getParcelableArrayListExtra(EXTRA_REPOSITORIES); - repo = getParcelableExtra(EXTRA_REPOSITORY); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - if (repo != null) { - actionBar.setSubtitle(InfoUtils.createRepoId(repo)); - user = repo.owner(); - avatars.bind(actionBar, user); - } - - // Load avatar if single issue and user is currently unset or missing - // avatar URL - if (repo == null) { - Repository temp = repo != null ? repo : repoIds.get(0); - ServiceGenerator.createService(this, RepositoryService.class) - .getRepository(temp.owner().login(), temp.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> repositoryLoaded(response.body())); - } else { - repositoryLoaded(repo); - } - } - - @Override - protected void onDestroy() { - super.onDestroy(); - pager.removeOnPageChangeListener(this); - } - - private void repositoryLoaded(Repository repo) { - if (issueNumbers.length == 1 && (user == null || user.avatarUrl() == null)) { - avatars.bind(getSupportActionBar(), repo.owner()); - } - - canWrite = repo.permissions() != null && (repo.permissions().admin() || repo.permissions().push()); - - invalidateOptionsMenu(); - configurePager(); - } - - private void configurePager() { - int initialPosition = getIntExtra(EXTRA_POSITION); - - if (repo != null) { - adapter = new IssuesPagerAdapter(this, repo, issueNumbers, canWrite); - } else { - adapter = new IssuesPagerAdapter(this, repoIds, issueNumbers, store, canWrite); - } - pager.setAdapter(adapter); - - pager.addOnPageChangeListener(this); - pager.scheduleSetItem(initialPosition, this); - onPageSelected(initialPosition); - } - - private void updateTitle(final int position) { - int number = issueNumbers[position]; - boolean pullRequest = pullRequests[position]; - - if (pullRequest) { - getSupportActionBar().setTitle( - getString(R.string.pull_request_title) + number); - } else { - getSupportActionBar().setTitle( - getString(R.string.issue_title) + number); - } - } - - @Override - public void onPageSelected(final int position) { - super.onPageSelected(position); - - if (repo != null) { - updateTitle(position); - return; - } - - if (repoIds == null) { - return; - } - - ActionBar actionBar = getSupportActionBar(); - repo = repoIds.get(position); - if (repo != null) { - updateTitle(position); - actionBar.setSubtitle(InfoUtils.createRepoId(repo)); - Issue issue = store.getIssue(repo, issueNumbers[position]); - if (issue != null) { - Repository fullRepo = issue.repository(); - if (fullRepo != null && fullRepo.owner() != null) { - user = fullRepo.owner(); - avatars.bind(actionBar, user); - } else { - actionBar.setLogo(null); - } - } else { - actionBar.setLogo(null); - } - } else { - actionBar.setSubtitle(null); - actionBar.setLogo(null); - } - } - - @Override - public void onDialogResult(int requestCode, int resultCode, Bundle arguments) { - adapter.onDialogResult(pager.getCurrentItem(), requestCode, resultCode, - arguments); - } - - @Override - public void startActivity(Intent intent) { - Intent converted = UriLauncherActivity.convert(intent); - if (converted != null) { - super.startActivity(converted); - } else { - super.startActivity(intent); - } - } - - @Override - protected FragmentProvider getProvider() { - return adapter; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - Repository repository = repo; - if (repository == null) { - int position = pager.getCurrentItem(); - Repository repoId = repoIds.get(position); - if (repoId != null) { - Issue issue = store.getIssue(repoId, - issueNumbers[position]); - if (issue != null) { - repository = issue.repository(); - } - } - } - if (repository != null) { - Intent intent = RepositoryViewActivity.createIntent(repository); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP - | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - } - return true; - default: - return super.onOptionsItemSelected(item); - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.kt new file mode 100644 index 000000000..f0630a492 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/IssuesViewActivity.kt @@ -0,0 +1,312 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.issue + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.view.MenuItem +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_ISSUE_NUMBERS +import com.github.pockethub.android.Intents.EXTRA_POSITION +import com.github.pockethub.android.Intents.EXTRA_REPOSITORIES +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.R +import com.github.pockethub.android.core.issue.IssueStore +import com.github.pockethub.android.core.issue.IssueUtils +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.FragmentProvider +import com.github.pockethub.android.ui.PagerActivity +import com.github.pockethub.android.ui.repo.RepositoryViewActivity +import com.github.pockethub.android.ui.user.UriLauncherActivity +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.InfoUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Issue +import com.meisolsson.githubsdk.model.Repository +import com.meisolsson.githubsdk.model.User +import com.meisolsson.githubsdk.service.repositories.RepositoryService +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.activity_pager.* +import java.util.ArrayList +import javax.inject.Inject + +/** + * Activity to display a collection of issues or pull requests in a pager + */ +class IssuesViewActivity : PagerActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + @Inject + lateinit var store: IssueStore + + private var issueNumbers: IntArray? = null + + private var pullRequests: BooleanArray? = null + + private var repoIds: ArrayList? = null + + private var repo: Repository? = null + + private var user: User? = null + + private var canWrite: Boolean = false + + private var adapter: IssuesPagerAdapter? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_pager) + + issueNumbers = getIntArrayExtra(EXTRA_ISSUE_NUMBERS) + pullRequests = getBooleanArrayExtra(EXTRA_PULL_REQUESTS) + repoIds = intent.getParcelableArrayListExtra(EXTRA_REPOSITORIES) + repo = getParcelableExtra(EXTRA_REPOSITORY) + + val actionBar = supportActionBar!! + actionBar.setDisplayHomeAsUpEnabled(true) + if (repo != null) { + actionBar.subtitle = InfoUtils.createRepoId(repo!!) + user = repo!!.owner() + avatars.bind(actionBar, user!!) + } + + // Load avatar if single issue and user is currently unset or missing + // avatar URL + if (repo == null) { + val temp = if (repo != null) repo else repoIds!![0] + ServiceGenerator.createService(this, RepositoryService::class.java) + .getRepository(temp!!.owner()!!.login(), temp.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe { response -> repositoryLoaded(response.body()) } + } else { + repositoryLoaded(repo!!) + } + } + + override fun onDestroy() { + super.onDestroy() + vp_pages.removeOnPageChangeListener(this) + } + + private fun repositoryLoaded(repo: Repository) { + if (issueNumbers!!.size == 1 && (user == null || user!!.avatarUrl() == null)) { + avatars.bind(supportActionBar!!, repo.owner()!!) + } + + val permission = repo.permissions() + canWrite = permission != null && (permission.admin()!! || permission.push()!!) + + invalidateOptionsMenu() + configurePager() + } + + private fun configurePager() { + val initialPosition = getIntExtra(EXTRA_POSITION) + + adapter = if (repo != null) { + IssuesPagerAdapter(this, repo, issueNumbers, canWrite) + } else { + IssuesPagerAdapter(this, repoIds, issueNumbers, store, canWrite) + } + vp_pages.adapter = adapter + + vp_pages.addOnPageChangeListener(this) + vp_pages.scheduleSetItem(initialPosition, this) + onPageSelected(initialPosition) + } + + private fun updateTitle(position: Int) { + val number = issueNumbers!![position] + val pullRequest = pullRequests!![position] + + supportActionBar!!.title = if (pullRequest) { + getString(R.string.pull_request_title) + number + } else { + getString(R.string.issue_title) + number + } + } + + override fun onPageSelected(position: Int) { + super.onPageSelected(position) + + if (repo != null) { + updateTitle(position) + return + } + + if (repoIds == null) { + return + } + + val actionBar = supportActionBar!! + repo = repoIds!![position] + if (repo != null) { + updateTitle(position) + actionBar.subtitle = InfoUtils.createRepoId(repo!!) + val issue = store.getIssue(repo, issueNumbers!![position]) + if (issue != null) { + val fullRepo = issue.repository() + if (fullRepo?.owner() != null) { + user = fullRepo.owner() + avatars.bind(actionBar, user!!) + } else { + actionBar.setLogo(null) + } + } else { + actionBar.setLogo(null) + } + } else { + actionBar.subtitle = null + actionBar.setLogo(null) + } + } + + override fun onDialogResult(requestCode: Int, resultCode: Int, arguments: Bundle) { + adapter!!.onDialogResult(vp_pages.currentItem, requestCode, resultCode, arguments) + } + + override fun startActivity(intent: Intent) { + val converted = UriLauncherActivity.convert(intent) + if (converted != null) { + super.startActivity(converted) + } else { + super.startActivity(intent) + } + } + + override fun getProvider(): FragmentProvider? { + return adapter + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + android.R.id.home -> { + var repository = repo + if (repository == null) { + val position = vp_pages.currentItem + val repoId = repoIds!![position] + val issue = store.getIssue(repoId, + issueNumbers!![position]) + if (issue != null) { + repository = issue.repository() + } + } + if (repository != null) { + val intent = RepositoryViewActivity.createIntent(repository) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + } + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + companion object { + + private val EXTRA_PULL_REQUESTS = "pullRequests" + + /** + * Create an intent to show a single issue + * + * @param issue + * @return intent + */ + fun createIntent(issue: Issue): Intent { + return createIntent(listOf(issue), 0) + } + + /** + * Create an intent to show issue + * + * @param issue + * @param repository + * @return intent + */ + fun createIntent(issue: Issue, + repository: Repository): Intent { + return createIntent(listOf(issue), repository, 0) + } + + /** + * Create an intent to show issues with an initial selected issue + * + * @param issues + * @param repository + * @param position + * @return intent + */ + fun createIntent(issues: Collection, + repository: Repository, position: Int): Intent { + val numbers = IntArray(issues.size) + val pullRequests = BooleanArray(issues.size) + for ((index, issue) in issues.withIndex()) { + numbers[index] = issue.number()!! + pullRequests[index] = IssueUtils.isPullRequest(issue) + } + return Builder("issues.VIEW").add(EXTRA_ISSUE_NUMBERS, numbers) + .add(EXTRA_REPOSITORY, repository) + .add(EXTRA_POSITION, position) + .add(EXTRA_PULL_REQUESTS, pullRequests).toIntent() + } + + /** + * Create an intent to show issues with an initial selected issue + * + * @param issues + * @param position + * @return intent + */ + fun createIntent(issues: Collection, + position: Int): Intent { + val count = issues.size + val numbers = IntArray(count) + val pullRequests = BooleanArray(count) + val repos = ArrayList(count) + for ((index, issue) in issues.withIndex()) { + numbers[index] = issue.number()!! + pullRequests[index] = IssueUtils.isPullRequest(issue) + + var repoId: Repository? = null + val issueRepo = issue.repository() + if (issueRepo != null) { + val owner = issueRepo.owner() + if (owner != null) { + repoId = InfoUtils.createRepoFromData(owner.login(), issueRepo.name()) + } + } + if (repoId == null) { + repoId = InfoUtils.createRepoFromUrl(issue.htmlUrl()) + } + repos.add(repoId!!) + } + + val builder = Builder("issues.VIEW") + builder.add(EXTRA_ISSUE_NUMBERS, numbers) + builder.add(EXTRA_REPOSITORIES, repos) + builder.add(EXTRA_POSITION, position) + builder.add(EXTRA_PULL_REQUESTS, pullRequests) + return builder.toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/issue/SearchIssueListFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/issue/SearchIssueListFragment.kt index 27baa6482..4facd6127 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/issue/SearchIssueListFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/issue/SearchIssueListFragment.kt @@ -124,7 +124,7 @@ class SearchIssueListFragment : BaseFragment() { fun onItemClick(item: Item<*>, view: View) { if (item is IssueItem) { val searchIssue = item.issue - startActivity(IssuesViewActivity.createIntent(searchIssue, repository)) + startActivity(IssuesViewActivity.createIntent(searchIssue, repository!!)) } } diff --git a/app/src/main/java/com/github/pockethub/android/ui/notification/NotificationListFragment.kt b/app/src/main/java/com/github/pockethub/android/ui/notification/NotificationListFragment.kt index 94ac2302f..00dd8804c 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/notification/NotificationListFragment.kt +++ b/app/src/main/java/com/github/pockethub/android/ui/notification/NotificationListFragment.kt @@ -166,7 +166,7 @@ class NotificationListFragment : BaseFragment(), NotificationReadListener { val issue = IssueUriMatcher.getApiIssue(url) if (issue != null) { - val intent = IssuesViewActivity.createIntent(issue, thread.repository()) + val intent = IssuesViewActivity.createIntent(issue, thread.repository()!!) startActivity(intent) } else { ToastUtils.show(activity, R.string.releases_not_yet_in_app) diff --git a/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.java deleted file mode 100644 index 8f5a203e0..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.java +++ /dev/null @@ -1,269 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.ref; - -import android.content.Intent; -import android.os.Bundle; -import android.text.TextUtils; -import android.util.Base64; -import android.util.Log; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.webkit.WebView; -import android.widget.ProgressBar; -import androidx.appcompat.app.ActionBar; -import butterknife.BindView; -import com.github.pockethub.android.Intents.*; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.commit.CommitUtils; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.ui.BaseActivity; -import com.github.pockethub.android.ui.MarkdownLoader; -import com.github.pockethub.android.util.*; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Repository; -import com.meisolsson.githubsdk.model.git.GitBlob; -import com.meisolsson.githubsdk.service.git.GitService; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; - -import javax.inject.Inject; - -import static com.github.pockethub.android.Intents.*; -import static com.github.pockethub.android.util.PreferenceUtils.RENDER_MARKDOWN; -import static com.github.pockethub.android.util.PreferenceUtils.WRAP; - -/** - * Activity to view a file on a branch - */ -public class BranchFileViewActivity extends BaseActivity { - - private static final String TAG = "BranchFileViewActivity"; - - private static final String ARG_TEXT = "text"; - - private static final String ARG_REPO = "repo"; - - /** - * Create intent to show file in commit - * - * @param repository - * @param branch - * @param file - * @param blobSha - * @return intent - */ - public static Intent createIntent(Repository repository, String branch, - String file, String blobSha) { - Builder builder = new Builder("branch.file.VIEW"); - builder.repo(repository); - builder.add(EXTRA_BASE, blobSha); - builder.add(EXTRA_PATH, file); - builder.add(EXTRA_HEAD, branch); - return builder.toIntent(); - } - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - @BindView(R.id.wv_code) - protected WebView codeView; - - private Repository repo; - - private String sha; - - private String path; - - private String file; - - private String branch; - - private boolean isMarkdownFile; - - private String renderedMarkdown; - - private GitBlob blob; - - private SourceEditor editor; - - private MenuItem markdownItem; - - @Inject - protected AvatarLoader avatars; - - @Inject - protected HttpImageGetter imageGetter; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_commit_file_view); - - repo = getParcelableExtra(EXTRA_REPOSITORY); - sha = getStringExtra(EXTRA_BASE); - path = getStringExtra(EXTRA_PATH); - branch = getStringExtra(EXTRA_HEAD); - - codeView.getSettings().setBuiltInZoomControls(true); - codeView.getSettings().setUseWideViewPort(true); - - file = CommitUtils.getName(path); - isMarkdownFile = MarkdownUtils.isMarkdown(file); - editor = new SourceEditor(codeView); - editor.setWrap(PreferenceUtils.getCodePreferences(this).getBoolean( - WRAP, false)); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setTitle(file); - actionBar.setSubtitle(branch); - avatars.bind(actionBar, repo.owner()); - - loadContent(); - } - - @Override - public boolean onCreateOptionsMenu(final Menu optionsMenu) { - getMenuInflater().inflate(R.menu.activity_file_view, optionsMenu); - - MenuItem wrapItem = optionsMenu.findItem(R.id.m_wrap); - if (PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false)) { - wrapItem.setTitle(R.string.disable_wrapping); - } else { - wrapItem.setTitle(R.string.enable_wrapping); - } - - markdownItem = optionsMenu.findItem(R.id.m_render_markdown); - if (isMarkdownFile) { - markdownItem.setEnabled(blob != null); - markdownItem.setVisible(true); - if (PreferenceUtils.getCodePreferences(this).getBoolean( - RENDER_MARKDOWN, true)) { - markdownItem.setTitle(R.string.show_raw_markdown); - } else { - markdownItem.setTitle(R.string.render_markdown); - } - } - - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_wrap: - if (editor.getWrap()) { - item.setTitle(R.string.enable_wrapping); - } else { - item.setTitle(R.string.disable_wrapping); - } - editor.toggleWrap(); - PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) - .edit().putBoolean(WRAP, editor.getWrap())); - return true; - - case R.id.m_share: - shareFile(); - return true; - - case R.id.m_render_markdown: - if (editor.isMarkdown()) { - item.setTitle(R.string.render_markdown); - editor.toggleMarkdown(); - editor.setSource(file, blob); - } else { - item.setTitle(R.string.show_raw_markdown); - editor.toggleMarkdown(); - if (renderedMarkdown != null) { - editor.setSource(file, renderedMarkdown, false); - } else { - loadMarkdown(); - } - } - PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) - .edit().putBoolean(RENDER_MARKDOWN, editor.isMarkdown())); - return true; - - default: - return super.onOptionsItemSelected(item); - } - } - - private void shareFile() { - String id = InfoUtils.createRepoId(repo); - startActivity(ShareUtils.create(path + " at " + branch + " on " + id, - "https://github.com/" + id + "/blob/" + branch + '/' + path)); - } - - private void loadMarkdown() { - loadingBar.setVisibility(View.VISIBLE); - codeView.setVisibility(View.GONE); - - String markdown = new String(Base64.decode(blob.content(), Base64.DEFAULT)); - MarkdownLoader.load(this, markdown, repo, imageGetter, false) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(rendered -> { - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - - if (!TextUtils.isEmpty(rendered)) { - renderedMarkdown = rendered.toString(); - if (markdownItem != null) { - markdownItem.setEnabled(true); - } - editor.setMarkdown(true).setSource(file, renderedMarkdown, false); - } - }, e -> ToastUtils.show(this, R.string.error_rendering_markdown)); - } - - private void loadContent() { - loadingBar.setVisibility(View.VISIBLE); - codeView.setVisibility(View.GONE); - - ServiceGenerator.createService(this, GitService.class) - .getGitBlob(repo.owner().login(), repo.name(), sha) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - blob = response.body(); - - if (markdownItem != null) { - markdownItem.setEnabled(true); - } - - if (isMarkdownFile - && PreferenceUtils.getCodePreferences(this).getBoolean( - RENDER_MARKDOWN, true)) { - loadMarkdown(); - } else { - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - - editor.setMarkdown(false).setSource(file, blob); - } - }, e -> { - Log.d(TAG, "Loading file contents failed", e); - - loadingBar.setVisibility(View.GONE); - codeView.setVisibility(View.VISIBLE); - ToastUtils.show(this, R.string.error_file_load); - }); - } - -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.kt new file mode 100644 index 000000000..2a9aeae68 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/ref/BranchFileViewActivity.kt @@ -0,0 +1,257 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.ref + +import android.content.Intent +import android.os.Bundle +import android.text.TextUtils +import android.util.Base64 +import android.util.Log +import android.view.Menu +import android.view.MenuItem +import android.view.View +import com.github.pockethub.android.Intents.* +import com.github.pockethub.android.R +import com.github.pockethub.android.core.commit.CommitUtils +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.BaseActivity +import com.github.pockethub.android.ui.MarkdownLoader +import com.github.pockethub.android.util.* +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Repository +import com.meisolsson.githubsdk.model.git.GitBlob +import com.meisolsson.githubsdk.service.git.GitService +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers + +import javax.inject.Inject +import com.github.pockethub.android.util.PreferenceUtils.RENDER_MARKDOWN +import com.github.pockethub.android.util.PreferenceUtils.WRAP +import kotlinx.android.synthetic.main.activity_commit_file_view.* + +/** + * Activity to view a file on a branch + */ +class BranchFileViewActivity : BaseActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + @Inject + lateinit var imageGetter: HttpImageGetter + + private var repo: Repository? = null + + private var sha: String? = null + + private var path: String? = null + + private var file: String? = null + + private var branch: String? = null + + private var isMarkdownFile: Boolean = false + + private var renderedMarkdown: String? = null + + private var blob: GitBlob? = null + + private lateinit var editor: SourceEditor + + private var markdownItem: MenuItem? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_commit_file_view) + + repo = getParcelableExtra(EXTRA_REPOSITORY) + sha = getStringExtra(EXTRA_BASE) + path = getStringExtra(EXTRA_PATH) + branch = getStringExtra(EXTRA_HEAD) + + wv_code.settings.builtInZoomControls = true + wv_code.settings.useWideViewPort = true + + file = CommitUtils.getName(path) + isMarkdownFile = MarkdownUtils.isMarkdown(file) + editor = SourceEditor(wv_code) + editor.wrap = PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false) + + val actionBar = supportActionBar!! + actionBar.title = file + actionBar.subtitle = branch + avatars.bind(actionBar, repo!!.owner()!!) + + loadContent() + } + + override fun onCreateOptionsMenu(optionsMenu: Menu): Boolean { + menuInflater.inflate(R.menu.activity_file_view, optionsMenu) + + val wrapItem = optionsMenu.findItem(R.id.m_wrap) + if (PreferenceUtils.getCodePreferences(this).getBoolean(WRAP, false)) { + wrapItem.setTitle(R.string.disable_wrapping) + } else { + wrapItem.setTitle(R.string.enable_wrapping) + } + + markdownItem = optionsMenu.findItem(R.id.m_render_markdown) + if (isMarkdownFile) { + markdownItem!!.isEnabled = blob != null + markdownItem!!.isVisible = true + if (PreferenceUtils.getCodePreferences(this).getBoolean( + RENDER_MARKDOWN, true)) { + markdownItem!!.setTitle(R.string.show_raw_markdown) + } else { + markdownItem!!.setTitle(R.string.render_markdown) + } + } + + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.m_wrap -> { + if (editor.wrap) { + item.setTitle(R.string.enable_wrapping) + } else { + item.setTitle(R.string.disable_wrapping) + } + editor.toggleWrap() + PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) + .edit().putBoolean(WRAP, editor.wrap)) + return true + } + + R.id.m_share -> { + shareFile() + return true + } + + R.id.m_render_markdown -> { + if (editor.isMarkdown) { + item.setTitle(R.string.render_markdown) + editor.toggleMarkdown() + editor.setSource(file, blob) + } else { + item.setTitle(R.string.show_raw_markdown) + editor.toggleMarkdown() + if (renderedMarkdown != null) { + editor.setSource(file, renderedMarkdown, false) + } else { + loadMarkdown() + } + } + PreferenceUtils.save(PreferenceUtils.getCodePreferences(this) + .edit().putBoolean(RENDER_MARKDOWN, editor.isMarkdown)) + return true + } + + else -> return super.onOptionsItemSelected(item) + } + } + + private fun shareFile() { + val id = InfoUtils.createRepoId(repo!!) + startActivity(ShareUtils.create("$path at $branch on $id", + "https://github.com/" + id + "/blob/" + branch + '/'.toString() + path)) + } + + private fun loadMarkdown() { + pb_loading.visibility = View.VISIBLE + wv_code.visibility = View.GONE + + val markdown = String(Base64.decode(blob!!.content(), Base64.DEFAULT)) + MarkdownLoader.load(this, markdown, repo, imageGetter, false) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe({ rendered -> + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + + if (!TextUtils.isEmpty(rendered)) { + renderedMarkdown = rendered.toString() + if (markdownItem != null) { + markdownItem!!.isEnabled = true + } + editor!!.setMarkdown(true).setSource(file, renderedMarkdown, false) + } + }, { e -> ToastUtils.show(this, R.string.error_rendering_markdown) }) + } + + private fun loadContent() { + pb_loading.visibility = View.VISIBLE + wv_code.visibility = View.GONE + + ServiceGenerator.createService(this, GitService::class.java) + .getGitBlob(repo!!.owner()!!.login(), repo!!.name(), sha) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + blob = response.body() + + if (markdownItem != null) { + markdownItem!!.isEnabled = true + } + + if (isMarkdownFile && PreferenceUtils.getCodePreferences(this).getBoolean( + RENDER_MARKDOWN, true)) { + loadMarkdown() + } else { + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + + editor.setMarkdown(false).setSource(file, blob) + } + }, { e -> + Log.d(TAG, "Loading file contents failed", e) + + pb_loading.visibility = View.GONE + wv_code.visibility = View.VISIBLE + ToastUtils.show(this, R.string.error_file_load) + }) + } + + companion object { + + private val TAG = "BranchFileViewActivity" + + private val ARG_TEXT = "text" + + private val ARG_REPO = "repo" + + /** + * Create intent to show file in commit + * + * @param repository + * @param branch + * @param file + * @param blobSha + * @return intent + */ + fun createIntent(repository: Repository, branch: String, + file: String, blobSha: String): Intent { + val builder = Builder("branch.file.VIEW") + builder.repo(repository) + builder.add(EXTRA_BASE, blobSha) + builder.add(EXTRA_PATH, file) + builder.add(EXTRA_HEAD, branch) + return builder.toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryContributorsActivity.java b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryContributorsActivity.java index 1ce75f880..2e6190931 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryContributorsActivity.java +++ b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryContributorsActivity.java @@ -73,7 +73,7 @@ protected void onCreate(Bundle savedInstanceState) { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case android.R.id.home: - Intent intent = RepositoryViewActivity.createIntent(repository); + Intent intent = RepositoryViewActivity.Companion.createIntent(repository); intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); startActivity(intent); return true; diff --git a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryNewsFragment.java b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryNewsFragment.java index 45f356a84..db2c0a693 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryNewsFragment.java +++ b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryNewsFragment.java @@ -70,13 +70,13 @@ protected void viewRepository(Repository repository) { @Override protected void viewIssue(Issue issue, Repository repository) { - startActivity(IssuesViewActivity.createIntent(issue, repo)); + startActivity(IssuesViewActivity.Companion.createIntent(issue, repo)); } @Override protected boolean viewUser(User user) { if (repo.owner().id() != user.id()) { - startActivity(UserViewActivity.createIntent(user)); + startActivity(UserViewActivity.Companion.createIntent(user)); return true; } return false; diff --git a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.java deleted file mode 100644 index fb8fb1b4f..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.java +++ /dev/null @@ -1,342 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.repo; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import android.text.TextUtils; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.ProgressBar; - -import com.afollestad.materialdialogs.MaterialDialog; -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.core.repo.RepositoryUtils; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.ui.TabPagerActivity; -import com.github.pockethub.android.ui.user.UriLauncherActivity; -import com.github.pockethub.android.ui.user.UserViewActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.InfoUtils; -import com.github.pockethub.android.util.ShareUtils; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.Repository; -import com.meisolsson.githubsdk.model.User; -import com.meisolsson.githubsdk.service.activity.StarringService; -import com.meisolsson.githubsdk.service.repositories.RepositoryContentService; -import com.meisolsson.githubsdk.service.repositories.RepositoryForkService; -import com.meisolsson.githubsdk.service.repositories.RepositoryService; - -import javax.inject.Inject; - -import butterknife.BindView; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; -import retrofit2.Response; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_REPOSITORY; -import static com.github.pockethub.android.ResultCodes.RESOURCE_CHANGED; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_CODE; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_COMMIT; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_ISSUE_OPEN; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_NEWS; - -/** - * Activity to view a repository - */ -public class RepositoryViewActivity extends TabPagerActivity { - public static final String TAG = "RepositoryViewActivity"; - - /** - * Create intent for this activity - * - * @param repository - * @return intent - */ - public static Intent createIntent(Repository repository) { - return new Builder("repo.VIEW").repo(repository).toIntent(); - } - - private Repository repository; - - @Inject - protected AvatarLoader avatars; - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - private boolean isStarred; - - private boolean starredStatusChecked; - - private boolean hasReadme; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.tabbed_progress_pager); - - repository = getParcelableExtra(EXTRA_REPOSITORY); - User owner = repository.owner(); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setTitle(repository.name()); - actionBar.setSubtitle(owner.login()); - actionBar.setDisplayHomeAsUpEnabled(true); - - if (owner.avatarUrl() != null && RepositoryUtils.isComplete(repository)) { - checkReadme(); - } else { - avatars.bind(getSupportActionBar(), owner); - loadingBar.setVisibility(View.VISIBLE); - setGone(true); - ServiceGenerator.createService(this, RepositoryService.class) - .getRepository(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - if (response.isSuccessful()) { - repository = response.body(); - checkReadme(); - } else { - ToastUtils.show(this, R.string.error_repo_load); - loadingBar.setVisibility(View.GONE); - } - }, e -> { - ToastUtils.show(this, R.string.error_repo_load); - loadingBar.setVisibility(View.GONE); - }); - } - } - - @Override - public boolean onCreateOptionsMenu(Menu optionsMenu) { - getMenuInflater().inflate(R.menu.activity_repository, optionsMenu); - return super.onCreateOptionsMenu(optionsMenu); - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - MenuItem followItem = menu.findItem(R.id.m_star); - - followItem.setVisible(starredStatusChecked); - followItem.setTitle(isStarred ? R.string.unstar : R.string.star); - - MenuItem parentRepo = menu.findItem(R.id.m_parent_repo); - if(repository != null && repository.isFork() != null) - parentRepo.setVisible(repository.isFork()); - - return super.onPrepareOptionsMenu(menu); - } - - @Override - public void onBackPressed() { - if (adapter == null || pager.getCurrentItem() != adapter.getItemCode() || !adapter.onBackPressed()) { - super.onBackPressed(); - } - } - - private void checkReadme() { - loadingBar.setVisibility(View.VISIBLE); - ServiceGenerator.createService(this, RepositoryContentService.class) - .hasReadme(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - hasReadme = response.code() == 200; - configurePager(); - }, e -> { - hasReadme = false; - configurePager(); - }); - } - - private void configurePager() { - avatars.bind(getSupportActionBar(), repository.owner()); - configureTabPager(); - loadingBar.setVisibility(View.GONE); - setGone(false); - checkStarredRepositoryStatus(); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_star: - starRepository(); - return true; - case R.id.m_fork: - forkRepository(); - return true; - case R.id.m_contributors: - startActivity(RepositoryContributorsActivity.createIntent(repository)); - return true; - case R.id.m_share: - shareRepository(); - return true; - case R.id.m_parent_repo: - if (repository.parent() == null) { - ServiceGenerator.createService(this, RepositoryService.class) - .getRepository(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(response -> { - Repository parent = response.body().parent(); - startActivity(RepositoryViewActivity.createIntent(parent)); - }); - } else { - startActivity(RepositoryViewActivity.createIntent(repository.parent())); - } - return true; - case R.id.m_delete: - deleteRepository(); - return true; - case R.id.m_refresh: - checkStarredRepositoryStatus(); - return super.onOptionsItemSelected(item); - case android.R.id.home: - finish(); - Intent intent = UserViewActivity.createIntent(repository.owner()); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - public void onDialogResult(int requestCode, int resultCode, Bundle arguments) { - adapter.onDialogResult(pager.getCurrentItem(), requestCode, resultCode, arguments); - } - - @Override - protected RepositoryPagerAdapter createAdapter() { - return new RepositoryPagerAdapter(this, repository.hasIssues(), hasReadme); - } - - @Override - protected String getIcon(int position) { - switch (position) { - case 0: - return ICON_NEWS; - case 1: - return ICON_CODE; - case 2: - return ICON_COMMIT; - case 3: - return ICON_ISSUE_OPEN; - default: - return super.getIcon(position); - } - } - - private void starRepository() { - StarringService service = ServiceGenerator.createService(this, StarringService.class); - - Single> starSingle; - if (isStarred) { - starSingle = service.unstarRepository(repository.owner().login(), repository.name()); - } else { - starSingle = service.starRepository(repository.owner().login(), repository.name()); - } - - starSingle.subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(aVoid -> { - isStarred = !isStarred; - setResult(RESOURCE_CHANGED); - }, e -> ToastUtils.show(this, isStarred ? R.string.error_unstarring_repository : R.string.error_starring_repository)); - } - - private void checkStarredRepositoryStatus() { - starredStatusChecked = false; - ServiceGenerator.createService(this, StarringService.class) - .checkIfRepositoryIsStarred(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - isStarred = response.code() == 204; - starredStatusChecked = true; - invalidateOptionsMenu(); - }); - } - - private void shareRepository() { - String repoUrl = repository.htmlUrl(); - if (TextUtils.isEmpty(repoUrl)) { - repoUrl = "https://github.com/" + InfoUtils.createRepoId(repository); - } - Intent sharingIntent = ShareUtils.create(InfoUtils.createRepoId(repository), repoUrl); - startActivity(sharingIntent); - } - - private void forkRepository() { - ServiceGenerator.createService(this, RepositoryForkService.class) - .createFork(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - Repository repo = response.body(); - UriLauncherActivity.launchUri(this, Uri.parse(repo.htmlUrl())); - }, e -> ToastUtils.show(this, R.string.error_forking_repository)); - } - - private void deleteRepository() { - new MaterialDialog.Builder(this) - .title(R.string.are_you_sure) - .content(R.string.unexpected_bad_things) - .positiveText(R.string.not_sure) - .negativeText(R.string.delete_cap) - .callback(new MaterialDialog.ButtonCallback() { - @Override - public void onPositive(MaterialDialog dialog) { - super.onPositive(dialog); - dialog.dismiss(); - } - - @Override - public void onNegative(MaterialDialog dialog) { - super.onNegative(dialog); - dialog.dismiss(); - - ServiceGenerator.createService(dialog.getContext(), RepositoryService.class) - .deleteRepository(repository.owner().login(), repository.name()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(getLifecycle())) - .subscribe(response -> { - onBackPressed(); - ToastUtils.show(RepositoryViewActivity.this, R.string.delete_successful); - }, e -> ToastUtils.show(RepositoryViewActivity.this, R.string.error_deleting_repository)); - } - }) - .show(); - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.kt new file mode 100644 index 000000000..aa1c2a179 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/repo/RepositoryViewActivity.kt @@ -0,0 +1,328 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.repo + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.net.Uri +import android.os.Bundle +import android.text.TextUtils +import android.view.Menu +import android.view.MenuItem +import android.view.View +import com.afollestad.materialdialogs.MaterialDialog +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_REPOSITORY +import com.github.pockethub.android.R +import com.github.pockethub.android.ResultCodes.RESOURCE_CHANGED +import com.github.pockethub.android.core.repo.RepositoryUtils +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.TabPagerActivity +import com.github.pockethub.android.ui.user.UriLauncherActivity +import com.github.pockethub.android.ui.user.UserViewActivity +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_CODE +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_COMMIT +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_ISSUE_OPEN +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_NEWS +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.InfoUtils +import com.github.pockethub.android.util.ShareUtils +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.Repository +import com.meisolsson.githubsdk.service.activity.StarringService +import com.meisolsson.githubsdk.service.repositories.RepositoryContentService +import com.meisolsson.githubsdk.service.repositories.RepositoryForkService +import com.meisolsson.githubsdk.service.repositories.RepositoryService +import io.reactivex.Single +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.pager_with_tabs.* +import kotlinx.android.synthetic.main.tabbed_progress_pager.* +import retrofit2.Response +import javax.inject.Inject + +/** + * Activity to view a repository + */ +class RepositoryViewActivity : TabPagerActivity() { + + @Inject + lateinit var avatars: AvatarLoader + + private var repository: Repository? = null + + private var isStarred: Boolean = false + + private var starredStatusChecked: Boolean = false + + private var hasReadme: Boolean = false + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.tabbed_progress_pager) + + repository = getParcelableExtra(EXTRA_REPOSITORY) + val owner = repository!!.owner()!! + + val actionBar = supportActionBar!! + actionBar.title = repository!!.name() + actionBar.subtitle = owner.login() + actionBar.setDisplayHomeAsUpEnabled(true) + + if (owner.avatarUrl() != null && RepositoryUtils.isComplete(repository!!)) { + checkReadme() + } else { + avatars.bind(supportActionBar!!, owner) + pb_loading.visibility = View.VISIBLE + setGone(true) + ServiceGenerator.createService(this, RepositoryService::class.java) + .getRepository(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + if (response.isSuccessful) { + repository = response.body() + checkReadme() + } else { + ToastUtils.show(this, R.string.error_repo_load) + pb_loading.visibility = View.GONE + } + }, { e -> + ToastUtils.show(this, R.string.error_repo_load) + pb_loading.visibility = View.GONE + }) + } + } + + override fun onCreateOptionsMenu(optionsMenu: Menu): Boolean { + menuInflater.inflate(R.menu.activity_repository, optionsMenu) + return super.onCreateOptionsMenu(optionsMenu) + } + + override fun onPrepareOptionsMenu(menu: Menu): Boolean { + val followItem = menu.findItem(R.id.m_star) + + followItem.isVisible = starredStatusChecked + followItem.setTitle(if (isStarred) R.string.unstar else R.string.star) + + val parentRepo = menu.findItem(R.id.m_parent_repo) + if (repository != null && repository!!.isFork != null) + parentRepo.isVisible = repository!!.isFork!! + + return super.onPrepareOptionsMenu(menu) + } + + override fun onBackPressed() { + if (adapter == null || vp_pages.currentItem != adapter!!.itemCode || !adapter!!.onBackPressed()) { + super.onBackPressed() + } + } + + private fun checkReadme() { + pb_loading.visibility = View.VISIBLE + ServiceGenerator.createService(this, RepositoryContentService::class.java) + .hasReadme(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + hasReadme = response.code() == 200 + configurePager() + }, { e -> + hasReadme = false + configurePager() + }) + } + + private fun configurePager() { + avatars.bind(supportActionBar!!, repository!!.owner()!!) + configureTabPager() + pb_loading.visibility = View.GONE + setGone(false) + checkStarredRepositoryStatus() + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.m_star -> { + starRepository() + return true + } + R.id.m_fork -> { + forkRepository() + return true + } + R.id.m_contributors -> { + startActivity(RepositoryContributorsActivity.createIntent(repository)) + return true + } + R.id.m_share -> { + shareRepository() + return true + } + R.id.m_parent_repo -> { + if (repository!!.parent() == null) { + ServiceGenerator.createService(this, RepositoryService::class.java) + .getRepository(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .subscribe { response -> + val parent = response.body().parent() + startActivity(RepositoryViewActivity.createIntent(parent!!)) + } + } else { + startActivity(RepositoryViewActivity.createIntent(repository!!.parent()!!)) + } + return true + } + R.id.m_delete -> { + deleteRepository() + return true + } + R.id.m_refresh -> { + checkStarredRepositoryStatus() + return super.onOptionsItemSelected(item) + } + android.R.id.home -> { + finish() + val intent = UserViewActivity.createIntent(repository!!.owner()!!) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + override fun onDialogResult(requestCode: Int, resultCode: Int, arguments: Bundle) { + adapter!!.onDialogResult(vp_pages.currentItem, requestCode, resultCode, arguments) + } + + override fun createAdapter(): RepositoryPagerAdapter { + return RepositoryPagerAdapter(this, repository!!.hasIssues()!!, hasReadme) + } + + override fun getIcon(position: Int): String? { + return when (position) { + 0 -> ICON_NEWS + 1 -> ICON_CODE + 2 -> ICON_COMMIT + 3 -> ICON_ISSUE_OPEN + else -> super.getIcon(position) + } + } + + private fun starRepository() { + val service = ServiceGenerator.createService(this, StarringService::class.java) + + val starSingle: Single> + starSingle = if (isStarred) { + service.unstarRepository(repository!!.owner()!!.login(), repository!!.name()) + } else { + service.starRepository(repository!!.owner()!!.login(), repository!!.name()) + } + + starSingle.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ aVoid -> + isStarred = !isStarred + setResult(RESOURCE_CHANGED) + }, { e -> ToastUtils.show(this, if (isStarred) R.string.error_unstarring_repository else R.string.error_starring_repository) }) + } + + private fun checkStarredRepositoryStatus() { + starredStatusChecked = false + ServiceGenerator.createService(this, StarringService::class.java) + .checkIfRepositoryIsStarred(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe { response -> + isStarred = response.code() == 204 + starredStatusChecked = true + invalidateOptionsMenu() + } + } + + private fun shareRepository() { + var repoUrl = repository!!.htmlUrl() + if (TextUtils.isEmpty(repoUrl)) { + repoUrl = "https://github.com/" + InfoUtils.createRepoId(repository!!) + } + val sharingIntent = ShareUtils.create(InfoUtils.createRepoId(repository!!), repoUrl) + startActivity(sharingIntent) + } + + private fun forkRepository() { + ServiceGenerator.createService(this, RepositoryForkService::class.java) + .createFork(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + val repo = response.body() + UriLauncherActivity.launchUri(this, Uri.parse(repo.htmlUrl())) + }, { e -> ToastUtils.show(this, R.string.error_forking_repository) }) + } + + private fun deleteRepository() { + MaterialDialog.Builder(this) + .title(R.string.are_you_sure) + .content(R.string.unexpected_bad_things) + .positiveText(R.string.not_sure) + .negativeText(R.string.delete_cap) + .callback(object : MaterialDialog.ButtonCallback() { + override fun onPositive(dialog: MaterialDialog?) { + super.onPositive(dialog) + dialog!!.dismiss() + } + + override fun onNegative(dialog: MaterialDialog?) { + super.onNegative(dialog) + dialog!!.dismiss() + + ServiceGenerator.createService(dialog.context, RepositoryService::class.java) + .deleteRepository(repository!!.owner()!!.login(), repository!!.name()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(lifecycle)) + .subscribe({ response -> + onBackPressed() + ToastUtils.show(this@RepositoryViewActivity, R.string.delete_successful) + }, { e -> ToastUtils.show(this@RepositoryViewActivity, R.string.error_deleting_repository) }) + } + }) + .show() + } + + companion object { + val TAG = "RepositoryViewActivity" + + /** + * Create intent for this activity + * + * @param repository + * @return intent + */ + fun createIntent(repository: Repository): Intent { + return Builder("repo.VIEW").repo(repository).toIntent() + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.java b/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.java deleted file mode 100644 index 6a347489b..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.java +++ /dev/null @@ -1,164 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.search; - -import android.app.SearchManager; -import android.content.Context; -import android.content.Intent; -import android.os.Bundle; -import androidx.fragment.app.FragmentManager; -import androidx.core.view.MenuItemCompat; -import androidx.appcompat.app.ActionBar; -import androidx.appcompat.widget.SearchView; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.ProgressBar; - -import com.github.pockethub.android.R; -import com.github.pockethub.android.ui.MainActivity; -import com.github.pockethub.android.ui.TabPagerActivity; -import com.github.pockethub.android.util.ToastUtils; - -import butterknife.BindView; - -import static android.app.SearchManager.QUERY; -import static android.content.Intent.ACTION_SEARCH; -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_PERSON; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_PUBLIC; - -/** - * Activity to view search results - */ -public class SearchActivity extends TabPagerActivity { - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - private SearchRepositoryListFragment repoFragment; - - private SearchUserListFragment userFragment; - - private SearchView searchView; - - private String lastQuery; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.tabbed_progress_pager); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - - configurePager(); - handleIntent(getIntent()); - } - - @Override - public boolean onCreateOptionsMenu(Menu options) { - getMenuInflater().inflate(R.menu.activity_search, options); - - SearchManager searchManager = (SearchManager) getSystemService(Context.SEARCH_SERVICE); - MenuItem searchItem = options.findItem(R.id.m_search); - searchView = (SearchView) MenuItemCompat.getActionView(searchItem); - searchView.setSearchableInfo(searchManager.getSearchableInfo(getComponentName())); - - return true; - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_search: - searchView.post(() -> searchView.setQuery(lastQuery, false)); - return true; - case R.id.m_clear: - RepositorySearchSuggestionsProvider.clear(this); - ToastUtils.show(this, R.string.search_history_cleared); - return true; - case android.R.id.home: - Intent intent = new Intent(this, MainActivity.class); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - } - - @Override - protected SearchPagerAdapter createAdapter() { - return new SearchPagerAdapter(this); - } - - @Override - protected String getIcon(int position) { - switch (position) { - case 0: - return ICON_PUBLIC; - case 1: - return ICON_PERSON; - default: - return super.getIcon(position); - } - } - - @Override - protected void onNewIntent(Intent intent) { - setIntent(intent); - handleIntent(intent); - } - - private void handleIntent(Intent intent) { - if (ACTION_SEARCH.equals(intent.getAction())) { - search(intent.getStringExtra(QUERY)); - } - } - - private void search(final String query) { - lastQuery = query; - getSupportActionBar().setTitle(query); - RepositorySearchSuggestionsProvider.save(this, query); - - if (repoFragment == null || userFragment == null) { - findFragments(); - } - - if (repoFragment != null && userFragment != null) { - repoFragment.pagedListFetcher.refresh(); - userFragment.pagedListFetcher.refresh(); - } - } - - private void configurePager() { - configureTabPager(); - loadingBar.setVisibility(View.GONE); - setGone(false); - } - - private void findFragments() { - if (repoFragment == null || userFragment == null) { - FragmentManager fm = getSupportFragmentManager(); - repoFragment = (SearchRepositoryListFragment) fm.findFragmentByTag( - "android:switcher:" + pager.getId() + ":" + 0); - userFragment = (SearchUserListFragment) fm.findFragmentByTag( - "android:switcher:" + pager.getId() + ":" + 1); - } - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.kt new file mode 100644 index 000000000..d47691387 --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/search/SearchActivity.kt @@ -0,0 +1,148 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.search + +import android.app.SearchManager +import android.app.SearchManager.QUERY +import android.content.Context +import android.content.Intent +import android.content.Intent.ACTION_SEARCH +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.view.Menu +import android.view.MenuItem +import android.view.View +import androidx.appcompat.widget.SearchView +import com.github.pockethub.android.R +import com.github.pockethub.android.ui.MainActivity +import com.github.pockethub.android.ui.TabPagerActivity +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_PERSON +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_PUBLIC +import com.github.pockethub.android.util.ToastUtils +import kotlinx.android.synthetic.main.pager_with_tabs.* +import kotlinx.android.synthetic.main.tabbed_progress_pager.* + +/** + * Activity to view search results + */ +class SearchActivity : TabPagerActivity() { + + private var repoFragment: SearchRepositoryListFragment? = null + + private var userFragment: SearchUserListFragment? = null + + private var searchView: SearchView? = null + + private var lastQuery: String? = null + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.tabbed_progress_pager) + + val actionBar = supportActionBar!! + actionBar.setDisplayHomeAsUpEnabled(true) + + configurePager() + handleIntent(intent) + } + + override fun onCreateOptionsMenu(options: Menu): Boolean { + menuInflater.inflate(R.menu.activity_search, options) + + val searchManager = getSystemService(Context.SEARCH_SERVICE) as SearchManager + val searchItem = options.findItem(R.id.m_search) + searchView = searchItem.actionView as SearchView + searchView!!.setSearchableInfo(searchManager.getSearchableInfo(componentName)) + + return true + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.m_search -> { + searchView!!.post { searchView!!.setQuery(lastQuery, false) } + return true + } + R.id.m_clear -> { + RepositorySearchSuggestionsProvider.clear(this) + ToastUtils.show(this, R.string.search_history_cleared) + return true + } + android.R.id.home -> { + val intent = Intent(this, MainActivity::class.java) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + override fun createAdapter(): SearchPagerAdapter { + return SearchPagerAdapter(this) + } + + override fun getIcon(position: Int): String? { + return when (position) { + 0 -> ICON_PUBLIC + 1 -> ICON_PERSON + else -> super.getIcon(position) + } + } + + override fun onNewIntent(intent: Intent) { + setIntent(intent) + handleIntent(intent) + } + + private fun handleIntent(intent: Intent) { + if (ACTION_SEARCH == intent.action) { + search(intent.getStringExtra(QUERY)) + } + } + + private fun search(query: String) { + lastQuery = query + supportActionBar!!.title = query + RepositorySearchSuggestionsProvider.save(this, query) + + if (repoFragment == null || userFragment == null) { + findFragments() + } + + if (repoFragment != null && userFragment != null) { + repoFragment!!.pagedListFetcher.refresh() + userFragment!!.pagedListFetcher.refresh() + } + } + + private fun configurePager() { + configureTabPager() + pb_loading.visibility = View.GONE + setGone(false) + } + + private fun findFragments() { + if (repoFragment == null || userFragment == null) { + val fm = supportFragmentManager + repoFragment = fm.findFragmentByTag( + "android:switcher:${vp_pages.id}:0") as SearchRepositoryListFragment + userFragment = fm.findFragmentByTag( + "android:switcher:${vp_pages.id}:1") as SearchUserListFragment + } + } +} diff --git a/app/src/main/java/com/github/pockethub/android/ui/user/UriLauncherActivity.java b/app/src/main/java/com/github/pockethub/android/ui/user/UriLauncherActivity.java index 7e0db111c..91fd34e89 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/user/UriLauncherActivity.java +++ b/app/src/main/java/com/github/pockethub/android/ui/user/UriLauncherActivity.java @@ -137,27 +137,27 @@ static private Intent getIntentForURI(Uri data) { if (HOST_GISTS.equals(data.getHost())) { Gist gist = GistUriMatcher.getGist(data); if (gist != null) { - return GistsViewActivity.createIntent(gist); + return GistsViewActivity.Companion.createIntent(gist); } } else if (HOST_DEFAULT.equals(data.getHost())) { CommitMatch commit = CommitUriMatcher.getCommit(data); if (commit != null) { - return CommitViewActivity.createIntent(commit.getRepository(), commit.getCommit()); + return CommitViewActivity.Companion.createIntent(commit.getRepository(), commit.getCommit()); } Issue issue = IssueUriMatcher.getIssue(data); if (issue != null) { - return IssuesViewActivity.createIntent(issue, issue.repository()); + return IssuesViewActivity.Companion.createIntent(issue, issue.repository()); } Repository repository = RepositoryUriMatcher.getRepository(data); if (repository != null) { - return RepositoryViewActivity.createIntent(repository); + return RepositoryViewActivity.Companion.createIntent(repository); } User user = UserUriMatcher.getUser(data); if (user != null) { - return UserViewActivity.createIntent(user); + return UserViewActivity.Companion.createIntent(user); } } diff --git a/app/src/main/java/com/github/pockethub/android/ui/user/UserNewsFragment.java b/app/src/main/java/com/github/pockethub/android/ui/user/UserNewsFragment.java index 007a00ebe..752f00dba 100644 --- a/app/src/main/java/com/github/pockethub/android/ui/user/UserNewsFragment.java +++ b/app/src/main/java/com/github/pockethub/android/ui/user/UserNewsFragment.java @@ -94,7 +94,7 @@ public void onOrganizationSelected(User organization) { @Override protected boolean viewUser(User user) { if (org.id() != user.id()) { - startActivity(UserViewActivity.createIntent(user)); + startActivity(UserViewActivity.Companion.createIntent(user)); return true; } return false; diff --git a/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.java b/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.java deleted file mode 100644 index c3a5a04c1..000000000 --- a/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.java +++ /dev/null @@ -1,221 +0,0 @@ -/* - * Copyright (c) 2015 PocketHub - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.github.pockethub.android.ui.user; - -import android.content.Intent; -import android.os.Bundle; -import androidx.appcompat.app.ActionBar; -import android.text.TextUtils; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; -import android.widget.ProgressBar; - -import com.github.pockethub.android.Intents.Builder; -import com.github.pockethub.android.R; -import com.github.pockethub.android.accounts.AccountUtils; -import com.github.pockethub.android.rx.AutoDisposeUtils; -import com.github.pockethub.android.ui.MainActivity; -import com.github.pockethub.android.ui.TabPagerActivity; -import com.github.pockethub.android.util.AvatarLoader; -import com.github.pockethub.android.util.ToastUtils; -import com.meisolsson.githubsdk.core.ServiceGenerator; -import com.meisolsson.githubsdk.model.User; -import com.meisolsson.githubsdk.service.users.UserFollowerService; -import com.meisolsson.githubsdk.service.users.UserService; - -import javax.inject.Inject; - -import butterknife.BindView; -import io.reactivex.Single; -import io.reactivex.android.schedulers.AndroidSchedulers; -import io.reactivex.schedulers.Schedulers; -import retrofit2.Response; - -import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP; -import static android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP; -import static com.github.pockethub.android.Intents.EXTRA_USER; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_FOLLOW; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_NEWS; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_PUBLIC; -import static com.github.pockethub.android.ui.view.OcticonTextView.ICON_WATCH; - - -/** - * Activity to view a user's various pages - */ -public class UserViewActivity extends TabPagerActivity - implements OrganizationSelectionProvider { - - /** - * Create intent for this activity - * - * @param user - * @return intent - */ - public static Intent createIntent(User user) { - return new Builder("user.VIEW").user(user).toIntent(); - } - - @Inject - protected AvatarLoader avatars; - - private User user; - - @BindView(R.id.pb_loading) - protected ProgressBar loadingBar; - - private boolean isFollowing; - - private boolean followingStatusChecked; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.tabbed_progress_pager); - - user = getIntent().getParcelableExtra(EXTRA_USER); - - ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayHomeAsUpEnabled(true); - actionBar.setTitle(user.login()); - - if (!TextUtils.isEmpty(user.avatarUrl())) { - configurePager(); - } else { - loadingBar.setVisibility(View.VISIBLE); - setGone(true); - ServiceGenerator.createService(this, UserService.class) - .getUser(user.login()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - user = response.body(); - configurePager(); - }, e -> { - ToastUtils.show(this, R.string.error_person_load); - loadingBar.setVisibility(View.GONE); - }); - } - } - - @Override - public boolean onCreateOptionsMenu(Menu optionsMenu) { - getMenuInflater().inflate(R.menu.activity_user_follow, optionsMenu); - - return super.onCreateOptionsMenu(optionsMenu); - } - - @Override - public boolean onPrepareOptionsMenu(Menu menu) { - MenuItem followItem = menu.findItem(R.id.m_follow); - boolean isCurrentUser = user.login().equals(AccountUtils.getLogin(this)); - - followItem.setVisible(followingStatusChecked && !isCurrentUser); - followItem.setTitle(isFollowing ? R.string.unfollow : R.string.follow); - - return super.onPrepareOptionsMenu(menu); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.m_follow: - followUser(); - return true; - case android.R.id.home: - Intent intent = new Intent(this, MainActivity.class); - intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP | FLAG_ACTIVITY_SINGLE_TOP); - startActivity(intent); - return true; - default: - return super.onOptionsItemSelected(item); - } - - } - - private void configurePager() { - avatars.bind(getSupportActionBar(), user); - configureTabPager(); - loadingBar.setVisibility(View.GONE); - setGone(false); - checkFollowingUserStatus(); - } - - @Override - public User addListener(OrganizationSelectionListener listener) { - return user; - } - - @Override - public OrganizationSelectionProvider removeListener( - OrganizationSelectionListener listener) { - return this; - } - - @Override - protected UserPagerAdapter createAdapter() { - return new UserPagerAdapter(this); - } - - @Override - protected String getIcon(int position) { - switch (position) { - case 0: - return ICON_NEWS; - case 1: - return ICON_PUBLIC; - case 2: - return ICON_WATCH; - case 3: - return ICON_FOLLOW; - default: - return super.getIcon(position); - } - } - - private void followUser() { - UserFollowerService service = ServiceGenerator.createService(this, UserFollowerService.class); - - Single> followSingle; - if (isFollowing) { - followSingle = service.unfollowUser(user.login()); - } else{ - followSingle = service.followUser(user.login()); - } - - followSingle.subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(aVoid -> isFollowing = !isFollowing, - e -> ToastUtils.show(this, isFollowing ? R.string.error_unfollowing_person : R.string.error_following_person)); - } - - private void checkFollowingUserStatus() { - followingStatusChecked = false; - ServiceGenerator.createService(this, UserFollowerService.class) - .isFollowing(user.login()) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .as(AutoDisposeUtils.bindToLifecycle(this)) - .subscribe(response -> { - isFollowing = response.code() == 204; - followingStatusChecked = true; - invalidateOptionsMenu(); - }); - } -} diff --git a/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.kt b/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.kt new file mode 100644 index 000000000..4ebea301f --- /dev/null +++ b/app/src/main/java/com/github/pockethub/android/ui/user/UserViewActivity.kt @@ -0,0 +1,207 @@ +/* + * Copyright (c) 2015 PocketHub + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.github.pockethub.android.ui.user + +import android.content.Intent +import android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP +import android.content.Intent.FLAG_ACTIVITY_SINGLE_TOP +import android.os.Bundle +import android.text.TextUtils +import android.view.Menu +import android.view.MenuItem +import android.view.View +import com.github.pockethub.android.Intents.Builder +import com.github.pockethub.android.Intents.EXTRA_USER +import com.github.pockethub.android.R +import com.github.pockethub.android.accounts.AccountUtils +import com.github.pockethub.android.rx.AutoDisposeUtils +import com.github.pockethub.android.ui.MainActivity +import com.github.pockethub.android.ui.TabPagerActivity +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_FOLLOW +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_NEWS +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_PUBLIC +import com.github.pockethub.android.ui.view.OcticonTextView.ICON_WATCH +import com.github.pockethub.android.util.AvatarLoader +import com.github.pockethub.android.util.ToastUtils +import com.meisolsson.githubsdk.core.ServiceGenerator +import com.meisolsson.githubsdk.model.User +import com.meisolsson.githubsdk.service.users.UserFollowerService +import com.meisolsson.githubsdk.service.users.UserService +import io.reactivex.Single +import io.reactivex.android.schedulers.AndroidSchedulers +import io.reactivex.schedulers.Schedulers +import kotlinx.android.synthetic.main.tabbed_progress_pager.* +import retrofit2.Response +import javax.inject.Inject + +/** + * Activity to view a user's various pages + */ +class UserViewActivity : TabPagerActivity(), OrganizationSelectionProvider { + + @Inject + lateinit var avatars: AvatarLoader + + private var user: User? = null + + private var isFollowing: Boolean = false + + private var followingStatusChecked: Boolean = false + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.tabbed_progress_pager) + + user = intent.getParcelableExtra(EXTRA_USER) + + val actionBar = supportActionBar!! + actionBar.setDisplayHomeAsUpEnabled(true) + actionBar.title = user!!.login() + + if (!TextUtils.isEmpty(user!!.avatarUrl())) { + configurePager() + } else { + pb_loading.visibility = View.VISIBLE + setGone(true) + ServiceGenerator.createService(this, UserService::class.java) + .getUser(user!!.login()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ response -> + user = response.body() + configurePager() + }, { e -> + ToastUtils.show(this, R.string.error_person_load) + pb_loading.visibility = View.GONE + }) + } + } + + override fun onCreateOptionsMenu(optionsMenu: Menu): Boolean { + menuInflater.inflate(R.menu.activity_user_follow, optionsMenu) + + return super.onCreateOptionsMenu(optionsMenu) + } + + override fun onPrepareOptionsMenu(menu: Menu): Boolean { + val followItem = menu.findItem(R.id.m_follow) + val isCurrentUser = user!!.login() == AccountUtils.getLogin(this) + + followItem.isVisible = followingStatusChecked && !isCurrentUser + followItem.setTitle(if (isFollowing) R.string.unfollow else R.string.follow) + + return super.onPrepareOptionsMenu(menu) + } + + override fun onOptionsItemSelected(item: MenuItem): Boolean { + when (item.itemId) { + R.id.m_follow -> { + followUser() + return true + } + android.R.id.home -> { + val intent = Intent(this, MainActivity::class.java) + intent.addFlags(FLAG_ACTIVITY_CLEAR_TOP or FLAG_ACTIVITY_SINGLE_TOP) + startActivity(intent) + return true + } + else -> return super.onOptionsItemSelected(item) + } + } + + private fun configurePager() { + avatars.bind(supportActionBar!!, user!!) + configureTabPager() + pb_loading.visibility = View.GONE + setGone(false) + checkFollowingUserStatus() + } + + override fun addListener(listener: OrganizationSelectionListener): User? { + return user + } + + override fun removeListener( + listener: OrganizationSelectionListener): OrganizationSelectionProvider { + return this + } + + override fun createAdapter(): UserPagerAdapter { + return UserPagerAdapter(this) + } + + override fun getIcon(position: Int): String? { + return when (position) { + 0 -> ICON_NEWS + 1 -> ICON_PUBLIC + 2 -> ICON_WATCH + 3 -> ICON_FOLLOW + else -> super.getIcon(position) + } + } + + private fun followUser() { + val service = ServiceGenerator.createService(this, UserFollowerService::class.java) + + val followSingle: Single> + followSingle = if (isFollowing) { + service.unfollowUser(user!!.login()) + } else { + service.followUser(user!!.login()) + } + + followSingle.subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe({ aVoid -> isFollowing = !isFollowing }, + { e -> + val message = if (isFollowing) + R.string.error_unfollowing_person + else + R.string.error_following_person + + ToastUtils.show(this, message) + }) + } + + private fun checkFollowingUserStatus() { + followingStatusChecked = false + ServiceGenerator.createService(this, UserFollowerService::class.java) + .isFollowing(user!!.login()) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()) + .`as`(AutoDisposeUtils.bindToLifecycle(this)) + .subscribe { response -> + isFollowing = response.code() == 204 + followingStatusChecked = true + invalidateOptionsMenu() + } + } + + companion object { + + /** + * Create intent for this activity + * + * @param user + * @return intent + */ + fun createIntent(user: User): Intent { + return Builder("user.VIEW").user(user).toIntent() + } + } +} diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 669cceccd..d1619c1c2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -154,7 +154,7 @@ 10dp 10dp 10dp - ?attr/selectableItemBackground + ?android:attr/selectableItemBackground - -