Skip to content

Commit 1172e69

Browse files
jonathankleejonathanklee
authored
Merge pull request #27 from jonathanklee/suggest-share-eval
Suggest the user to share evalution
2 parents e98c752 + c7e78cc commit 1172e69

File tree

8 files changed

+55
-18
lines changed

8 files changed

+55
-18
lines changed

‎app/src/main/java/com/klee/sapio/ui/view/ChooseAppFragment.kt‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,11 @@ class ChooseAppFragment : Fragment() {
6666
}
6767

6868
private fun onNextButtonClicked() {
69-
val bundle = bundleOf("package" to mApp?.packageName)
69+
val bundle = bundleOf(
70+
"package" to mApp?.packageName,
71+
"name" to mApp?.name
72+
)
73+
7074
findNavController().navigate(R.id.action_chooseAppFragment_to_evaluateFragment, bundle)
7175
}
7276

‎app/src/main/java/com/klee/sapio/ui/view/EvaluateFragment.kt‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import android.view.ViewGroup
88
import android.widget.RadioButton
99
import android.widget.Toast
1010
import androidx.annotation.RequiresApi
11+
import androidx.core.os.bundleOf
1112
import androidx.fragment.app.Fragment
1213
import androidx.navigation.fragment.findNavController
1314
import com.klee.sapio.R
@@ -35,6 +36,7 @@ class EvaluateFragment : Fragment() {
3536
@Inject lateinit var mDeviceConfiguration: DeviceConfiguration
3637
private lateinit var mBinding: FragmentEvaluateBinding
3738
private lateinit var mPackageName: String
39+
private lateinit var mAppName: String
3840

3941
@RequiresApi(Build.VERSION_CODES.M)
4042
override fun onCreateView(
@@ -52,7 +54,8 @@ class EvaluateFragment : Fragment() {
5254
mBinding.rootConfiguration.text = isRootedLabel.text
5355
mBinding.rootConfiguration.setBackgroundColor(isRootedLabel.color)
5456

55-
mPackageName = arguments?.getString("package")!!
57+
mPackageName = arguments?.getString("package").orEmpty()
58+
mAppName = arguments?.getString("name").orEmpty()
5659
mBinding.validateButton.isEnabled = false
5760
mBinding.note.setOnCheckedChangeListener { _, value ->
5861
mBinding.validateButton.isEnabled = value != -1
@@ -85,7 +88,12 @@ class EvaluateFragment : Fragment() {
8588
}
8689

8790
private fun onUploadSuccess() {
88-
findNavController().navigate(R.id.action_evaluateFragment_to_successFragment)
91+
val bundle = bundleOf(
92+
"package" to mPackageName,
93+
"name" to mAppName
94+
)
95+
96+
findNavController().navigate(R.id.action_evaluateFragment_to_successFragment, bundle)
8997
}
9098

9199
private fun onUploadError() {

‎app/src/main/java/com/klee/sapio/ui/view/EvaluationsActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ class EvaluationsActivity : AppCompatActivity() {
150150
putExtra(Intent.EXTRA_STREAM, imageUri)
151151
putExtra(
152152
Intent.EXTRA_TEXT,
153-
"$appName Android Compatibility Matrix https://github.com/jonathanklee/Sapio"
153+
"$appName Android Compatibility Matrix https://github.com/jonathanklee/Sapio #sapio"
154154
)
155155
}
156156

‎app/src/main/java/com/klee/sapio/ui/view/SuccessFragment.kt‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,37 @@
11
package com.klee.sapio.ui.view
22

3+
import android.content.Intent
34
import android.os.Bundle
45
import android.view.LayoutInflater
56
import android.view.View
67
import android.view.ViewGroup
78
import androidx.fragment.app.Fragment
8-
import androidx.navigation.fragment.findNavController
9-
import com.klee.sapio.R
109
import com.klee.sapio.databinding.FragmentSuccessBinding
1110

1211
class SuccessFragment : Fragment() {
1312

1413
private lateinit var mBinding: FragmentSuccessBinding
1514

15+
companion object {
16+
const val EXTRA_PACKAGE_NAME = "packageName"
17+
const val EXTRA_APP_NAME = "appName"
18+
}
19+
1620
override fun onCreateView(
1721
inflater: LayoutInflater,
1822
container: ViewGroup?,
1923
savedInstanceState: Bundle?
20-
): View? {
24+
): View {
25+
val packageName = arguments?.getString("package").orEmpty()
26+
val appName = arguments?.getString("name").orEmpty()
27+
2128
mBinding = FragmentSuccessBinding.inflate(inflater, container, false)
2229
mBinding.emoji.text = "\uD83C\uDF89 \uD83E\uDD73"
23-
mBinding.evaludateAnotherAppButton.setOnClickListener {
24-
findNavController().navigate(R.id.action_successFragment_to_warningFragment)
30+
mBinding.shareEvaluation.setOnClickListener {
31+
val intent = Intent(requireContext(), EvaluationsActivity::class.java)
32+
intent.putExtra(EXTRA_PACKAGE_NAME, packageName)
33+
intent.putExtra(EXTRA_APP_NAME, appName)
34+
requireContext().startActivity(intent)
2535
}
2636

2737
return mBinding.root

‎app/src/main/res/layout/fragment_success.xml‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,26 @@
3333
app:layout_constraintTop_toTopOf="parent" />
3434

3535
<Button
36-
android:id="@+id/evaludateAnotherAppButton"
36+
android:id="@+id/shareEvaluation"
37+
style="@style/Theme.Sapio.Button"
3738
android:layout_width="wrap_content"
3839
android:layout_height="wrap_content"
39-
android:text="@string/evaluate_another_app"
4040
android:layout_margin="20dp"
41-
style="@style/Theme.Sapio.Button"
41+
android:text="@string/share"
4242
app:layout_constraintBottom_toBottomOf="parent"
4343
app:layout_constraintEnd_toEndOf="parent"
44-
app:layout_constraintStart_toStartOf="parent" />
44+
app:layout_constraintStart_toStartOf="parent"/>
45+
46+
<TextView
47+
android:id="@+id/shareText"
48+
android:layout_width="match_parent"
49+
android:layout_height="wrap_content"
50+
android:text="@string/share_text"
51+
android:layout_margin="20dp"
52+
android:gravity="center"
53+
app:layout_constraintBottom_toTopOf="@+id/shareEvaluation"
54+
app:layout_constraintEnd_toEndOf="parent"
55+
app:layout_constraintStart_toStartOf="parent"
56+
app:layout_constraintTop_toBottomOf="@+id/appEvaluatedText" />
4557

4658
</androidx.constraintlayout.widget.ConstraintLayout>

‎app/src/main/res/navigation/nav_graph.xml‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,11 @@
4141
android:id="@+id/successFragment"
4242
android:name="com.klee.sapio.ui.view.SuccessFragment"
4343
android:label="SuccessFragment" >
44-
<action
45-
android:id="@+id/action_successFragment_to_warningFragment"
46-
app:destination="@id/warningFragment" />
44+
<argument
45+
android:name="package"
46+
app:argType="string" />
47+
<argument
48+
android:name="name"
49+
app:argType="string" />
4750
</fragment>
4851
</navigation>

‎app/src/main/res/values-fr/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<string name="upload_error">Erreur lors de l\'évaluation</string>
1515
<string name="about_text">Sapio est l\'anagramme d\'Open Source API.\n\nSapio fournit la matrice de compatibilité d\'une application Android avec les téléphones fonctionnant sur un Android Open Source Project (AOSP) déGooglisé, associés ou non à microG.\n\nSapio peut être utilisé comme un outil de lobbying en partageant les matrices de compatibilité sur les réseaux sociaux pour sensibiliser les développeurs d\'applications aux données personnelles des utilisateurs.\n\nLes évaluations de Sapio sont fournies à la communauté par la communauté.</string>
1616
<string name="credits">Icone cerveau créé par Freepik - Flaticon</string>
17-
<string name="evaluate_another_app">Evaluer une autre application</string>
1817
<string name="configuration_detected">Configuration détéctée</string>
1918
<string name="look_for_an_application">Rechercher une application</string>
2019
<string name="updated_on">Mis à jour le %1$s</string>
@@ -39,4 +38,5 @@
3938
<string name="share">Partager</string>
4039
<string name="rating_rules"><![CDATA[<a href="%1$s">Règles d\'évaluation</a>]]></string>
4140
<string name="i_have_read_and_i_understand_the_rating_rules">J\'ai lu et je comprends les règles d\'évaluation</string>
41+
<string name="share_text">N\'hésitez pas à partager votre évaluation sur les réseaux sociaux pour sensibiliser les développeurs au respect des données personnelles.</string>
4242
</resources>

‎app/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
<string name="upload_error">Error evaluating app</string>
2020
<string name="about_text">Sapio is the anagram of Open Source API.\n\nSapio provides the compatibility matrix of an Android application with deGoogled bare Android Open Source Project (AOSP) devices, coupled or not with microG.\n\nSapio can serve as a lobbying tool by sharing compatibility matrices on social media to raise awareness among app developers about respecting users\' personal data.\n\nEvaluations in Sapio are given to the community by the community.</string>
2121
<string name="credits">Brain icons created by Freepik - Flaticon</string>
22-
<string name="evaluate_another_app">Evaluate another app</string>
2322
<string name="configuration_detected">Configuration detected</string>
2423
<string name="look_for_an_application">Look for an application</string>
2524
<string name="updated_on">Updated on %1$s</string>
@@ -41,6 +40,7 @@
4140
<string name="bad">Does not work at all</string>
4241
<string name="unknown">Unknown</string>
4342
<string name="share">Share</string>
43+
<string name="share_text">Feel free to share your evaluation on social media to raise awareness among app developers about respecting users\' personal data.</string>
4444
<string name="donate">Donate</string>
4545
<string name="rating_rules"><![CDATA[<a href="%1$s">Rating rules</a>]]></string>
4646
<string name="i_have_read_and_i_understand_the_rating_rules">I have read and I understand the rating rules</string>

0 commit comments

Comments
 (0)