sem/Next-Location
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

Compare commits

base: sem:imperial-system
Branches Tags
sem:main sem:develop sem:ButtonFix sem:CosmeticFixes sem:routeFragmentDetail sem:Locaitegezeik sem:fuckcolours sem:saveDataMA8 sem:geofence sem:imperial-system sem:languages sem:follow-route sem:route_detail sem:helpPopup sem:Tests sem:RecyclerView sem:display-route sem:couponPopup sem:directions-api sem:LocationCreation sem:Fragment sem:data sem:bottomNavigation
sem:v2.0 sem:v1.2 sem:v1.1 sem:v1.0
..
compare: sem:v1.1
Branches Tags
sem:main sem:develop sem:ButtonFix sem:CosmeticFixes sem:routeFragmentDetail sem:Locaitegezeik sem:fuckcolours sem:saveDataMA8 sem:geofence sem:imperial-system sem:languages sem:follow-route sem:route_detail sem:helpPopup sem:Tests sem:RecyclerView sem:display-route sem:couponPopup sem:directions-api sem:LocationCreation sem:Fragment sem:data sem:bottomNavigation
sem:v2.0 sem:v1.2 sem:v1.1 sem:v1.0

5 Commits
imperial-s ... v1.1

Author SHA1 Message Date
SemvdH
6eeb0870fc Merge pull request #3 from SemvdH/develop 
Develop
 2021-01-07 11:21:59 +01:00
Sem van der Hoeven
20431d019b Merge branch 'develop' of https://github.com/SemvdH/Next-Location into develop 2021-01-07 11:20:58 +01:00
Sem van der Hoeven
7e99070002 added ok button to help popup 2021-01-07 11:20:48 +01:00
SemvdH
452bc00848 Merge pull request #1 from SemvdH/develop 
Merge develop into master
 2021-01-06 23:20:50 +01:00
SemvdH
056c679442 Merge pull request #2 from SemvdH/imperial-system 
merge imperial into dev
 2021-01-06 23:20:26 +01:00
2 changed files with 12 additions and 0 deletions
Expand all files Collapse all files

3
app/src/main/java/com/a1/nextlocation/fragments/HelpPopup.java
View File

@@ -4,6 +4,7 @@ import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import androidx.fragment.app.DialogFragment;
@@ -15,6 +16,8 @@ public class HelpPopup extends DialogFragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View rootView = inflater.inflate(R.layout.help_popup, container, false);
getDialog().setTitle("Simple Dialog");
Button okButton = rootView.findViewById(R.id.help_ok_button);
okButton.setOnClickListener(v -> dismiss());
return rootView;
}
}

9
app/src/main/res/layout/help_popup.xml
View File

@@ -44,6 +44,15 @@
</ScrollView>
<Button
android:id="@+id/help_ok_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:text="ok"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/helpPopTitle" />