Skip to content

Commit

Permalink
floating action button error solved
Browse files Browse the repository at this point in the history
  • Loading branch information
@satyamsharma17
satyamsharma17 committed Jun 4, 2022
1 parent e9a51c5 commit 64e890d
Show file tree
Hide file tree
Showing 5 changed files with 148 additions and 41 deletions.
4 changes: 3 additions & 1 deletion .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion app/src/main/java/com/inertia/guardian/Activity/Report.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ import com.google.firebase.storage.StorageReference
import com.inertia.guardian.MainActivity
import com.inertia.guardian.NavActivity.About
import com.inertia.guardian.NavActivity.Developer
import com.inertia.guardian.NavActivity.OurStory
import com.inertia.guardian.NavActivity.PrivacyPolicy
import com.inertia.guardian.R
import java.io.File
Expand Down Expand Up @@ -440,7 +441,7 @@ class Report : AppCompatActivity(), NavigationView.OnNavigationItemSelectedListe
shareit()
}
R.id.nav_story -> {
val i = Intent(this, Developer::class.java)
val i = Intent(this, OurStory::class.java)
i.putExtra("story", story)
startActivity(i)
}
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/java/com/inertia/guardian/NavActivity/OurStory.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@ import android.os.Bundle
import android.webkit.WebView
import com.google.android.material.floatingactionbutton.FloatingActionButton
import com.inertia.guardian.R
import com.inertia.guardian.R.id.web
import com.inertia.guardian.R.layout.activity_our_story

class OurStory : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_our_story)
setContentView(activity_our_story)

supportActionBar?.hide()
val back: FloatingActionButton = findViewById(R.id.back)
Expand All @@ -19,7 +21,7 @@ class OurStory : AppCompatActivity() {
}

val link = intent.getStringExtra("story")
val webView: WebView = findViewById(R.id.web)
val webView: WebView = findViewById(web)
webView.loadUrl(link!!)
}
}
174 changes: 138 additions & 36 deletions app/src/main/res/layout/activity_developer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,25 +146,25 @@
android:layout_height="wrap_content"
android:layout_marginTop="5dp">

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/pulkit_linkedin"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_height="30dp"
android:backgroundTint="#0072B1"
app:fabCustomSize="30dp"
app:maxImageSize="15dp"
app:srcCompat="@drawable/icon"
app:tint="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/pulkit_linkedin"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="#0072B1"
app:fabCustomSize="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:maxImageSize="15dp"
app:srcCompat="@drawable/icon"
app:tint="@color/white" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/pulkit_instagram"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -174,14 +174,14 @@
app:layout_constraintStart_toEndOf="@id/pulkit_linkedin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="15dp"
app:maxImageSize="20dp"
app:srcCompat="@drawable/instagram"
app:tint="" />
app:tint="@null" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/pulkit_github"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -191,9 +191,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="25dp"
app:maxImageSize="30dp"
app:srcCompat="@drawable/github"
app:tint="" />
app:tint="@null" />

</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down Expand Up @@ -250,7 +250,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/satyam_linkedin"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="#0072B1"
app:fabCustomSize="30dp"
Expand All @@ -265,7 +265,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/satyam_instagram"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -277,12 +277,12 @@
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="15dp"
app:srcCompat="@drawable/instagram"
app:tint="" />
app:tint="@null" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/satyam_github"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -292,9 +292,9 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="25dp"
app:maxImageSize="30dp"
app:srcCompat="@drawable/github"
app:tint="" />
app:tint="@null"/>

</androidx.constraintlayout.widget.ConstraintLayout>

Expand All @@ -304,8 +304,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginBottom="50dp">
android:layout_gravity="center">

<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
Expand Down Expand Up @@ -335,7 +334,7 @@
android:fontFamily="@font/mons"/>

<TextView
android:id="@+id/role"
android:id="@+id/manish_role"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
Expand All @@ -353,7 +352,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/manish_linkedin"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="#0072B1"
app:fabCustomSize="30dp"
Expand All @@ -368,7 +367,7 @@
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/manish_instagram"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -380,12 +379,12 @@
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="15dp"
app:srcCompat="@drawable/instagram"
app:tint="" />
app:tint="@null" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/github"
android:id="@+id/manish_github"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="346dp"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
Expand All @@ -395,14 +394,117 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="25dp"
app:maxImageSize="30dp"
app:srcCompat="@drawable/github"
app:tint="" />
app:tint="@null" />


</androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginBottom="50dp">

<androidx.cardview.widget.CardView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="30dp"
app:cardBackgroundColor="@android:color/transparent"
app:cardElevation="@dimen/cardview_default_elevation"
app:cardCornerRadius="300dp">

<ImageView
android:layout_width="100dp"
android:layout_height="100dp"
android:background="@drawable/shubham"/>

</androidx.cardview.widget.CardView>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="Shubham Mishra"
android:textColor="?attr/text"
android:textSize="20dp"
android:fontFamily="@font/mons"/>

<TextView
android:id="@+id/shubham_role"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="5dp"
android:text="Web Developer | UI/UX Designer"
android:textColor="?attr/text"
android:textSize="15dp"
android:fontFamily="@font/mons"/>

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp">

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/shubham_linkedin"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="#0072B1"
app:fabCustomSize="30dp"
app:maxImageSize="15dp"
app:srcCompat="@drawable/icon"
app:tint="@color/white"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"/>

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/shubham_instagram"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toEndOf="@id/shubham_linkedin"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="15dp"
app:srcCompat="@drawable/instagram"
app:tint="@null" />

<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/shubham_github"
style="@style/Widget.MaterialComponents.FloatingActionButton"
android:layout_width="30dp"
android:layout_height="30dp"
android:backgroundTint="@color/white"
app:fabCustomSize="30dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/shubham_linkedin"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
app:maxImageSize="30dp"
app:srcCompat="@drawable/github"
app:tint="@null" />


</androidx.constraintlayout.widget.ConstraintLayout>

</LinearLayout>

</LinearLayout>

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/activity_main_drawer.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<item
android:id="@+id/nav_dev"
android:icon="@drawable/ic_outline_account_box_24"
android:title="About Developer" />
android:title="About Developers" />
<item
android:id="@+id/nav_story"
android:icon="@drawable/ic_outline_menu_book_24"
Expand Down

0 comments on commit 64e890d

Please sign in to comment.