From da842396556248654acacfdebbc01f5e20132eb6 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Fri, 14 May 2021 21:20:57 +0530 Subject: Extract toolbar implementation and add back navigation support --- app/src/main/res/layout/fragment_dashboard.xml | 9 +------ app/src/main/res/layout/fragment_fake_location.xml | 23 +----------------- .../layout/fragment_internet_activity_policy.xml | 9 +------ .../main/res/layout/fragment_permission_apps.xml | 9 +------ app/src/main/res/layout/fragment_permissions.xml | 9 +------ .../main/res/layout/fragment_quick_protection.xml | 10 +------- app/src/main/res/layout/toolbar.xml | 28 ++++++++++++++++++++++ 7 files changed, 34 insertions(+), 63 deletions(-) create mode 100644 app/src/main/res/layout/toolbar.xml (limited to 'app/src/main/res') diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 663c270..027945d 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -6,14 +6,7 @@ android:layout_height="match_parent" > - + - + - - - + - + - + - - + + + + + \ No newline at end of file -- cgit v1.2.3 From 47194484d7c2ca6ce8103312b9dbfb1244e8c4e6 Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Sat, 15 May 2021 01:18:21 +0530 Subject: Use MaterialToolbar from MDC instead of android Toolbar --- .../privacycentralapp/common/NavToolbarFragment.kt | 4 +-- .../e/privacycentralapp/common/ToolbarFragment.kt | 5 +-- app/src/main/res/layout/fragment_dashboard.xml | 8 ++--- app/src/main/res/layout/fragment_fake_location.xml | 10 +++--- .../layout/fragment_internet_activity_policy.xml | 8 ++--- .../main/res/layout/fragment_permission_apps.xml | 7 ++-- app/src/main/res/layout/fragment_permissions.xml | 7 ++-- .../main/res/layout/fragment_quick_protection.xml | 7 ++-- app/src/main/res/layout/toolbar.xml | 28 ---------------- app/src/main/res/layout/topbar.xml | 37 ++++++++++++++++++++++ 10 files changed, 64 insertions(+), 57 deletions(-) delete mode 100644 app/src/main/res/layout/toolbar.xml create mode 100644 app/src/main/res/layout/topbar.xml (limited to 'app/src/main/res') diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt index 0a9d102..52197cd 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/common/NavToolbarFragment.kt @@ -17,12 +17,12 @@ package foundation.e.privacycentralapp.common -import android.widget.Toolbar import androidx.annotation.LayoutRes +import com.google.android.material.appbar.MaterialToolbar abstract class NavToolbarFragment(@LayoutRes contentLayoutId: Int) : ToolbarFragment(contentLayoutId) { - override fun setupToolbar(toolbar: Toolbar) { + override fun setupToolbar(toolbar: MaterialToolbar) { super.setupToolbar(toolbar) toolbar.apply { setNavigationIcon(lineageos.platform.R.drawable.ic_back) diff --git a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt index c316340..f156e09 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/common/ToolbarFragment.kt @@ -19,9 +19,9 @@ package foundation.e.privacycentralapp.common import android.os.Bundle import android.view.View -import android.widget.Toolbar import androidx.annotation.LayoutRes import androidx.fragment.app.Fragment +import com.google.android.material.appbar.MaterialToolbar import foundation.e.privacycentralapp.R abstract class ToolbarFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId) { @@ -33,10 +33,11 @@ abstract class ToolbarFragment(@LayoutRes contentLayoutId: Int) : Fragment(conte override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) + setupToolbar(view.findViewById(R.id.toolbar)) } - open fun setupToolbar(toolbar: Toolbar) { + open fun setupToolbar(toolbar: MaterialToolbar) { toolbar.title = getTitle() } } diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 027945d..dc79878 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -1,12 +1,12 @@ - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_fake_location.xml b/app/src/main/res/layout/fragment_fake_location.xml index de62537..40324a1 100644 --- a/app/src/main/res/layout/fragment_fake_location.xml +++ b/app/src/main/res/layout/fragment_fake_location.xml @@ -1,5 +1,5 @@ - - + @@ -131,4 +131,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_internet_activity_policy.xml b/app/src/main/res/layout/fragment_internet_activity_policy.xml index 66ff2b4..7a5d8b5 100644 --- a/app/src/main/res/layout/fragment_internet_activity_policy.xml +++ b/app/src/main/res/layout/fragment_internet_activity_policy.xml @@ -1,5 +1,5 @@ - - + - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_permission_apps.xml b/app/src/main/res/layout/fragment_permission_apps.xml index 605b6ff..65f4169 100644 --- a/app/src/main/res/layout/fragment_permission_apps.xml +++ b/app/src/main/res/layout/fragment_permission_apps.xml @@ -1,5 +1,5 @@ - - + @@ -36,4 +35,4 @@ tools:listitem="@layout/item_permission_apps" android:id="@+id/recylcer_view_permission_apps"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_permissions.xml b/app/src/main/res/layout/fragment_permissions.xml index 72748b4..a452570 100644 --- a/app/src/main/res/layout/fragment_permissions.xml +++ b/app/src/main/res/layout/fragment_permissions.xml @@ -1,5 +1,5 @@ - - + @@ -47,4 +46,4 @@ tools:listitem="@layout/item_permission" android:id="@+id/recylcer_view_permissions"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_quick_protection.xml b/app/src/main/res/layout/fragment_quick_protection.xml index 55d6f71..d57a101 100644 --- a/app/src/main/res/layout/fragment_quick_protection.xml +++ b/app/src/main/res/layout/fragment_quick_protection.xml @@ -1,18 +1,17 @@ - - + @@ -57,4 +56,4 @@ android:textSize="14sp" android:fontFamily="sans-serif-medium" android:layout_gravity="bottom|right"/> - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/toolbar.xml b/app/src/main/res/layout/toolbar.xml deleted file mode 100644 index 29c1fa1..0000000 --- a/app/src/main/res/layout/toolbar.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/topbar.xml b/app/src/main/res/layout/topbar.xml new file mode 100644 index 0000000..9142d79 --- /dev/null +++ b/app/src/main/res/layout/topbar.xml @@ -0,0 +1,37 @@ + + + + + + + + -- cgit v1.2.3 From fafd978342abb8332fcf3ed45cdc3b7d437576ba Mon Sep 17 00:00:00 2001 From: Amit Kumar Date: Mon, 17 May 2021 17:02:35 +0530 Subject: Use string resources for titles --- .../e/privacycentralapp/features/dashboard/DashboardFragment.kt | 4 ++-- .../privacycentralapp/features/dashboard/QuickProtectionFragment.kt | 2 +- .../features/internetprivacy/InternetPrivacyFragment.kt | 2 +- .../e/privacycentralapp/features/location/FakeLocationFragment.kt | 5 +---- .../privacycentralapp/features/permissions/PermissionAppsFragment.kt | 2 +- .../e/privacycentralapp/features/permissions/PermissionsFragment.kt | 2 +- app/src/main/res/values/strings.xml | 5 +++++ 7 files changed, 12 insertions(+), 10 deletions(-) (limited to 'app/src/main/res') diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt index 4164fea..c57e6cc 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/DashboardFragment.kt @@ -113,10 +113,10 @@ class DashboardFragment : } } - override fun getTitle(): String = "My Privacy Dashboard" + override fun getTitle(): String = getString(R.string.privacy_dashboard) private fun addClickToMore(textView: TextView) { - val clickToMore = SpannableString("Click to learn more") + val clickToMore = SpannableString(getString(R.string.click_to_learn_more)) clickToMore.setSpan( ForegroundColorSpan(Color.parseColor("#007fff")), 0, diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/QuickProtectionFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/QuickProtectionFragment.kt index 442cfd2..727afa9 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/QuickProtectionFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/dashboard/QuickProtectionFragment.kt @@ -27,7 +27,7 @@ class QuickProtectionFragment : NavToolbarFragment(R.layout.fragment_quick_prote private val viewModel: DashboardViewModel by activityViewModels() - override fun getTitle(): String = "Quick protection" + override fun getTitle(): String = getString(R.string.quick_protection) override fun onAttach(context: Context) { super.onAttach(context) diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt index 1844129..5baae81 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/internetprivacy/InternetPrivacyFragment.kt @@ -65,7 +65,7 @@ class InternetPrivacyFragment : bindClickListeners(view) } - override fun getTitle(): String = "My Internet Activity Privacy" + override fun getTitle(): String = getString(R.string.internet_activity_privacy) private fun bindClickListeners(fragmentView: View) { fragmentView.let { diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt index 2d174f0..7281afc 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/location/FakeLocationFragment.kt @@ -178,9 +178,7 @@ class FakeLocationFragment : Mapbox.getInstance(requireContext(), getString(R.string.mapbox_key)) } - override fun getTitle(): String { - return getString(R.string.my_location_title) - } + override fun getTitle(): String = getString(R.string.my_location_title) private fun displayToast(message: String) { Toast.makeText(requireContext(), message, Toast.LENGTH_SHORT) @@ -315,7 +313,6 @@ class FakeLocationFragment : } override fun render(state: FakeLocationFeature.State) { - Log.d("FakeMyLocation", "State: $state") latEditText.text = Editable.Factory.getInstance().newEditable(state.location.latitude.toString()) longEditText.text = diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsFragment.kt index 374a430..72d8b0c 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionAppsFragment.kt @@ -64,7 +64,7 @@ class PermissionAppsFragment : .show() } - override fun getTitle(): String = "My Apps Permission" + override fun getTitle(): String = getString(R.string.apps_permissions) override fun render(state: PermissionsFeature.State) { state.currentPermission?.let { permission -> diff --git a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionsFragment.kt b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionsFragment.kt index 0b03343..be84e31 100644 --- a/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionsFragment.kt +++ b/app/src/main/java/foundation/e/privacycentralapp/features/permissions/PermissionsFragment.kt @@ -51,7 +51,7 @@ class PermissionsFragment : super.onViewCreated(view, savedInstanceState) } - override fun getTitle(): String = "My Apps Permission" + override fun getTitle(): String = getString(R.string.apps_permissions) override fun render(state: PermissionsFeature.State) { view?.findViewById(R.id.recylcer_view_permissions)?.apply { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8fc7c92..fd24223 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,6 +9,7 @@ %1$d apps are requesting %2$d permissions My Location "%1$d apps are using location permission\nCurrent location mode: " + Internet Activity Privacy My Internet Activity Privacy "Current internet activity mode: " Quick protection enables these settings when turned on @@ -38,4 +39,8 @@ This app needs location permissions in order to show its functionality. You didn\'t grant location permission Please enter valid latitude and longitude value + Quick Protection + Privacy Dashboard + Click to learn more + \"Apps Permission\" \ No newline at end of file -- cgit v1.2.3