diff --git a/app/build.gradle b/app/build.gradle index aa177879..75adf997 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,7 @@ android { } buildFeatures { - dataBinding = true + viewBinding true } } diff --git a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java b/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java index e1e19e9c..f568b826 100644 --- a/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AccountTypeListActivity.java @@ -11,7 +11,6 @@ import android.widget.LinearLayout; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DividerItemDecoration; import androidx.recyclerview.widget.LinearLayoutManager; @@ -19,11 +18,11 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.afollestad.materialdialogs.MaterialDialog; import com.readrops.app.R; import com.readrops.app.adapters.AccountTypeListAdapter; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.app.databinding.ActivityAccountTypeListBinding; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.AccountViewModel; +import com.readrops.readropsdb.entities.account.Account; +import com.readrops.readropsdb.entities.account.AccountType; import java.util.ArrayList; import java.util.List; @@ -52,7 +51,9 @@ public class AccountTypeListActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = DataBindingUtil.setContentView(this, R.layout.activity_account_type_list); + binding = ActivityAccountTypeListBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); setTitle(R.string.new_account); diff --git a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java b/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java index 87f6c9c8..1431b4c8 100644 --- a/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AddAccountActivity.java @@ -8,16 +8,15 @@ import android.view.MenuItem; import android.view.View; import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; import androidx.lifecycle.ViewModelProviders; import com.readrops.app.R; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.app.databinding.ActivityAddAccountBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.AccountViewModel; +import com.readrops.readropsdb.entities.account.Account; +import com.readrops.readropsdb.entities.account.AccountType; import io.reactivex.Completable; import io.reactivex.CompletableObserver; @@ -44,7 +43,9 @@ public class AddAccountActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = DataBindingUtil.setContentView(this, R.layout.activity_add_account); + binding = ActivityAddAccountBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + viewModel = ViewModelProviders.of(this).get(AccountViewModel.class); accountType = getIntent().getParcelableExtra(ACCOUNT_TYPE); diff --git a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java b/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java index 1f7bb7ae..725af7e2 100644 --- a/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java +++ b/app/src/main/java/com/readrops/app/activities/AddFeedActivity.java @@ -12,7 +12,6 @@ import android.view.View; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.DiffUtil; import androidx.recyclerview.widget.ItemTouchHelper; @@ -63,7 +62,9 @@ public class AddFeedActivity extends AppCompatActivity implements View.OnClickLi @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = DataBindingUtil.setContentView(this, R.layout.activity_add_feed); + + binding = ActivityAddFeedBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); binding.addFeedLoad.setOnClickListener(this); binding.addFeedOk.setOnClickListener(this); diff --git a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java index 03a1a02c..589747c5 100644 --- a/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java +++ b/app/src/main/java/com/readrops/app/activities/ManageFeedsFoldersActivity.java @@ -6,7 +6,6 @@ import android.view.MenuItem; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; -import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentManager; import androidx.fragment.app.FragmentPagerAdapter; @@ -14,13 +13,13 @@ import androidx.lifecycle.ViewModelProviders; import com.afollestad.materialdialogs.MaterialDialog; import com.readrops.app.R; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; import com.readrops.app.databinding.ActivityManageFeedsFoldersBinding; import com.readrops.app.fragments.FeedsFragment; import com.readrops.app.fragments.FoldersFragment; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; +import com.readrops.readropsdb.entities.Folder; +import com.readrops.readropsdb.entities.account.Account; import com.readrops.readropslibrary.utils.ConflictException; import com.readrops.readropslibrary.utils.UnknownFormatException; @@ -31,7 +30,6 @@ import static com.readrops.app.utils.ReadropsKeys.ACCOUNT; public class ManageFeedsFoldersActivity extends AppCompatActivity { - private ActivityManageFeedsFoldersBinding binding; private ManageFeedsFoldersViewModel viewModel; @@ -41,7 +39,9 @@ public class ManageFeedsFoldersActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - binding = DataBindingUtil.setContentView(this, R.layout.activity_manage_feeds_folders); + binding = ActivityManageFeedsFoldersBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); + setSupportActionBar(binding.manageFeedsFoldersToolbar); getSupportActionBar().setDisplayHomeAsUpEnabled(true); diff --git a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt b/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt index cd78b246..9000461d 100644 --- a/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt +++ b/app/src/main/java/com/readrops/app/activities/NotificationPermissionActivity.kt @@ -5,7 +5,6 @@ import android.os.Bundle import android.view.MenuItem import androidx.activity.viewModels import androidx.appcompat.app.AppCompatActivity -import androidx.databinding.DataBindingUtil import androidx.lifecycle.Observer import androidx.recyclerview.widget.LinearLayoutManager import com.afollestad.materialdialogs.MaterialDialog @@ -34,7 +33,8 @@ class NotificationPermissionActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.activity_notification_permission) + binding = ActivityNotificationPermissionBinding.inflate(layoutInflater) + setContentView(binding.root) setTitle(R.string.notifications) supportActionBar?.setDisplayHomeAsUpEnabled(true) diff --git a/app/src/main/java/com/readrops/app/activities/SplashActivity.java b/app/src/main/java/com/readrops/app/activities/SplashActivity.java index 53548c3d..b8f14214 100644 --- a/app/src/main/java/com/readrops/app/activities/SplashActivity.java +++ b/app/src/main/java/com/readrops/app/activities/SplashActivity.java @@ -47,5 +47,12 @@ public class SplashActivity extends AppCompatActivity { } }); + + + /*PeriodicWorkRequest request = new PeriodicWorkRequest.Builder(SyncWorker.class, 15, TimeUnit.MINUTES) + .addTag(SyncWorker.Companion.getTAG()) + .build(); + + WorkManager.getInstance(this).enqueueUniquePeriodicWork(SyncWorker.Companion.getTAG(), ExistingPeriodicWorkPolicy.REPLACE, request);*/ } } diff --git a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt b/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt index 80558dd6..2a41a876 100644 --- a/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt +++ b/app/src/main/java/com/readrops/app/activities/WebViewActivity.kt @@ -2,22 +2,22 @@ package com.readrops.app.activities import android.annotation.SuppressLint import android.content.Intent +import android.content.res.ColorStateList import android.graphics.Bitmap -import android.graphics.PorterDuff import android.graphics.drawable.ColorDrawable import android.net.Uri import android.os.Bundle +import android.view.LayoutInflater import android.view.Menu import android.view.MenuItem import android.view.View import android.webkit.* import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat -import androidx.databinding.DataBindingUtil import com.readrops.app.R import com.readrops.app.databinding.ActivityWebViewBinding +import com.readrops.app.utils.ReadropsKeys import com.readrops.app.utils.ReadropsKeys.ACTION_BAR_COLOR -import com.readrops.app.utils.ReadropsKeys.WEB_URL class WebViewActivity : AppCompatActivity() { @@ -25,21 +25,26 @@ class WebViewActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - binding = DataBindingUtil.setContentView(this, R.layout.activity_web_view) + binding = ActivityWebViewBinding.inflate(layoutInflater) + setContentView(binding.root) setSupportActionBar(binding.activityWebViewToolbar) supportActionBar?.setDisplayHomeAsUpEnabled(true) title = "" + val actionBarColor = intent.getIntExtra(ACTION_BAR_COLOR, ContextCompat.getColor(this, R.color.colorPrimary)) supportActionBar?.setBackgroundDrawable(ColorDrawable(actionBarColor)) setWebViewSettings() - binding.activityWebViewSwipe.setOnRefreshListener { binding.webView.reload() } - binding.activityWebViewProgress.indeterminateDrawable.setColorFilter(actionBarColor, PorterDuff.Mode.SRC_IN) - binding.activityWebViewProgress.max = 100 + with(binding) { + activityWebViewSwipe.setOnRefreshListener { binding.webView.reload() } + activityWebViewProgress.progressTintList = ColorStateList.valueOf(actionBarColor) + activityWebViewProgress.max = 100 + + val url: String = intent.getStringExtra(ReadropsKeys.WEB_URL)!! + webView.loadUrl(url) + } - val url: String = intent.getStringExtra(WEB_URL) - binding.webView.loadUrl(url) } @SuppressLint("SetJavaScriptEnabled") @@ -56,9 +61,11 @@ class WebViewActivity : AppCompatActivity() { } override fun onPageStarted(view: WebView?, url: String?, favicon: Bitmap?) { - binding.activityWebViewSwipe.isRefreshing = false - binding.activityWebViewProgress.progress = 0 - binding.activityWebViewProgress.visibility = View.VISIBLE + with(binding) { + activityWebViewSwipe.isRefreshing = false + activityWebViewProgress.progress = 0 + activityWebViewProgress.visibility = View.VISIBLE + } super.onPageStarted(view, url, favicon) } @@ -73,9 +80,11 @@ class WebViewActivity : AppCompatActivity() { } override fun onProgressChanged(view: WebView?, newProgress: Int) { - binding.activityWebViewProgress.progress = newProgress - if (newProgress == 100) - binding.activityWebViewProgress.visibility = View.GONE + with(binding) { + activityWebViewProgress.progress = newProgress + if (newProgress == 100) activityWebViewProgress.visibility = View.GONE + } + super.onProgressChanged(view, newProgress) } @@ -106,13 +115,15 @@ class WebViewActivity : AppCompatActivity() { } } - return super.onOptionsItemSelected(item) + return super.onOptionsItemSelected(item!!) } private fun shareLink() { - val intent = Intent(Intent.ACTION_SEND) - intent.type = "text/plain" - intent.putExtra(Intent.EXTRA_TEXT, binding.webView.url.toString()) + val intent = Intent(Intent.ACTION_SEND).apply { + type = "text/plain" + putExtra(Intent.EXTRA_TEXT, binding.webView.url.toString()) + } + startActivity(Intent.createChooser(intent, getString(R.string.share_url))) } diff --git a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java b/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java index 4bd3c810..b13de9f4 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/AccountArrayAdapter.java @@ -20,11 +20,8 @@ public class AccountArrayAdapter extends ArrayAdapter { public AccountArrayAdapter(@NonNull Context context, @NonNull List objects) { super(context, 0, objects); - } - - @Override public View getDropDownView(int position, @Nullable View convertView, @NonNull ViewGroup parent) { return createItemView(position, convertView, parent); @@ -46,8 +43,8 @@ public class AccountArrayAdapter extends ArrayAdapter { ImageView accountIcon = convertView.findViewById(R.id.account_type_logo); TextView accountName = convertView.findViewById(R.id.account_type_name); - accountIcon.setImageResource(account.getAccountType().getIconRes()); - accountName.setText(account.getAccountType().getName()); + accountIcon.setImageResource(account.getAccountType().getIconRes()); + accountName.setText(account.getAccountType().getName()); return convertView; } diff --git a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java b/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java index 83d61c3f..3faac014 100644 --- a/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java +++ b/app/src/main/java/com/readrops/app/adapters/AccountTypeListAdapter.java @@ -4,12 +4,10 @@ import android.view.LayoutInflater; import android.view.ViewGroup; import androidx.annotation.NonNull; -import androidx.databinding.DataBindingUtil; import androidx.recyclerview.widget.RecyclerView; -import com.readrops.app.R; -import com.readrops.readropsdb.entities.account.AccountType; import com.readrops.app.databinding.AccountTypeItemBinding; +import com.readrops.readropsdb.entities.account.AccountType; import java.util.List; @@ -25,8 +23,8 @@ public class AccountTypeListAdapter extends RecyclerView.Adapter(DIFF_CALLBACK) { override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): NotificationPermissionViewHolder { - val binding = DataBindingUtil.inflate(LayoutInflater.from(parent.context), - R.layout.notification_permission_layout, parent, false) + val binding = NotificationPermissionLayoutBinding.inflate(LayoutInflater.from(parent.context)) return NotificationPermissionViewHolder(binding) } diff --git a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt index 2dfd66f5..eb8b08bb 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/fragments/FeedOptionsDialogFragment.kt @@ -6,19 +6,19 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.readrops.app.R -import com.readrops.readropsdb.entities.account.Account -import com.readrops.readropsdb.pojo.FeedWithFolder import com.readrops.app.databinding.FeedOptionsLayoutBinding import com.readrops.app.utils.ReadropsKeys.ACCOUNT +import com.readrops.readropsdb.entities.account.Account +import com.readrops.readropsdb.pojo.FeedWithFolder class FeedOptionsDialogFragment : BottomSheetDialogFragment() { private lateinit var feedWithFolder: FeedWithFolder private lateinit var account: Account - private lateinit var binding: FeedOptionsLayoutBinding + + private var _binding: FeedOptionsLayoutBinding? = null + private val binding get() = _binding!! companion object { const val FEED_KEY = "FEED_KEY" @@ -43,7 +43,7 @@ class FeedOptionsDialogFragment : BottomSheetDialogFragment() { } override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - binding = DataBindingUtil.inflate(inflater, R.layout.feed_options_layout, container, false) + _binding = FeedOptionsLayoutBinding.inflate(inflater, container, false) return binding.root } @@ -58,6 +58,11 @@ class FeedOptionsDialogFragment : BottomSheetDialogFragment() { binding.feedOptionsDeleteLayout.setOnClickListener { deleteFeed() } } + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + private fun openEditFeedDialog() { dismiss() val editFeedDialogFragment = EditFeedDialogFragment.newInstance(feedWithFolder, account) diff --git a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java index f10bfe52..394f4ffb 100644 --- a/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FeedsFragment.java @@ -16,13 +16,13 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.afollestad.materialdialogs.MaterialDialog; import com.readrops.app.R; import com.readrops.app.adapters.FeedsAdapter; -import com.readrops.readropsdb.entities.Feed; -import com.readrops.readropsdb.entities.account.Account; -import com.readrops.readropsdb.pojo.FeedWithFolder; import com.readrops.app.databinding.FragmentFeedsBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; +import com.readrops.readropsdb.entities.Feed; +import com.readrops.readropsdb.entities.account.Account; +import com.readrops.readropsdb.pojo.FeedWithFolder; import io.reactivex.android.schedulers.AndroidSchedulers; import io.reactivex.observers.DisposableCompletableObserver; @@ -81,7 +81,7 @@ public class FeedsFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = FragmentFeedsBinding.inflate(inflater); + binding = FragmentFeedsBinding.inflate(inflater, container, false); return binding.getRoot(); } @@ -107,6 +107,12 @@ public class FeedsFragment extends Fragment { binding.feedsRecyclerview.setAdapter(adapter); } + @Override + public void onDestroyView() { + super.onDestroyView(); + binding = null; + } + public void deleteFeed(Feed feed) { new MaterialDialog.Builder(getContext()) .title(R.string.delete_feed) diff --git a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt b/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt index 9166a40a..9b0f783b 100644 --- a/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt +++ b/app/src/main/java/com/readrops/app/fragments/FolderOptionsDialogFragment.kt @@ -4,16 +4,51 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import androidx.databinding.DataBindingUtil import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.readrops.app.R -import com.readrops.readropsdb.entities.Folder import com.readrops.app.databinding.FolderOptionsLayoutBinding +import com.readrops.readropsdb.entities.Folder class FolderOptionsDialogFragment : BottomSheetDialogFragment() { private lateinit var folder: Folder - private lateinit var foldersOptionsLayoutBinding: FolderOptionsLayoutBinding + + private var _binding: FolderOptionsLayoutBinding? = null + private val binding get() = _binding!! + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + folder = arguments?.getParcelable(FOLDER_KEY)!! + } + + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { + _binding = FolderOptionsLayoutBinding.inflate(inflater, container, false) + + return binding.root + } + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + + binding.folderOptionsTitle.text = folder.name + binding.folderOptionsEdit.setOnClickListener { openEditFolderDialog() } + binding.folderOptionsDelete.setOnClickListener { deleteFolder() } + } + + override fun onDestroyView() { + super.onDestroyView() + _binding = null + } + + private fun openEditFolderDialog() { + dismiss() + (parentFragment as FoldersFragment).editFolder(folder) + } + + private fun deleteFolder() { + dismiss() + (parentFragment as FoldersFragment).deleteFolder(folder) + } companion object { const val FOLDER_KEY = "FOLDER_KEY" @@ -28,34 +63,4 @@ class FolderOptionsDialogFragment : BottomSheetDialogFragment() { return fragment } } - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - - folder = arguments?.getParcelable(FOLDER_KEY)!! - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? { - foldersOptionsLayoutBinding = DataBindingUtil.inflate(inflater, R.layout.folder_options_layout, container, false) - - return foldersOptionsLayoutBinding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - - foldersOptionsLayoutBinding.folderOptionsTitle.text = folder.name - foldersOptionsLayoutBinding.folderOptionsEdit.setOnClickListener { openEditFolderDialog() } - foldersOptionsLayoutBinding.folderOptionsDelete.setOnClickListener { deleteFolder() } - } - - private fun openEditFolderDialog() { - dismiss() - (parentFragment as FoldersFragment).editFolder(folder) - } - - private fun deleteFolder() { - dismiss() - (parentFragment as FoldersFragment).deleteFolder(folder) - } } \ No newline at end of file diff --git a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java index c4c6083f..d13eaa31 100644 --- a/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java +++ b/app/src/main/java/com/readrops/app/fragments/FoldersFragment.java @@ -9,7 +9,6 @@ import android.view.ViewGroup; import androidx.annotation.NonNull; import androidx.annotation.Nullable; -import androidx.databinding.DataBindingUtil; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProviders; import androidx.recyclerview.widget.LinearLayoutManager; @@ -17,12 +16,12 @@ import androidx.recyclerview.widget.LinearLayoutManager; import com.afollestad.materialdialogs.MaterialDialog; import com.readrops.app.R; import com.readrops.app.adapters.FoldersAdapter; -import com.readrops.readropsdb.entities.Folder; -import com.readrops.readropsdb.entities.account.Account; import com.readrops.app.databinding.FragmentFoldersBinding; import com.readrops.app.utils.SharedPreferencesManager; import com.readrops.app.utils.Utils; import com.readrops.app.viewmodels.ManageFeedsFoldersViewModel; +import com.readrops.readropsdb.entities.Folder; +import com.readrops.readropsdb.entities.account.Account; import com.readrops.readropslibrary.utils.ConflictException; import com.readrops.readropslibrary.utils.UnknownFormatException; @@ -101,7 +100,7 @@ public class FoldersFragment extends Fragment { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - binding = DataBindingUtil.inflate(inflater, R.layout.fragment_folders, container, false); + binding = FragmentFoldersBinding.inflate(inflater, container, false); return binding.getRoot(); } diff --git a/app/src/main/res/layout/account_type_item.xml b/app/src/main/res/layout/account_type_item.xml index bb50dcf0..be5446c3 100644 --- a/app/src/main/res/layout/account_type_item.xml +++ b/app/src/main/res/layout/account_type_item.xml @@ -1,30 +1,28 @@ - - + + + + + android:layout_centerInParent="true" + android:layout_marginStart="12dp" + android:layout_toEndOf="@id/account_type_logo" + tools:text="@string/nextcloud_news" /> - + - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_type_list.xml b/app/src/main/res/layout/activity_account_type_list.xml index 8e89d32b..32d7fb03 100644 --- a/app/src/main/res/layout/activity_account_type_list.xml +++ b/app/src/main/res/layout/activity_account_type_list.xml @@ -1,81 +1,79 @@ - - - + + + + + android:layout_height="wrap_content" + android:layout_marginStart="80dp" + android:layout_marginTop="8dp" + android:layout_marginEnd="80dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@+id/account_type_list_choose" + tools:itemCount="4" + tools:listitem="@layout/account_type_item" /> - + - +