Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
org.benoitharrault.ameixanonfree
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
android
org.benoitharrault.ameixanonfree
Commits
fd772104
Commit
fd772104
authored
Jan 7, 2018
by
xphnx
Browse files
Options
Downloads
Patches
Plain Diff
reverting MainActivity and updating changelog
parent
366306de
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.md
+10
-0
10 additions, 0 deletions
CHANGELOG.md
app/src/main/java/org/xphnx/ameixa/MainActivity.java
+2
-37
2 additions, 37 deletions
app/src/main/java/org/xphnx/ameixa/MainActivity.java
with
12 additions
and
37 deletions
CHANGELOG.md
+
10
−
0
View file @
fd772104
**v3.0.9**
More icons and some fixes
Fix #3
**v3.0.8**
More icons and some fixes
**v3.0.7**
**v3.0.7**
More icons and some fixes
More icons and some fixes
...
...
This diff is collapsed.
Click to expand it.
app/src/main/java/org/xphnx/ameixa/MainActivity.java
+
2
−
37
View file @
fd772104
...
@@ -43,39 +43,6 @@ public class MainActivity extends AppCompatActivity {
...
@@ -43,39 +43,6 @@ public class MainActivity extends AppCompatActivity {
frameLayout
.
addView
(
baseLayout
);
frameLayout
.
addView
(
baseLayout
);
// icon view button
LinearLayout
iconLayout
=
new
LinearLayout
(
this
);
iconLayout
.
setOrientation
(
LinearLayout
.
HORIZONTAL
);
iconLayout
.
setLayoutParams
(
smallLayoutParams
);
iconLayout
.
setGravity
(
Gravity
.
CENTER_VERTICAL
);
baseLayout
.
addView
(
iconLayout
);
LinearLayout
iconClickLayout
=
new
LinearLayout
(
this
);
iconClickLayout
.
setOrientation
(
LinearLayout
.
HORIZONTAL
);
iconClickLayout
.
setLayoutParams
(
new
LinearLayout
.
LayoutParams
(
LinearLayout
.
LayoutParams
.
WRAP_CONTENT
,
LinearLayout
.
LayoutParams
.
WRAP_CONTENT
)
);
iconClickLayout
.
setGravity
(
Gravity
.
CENTER
);
iconLayout
.
addView
(
iconClickLayout
);
iconClickLayout
.
setOnClickListener
(
new
View
.
OnClickListener
()
{
@Override
public
void
onClick
(
View
v
)
{
iconView
(
v
);
}
});
Button
iconButton
=
new
Button
(
this
);
iconButton
.
setLayoutParams
(
buttonParams
);
iconButton
.
setBackground
(
new
BitmapDrawable
(
getResources
(),
IceImageUtils
.
bitmapLoad
(
getApplicationContext
().
getResources
(),
R
.
drawable
.
ic_icon_button
,
Math
.
round
(
48
*
scale
),
Math
.
round
(
48
*
scale
)
)
)
);
iconButton
.
setClickable
(
false
);
iconClickLayout
.
addView
(
iconButton
);
TextView
iconText
=
new
TextView
(
this
);
iconText
.
setText
(
"view icons"
);
iconText
.
setTextSize
(
24
);
iconText
.
setTextColor
(
ContextCompat
.
getColor
(
getApplicationContext
(),
R
.
color
.
colorPrimaryDark
)
);
iconText
.
setPadding
(
64
,
64
,
64
,
64
);
iconClickLayout
.
addView
(
iconText
);
// source code button
// source code button
...
@@ -100,7 +67,6 @@ public class MainActivity extends AppCompatActivity {
...
@@ -100,7 +67,6 @@ public class MainActivity extends AppCompatActivity {
Button
sourceButton
=
new
Button
(
this
);
Button
sourceButton
=
new
Button
(
this
);
sourceButton
.
setLayoutParams
(
buttonParams
);
sourceButton
.
setLayoutParams
(
buttonParams
);
sourceButton
.
setBackground
(
new
BitmapDrawable
(
getResources
(),
IceImageUtils
.
bitmapLoad
(
getApplicationContext
().
getResources
(),
R
.
drawable
.
ic_source_button
,
Math
.
round
(
48
*
scale
),
Math
.
round
(
48
*
scale
)
)
)
);
sourceButton
.
setBackground
(
new
BitmapDrawable
(
getResources
(),
IceImageUtils
.
bitmapLoad
(
getApplicationContext
().
getResources
(),
R
.
drawable
.
ic_source_button
,
Math
.
round
(
48
*
scale
),
Math
.
round
(
48
*
scale
)
)
)
);
sourceButton
.
setClickable
(
false
);
sourceClickLayout
.
addView
(
sourceButton
);
sourceClickLayout
.
addView
(
sourceButton
);
TextView
sourceText
=
new
TextView
(
this
);
TextView
sourceText
=
new
TextView
(
this
);
...
@@ -133,7 +99,6 @@ public class MainActivity extends AppCompatActivity {
...
@@ -133,7 +99,6 @@ public class MainActivity extends AppCompatActivity {
Button
aboutButton
=
new
Button
(
this
);
Button
aboutButton
=
new
Button
(
this
);
aboutButton
.
setLayoutParams
(
buttonParams
);
aboutButton
.
setLayoutParams
(
buttonParams
);
aboutButton
.
setBackground
(
new
BitmapDrawable
(
getResources
(),
IceImageUtils
.
bitmapLoad
(
getApplicationContext
().
getResources
(),
R
.
drawable
.
ic_license_button
,
Math
.
round
(
48
*
scale
),
Math
.
round
(
48
*
scale
)
)
)
);
aboutButton
.
setBackground
(
new
BitmapDrawable
(
getResources
(),
IceImageUtils
.
bitmapLoad
(
getApplicationContext
().
getResources
(),
R
.
drawable
.
ic_license_button
,
Math
.
round
(
48
*
scale
),
Math
.
round
(
48
*
scale
)
)
)
);
aboutButton
.
setClickable
(
false
);
aboutClickLayout
.
addView
(
aboutButton
);
aboutClickLayout
.
addView
(
aboutButton
);
TextView
aboutText
=
new
TextView
(
this
);
TextView
aboutText
=
new
TextView
(
this
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment