Merge branch 'master' into feature/add_your_inst

# Conflicts: # Houseclub/build.gradle # Houseclub/src/main/java/me/grishka/houseclub/fragments/ProfileFragment.java # Houseclub/src/main/res/layout/profile.xml
00xkhaled · 00xkhaled · Mar 3, 2021 · Feb 22, 2021 · Feb 22, 2021 · Feb 23, 2021
commit 00ddaebeeba6f20e22063a670095a1db85a33c7a
diff --git a/Houseclub/build.gradle b/Houseclub/build.gradle
@@ -7,8 +7,8 @@ android {
 		applicationId "me.grishka.houseclub"
 		minSdkVersion 24
 		targetSdkVersion 30
-		versionCode 8
-		versionName "1.0.7"
+		versionCode 9
+		versionName "1.0.8"
 
 		Properties properties = new Properties()
 		if (project.rootProject.file('local.properties').canRead()) {

diff --git a/Houseclub/src/main/java/me/grishka/houseclub/fragments/ProfileFragment.java b/Houseclub/src/main/java/me/grishka/houseclub/fragments/ProfileFragment.java
@@ -63,8 +63,9 @@ public class ProfileFragment extends LoaderFragment{
 	private TextView name, username, followers, following, followsYou, bio, inviteInfo, twitter, instagram,
 			invites;
 	private ImageView photo, inviterPhoto;
-	private Button followBtn;
-	private View socialButtons;
+	private Button followBtn, inviteButton;
+	private EditText invitePhoneNum;
+	private View socialButtons, inviteLayout;
 	private WebView webView;
 	private boolean self;
 
@@ -94,6 +95,10 @@ public View onCreateContentView(LayoutInflater inflater, ViewGroup container, Bu
 		twitter=v.findViewById(R.id.twitter);
 		instagram=v.findViewById(R.id.instagram);
 		socialButtons=v.findViewById(R.id.social);
+		inviteLayout = v.findViewById(R.id.invite_layout);
+		inviteButton = v.findViewById(R.id.invite_button);
+		invites = v.findViewById(R.id.num_of_invites);
+		invitePhoneNum = v.findViewById(R.id.invite_phone_num);
 		webView=v.findViewById(R.id.webView);
 
 		followBtn.setOnClickListener(this::onFollowClick);

diff --git a/Houseclub/src/main/res/layout/profile.xml b/Houseclub/src/main/res/layout/profile.xml
@@ -159,6 +159,39 @@
 				tools:text="Joined 1/2/3\nNominated by whomever"/>
 
 		</LinearLayout>
+
+		<LinearLayout
+			android:id="@+id/invite_layout"
+			android:layout_width="match_parent"
+			android:layout_height="wrap_content"
+			android:orientation="vertical"
+			android:paddingTop="16dp"
+			android:visibility="gone"
+			tools:visibility="visible">
+
+			<TextView
+				android:id="@+id/num_of_invites"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				tools:text="You have 3 invites" />
+
+			<EditText
+				android:id="@+id/invite_phone_num"
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:hint="@string/invite_phone_hint"
+				android:importantForAutofill="no"
+				android:inputType="phone" />
+
+			<Button
+				android:id="@+id/invite_button"
+				android:layout_width="wrap_content"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center_horizontal"
+				android:text="@string/invite_button_label" />
+
+		</LinearLayout>
+
 	</LinearLayout>
 
 </ScrollView>